On 2025-01-04 00:29, Stefano Stabellini wrote:
On Thu, 2 Jan 2025, Andrew Cooper wrote:
... and hook it up for RISC-V and PPC.
On RISC-V at least, no combination of headers pulls in errno.h, so
include it
explicitly.
Guard the hypercalls array declaration based on NR_hypercalls
existing. This
is sufficient to get PERF_COUNTERS fully working on RISC-V and PPC, so
drop
the randconfig override.
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Roger Pau Monné <roger....@citrix.com>
CC: Stefano Stabellini <sstabell...@kernel.org>
CC: Julien Grall <jul...@xen.org>
CC: Volodymyr Babchuk <volodymyr_babc...@epam.com>
CC: Bertrand Marquis <bertrand.marq...@arm.com>
CC: Michal Orzel <michal.or...@amd.com>
CC: Oleksii Kurochko <oleksii.kuroc...@gmail.com>
CC: Shawn Anastasio <sanasta...@raptorengineering.com>
---
automation/gitlab-ci/build.yaml | 1 -
xen/arch/ppc/include/asm/Makefile | 1 +
xen/arch/riscv/include/asm/Makefile | 1 +
xen/common/perfc.c | 1 +
xen/include/asm-generic/perfc_defn.h | 5 +++++
xen/include/xen/perfc_defn.h | 2 ++
6 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 xen/include/asm-generic/perfc_defn.h
diff --git a/xen/include/asm-generic/perfc_defn.h
b/xen/include/asm-generic/perfc_defn.h
new file mode 100644
index 000000000000..8237636d83fb
--- /dev/null
+++ b/xen/include/asm-generic/perfc_defn.h
@@ -0,0 +1,5 @@
+/* This file is legitimately included multiple times. */
It is a good idea to add comment here to explain. This is effectively
the same as a deviation of MISRA D4.10. SAF-8-safe is defined as
"Headers that deliberatively leave the responsability of their correct
inclusion to the caller are allowed". I think it applies, please add
SAF-8-safe to this comment and also the other perfc_defn.h, e.g.:
/* SAF-8-safe This file is legitimately included multiple times. */
There is already a deviation in place for this kind of files, so I think
that's good as is, no need for a SAF tag.
-doc_begin="Files that are intended to be included more than once do not
need to
conform to the directive."
-config=MC3A2.D4.10,reports+={safe, "first_area(text(^/\\* This file is
legitimately included multiple times\\. \\*/$, begin-4))"}
+/* #ifndef ASM_GENERIC_PERFC_DEFN_H */
+/* #define ASM_GENERIC_PERFC_DEFN_H */
+
+/* #endif ASM_GENERIC_PERFC_DEFN_H */
diff --git a/xen/include/xen/perfc_defn.h
b/xen/include/xen/perfc_defn.h
index 0027d95a60bc..a987d80dd6f1 100644
--- a/xen/include/xen/perfc_defn.h
+++ b/xen/include/xen/perfc_defn.h
@@ -4,7 +4,9 @@
#include <asm/perfc_defn.h>
+#ifdef NR_hypercalls
PERFCOUNTER_ARRAY(hypercalls, "hypercalls", NR_hypercalls)
+#endif
PERFCOUNTER(calls_from_multicall, "calls from multicall")
--
2.39.5
--
Nicola Vetrini, B.Sc.
Software Engineer
BUGSENG (https://bugseng.com)
LinkedIn: https://www.linkedin.com/in/nicola-vetrini-a42471253
