[PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Just FYI,

	Updating some kernel headers with the kernel sources.

- Arnaldo

Arnaldo Carvalho de Melo (7):
  tools include UAPI: Sync linux/vhost.h with the kernel sources
  tools arch x86: Sync the msr-index.h copy with the kernel sources
  tools headers x86 cpufeatures: Sync with the kernel sources to pick
    ZEN6 and Indirect Target Selection (ITS) bits
  tools headers: Sync the linux/unaligned.h copy with the kernel sources
  tools headers: Synchronize uapi/linux/bits.h with the kernel sources
  tools headers compiler: Pick the const_true() define from the kernel
    sources
  tools headers: Synchronize linux/bits.h with the kernel sources

 tools/arch/x86/include/asm/cpufeatures.h      |  5 ++++-
 tools/arch/x86/include/asm/msr-index.h        |  8 +++++++
 tools/include/linux/bits.h                    |  5 ++---
 tools/include/linux/compiler.h                | 22 +++++++++++++++++++
 tools/include/uapi/linux/bits.h               |  8 ++-----
 tools/include/vdso/unaligned.h                | 12 +++++-----
 .../trace/beauty/include/uapi/linux/vhost.h   |  4 ++--
 7 files changed, 46 insertions(+), 18 deletions(-)

-- 
2.49.0

[PATCH 1/7] tools include UAPI: Sync linux/vhost.h with the kernel sources

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

To get the changes in:

  a940e0a685575424 ("vhost: fix VHOST_*_OWNER documentation")

That just changed lines in comments

This addresses this perf build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/perf/trace/beauty/include/uapi/linux/vhost.h include/uapi/linux/vhost.h

Please see tools/include/uapi/README for further details.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stefano Garzarella <sgarzare@redhat.com>
Link: https://lore.kernel.org/r/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/trace/beauty/include/uapi/linux/vhost.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/trace/beauty/include/uapi/linux/vhost.h b/tools/perf/trace/beauty/include/uapi/linux/vhost.h
index b95dd84eef2db231..d4b3e2ae1314d1fc 100644
--- a/tools/perf/trace/beauty/include/uapi/linux/vhost.h
+++ b/tools/perf/trace/beauty/include/uapi/linux/vhost.h
@@ -28,10 +28,10 @@
 
 /* Set current process as the (exclusive) owner of this file descriptor.  This
  * must be called before any other vhost command.  Further calls to
- * VHOST_OWNER_SET fail until VHOST_OWNER_RESET is called. */
+ * VHOST_SET_OWNER fail until VHOST_RESET_OWNER is called. */
 #define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01)
 /* Give up ownership, and reset the device to default values.
- * Allows subsequent call to VHOST_OWNER_SET to succeed. */
+ * Allows subsequent call to VHOST_SET_OWNER to succeed. */
 #define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02)
 
 /* Set up/modify memory layout */
-- 
2.49.0

Re: [PATCH 1/7] tools include UAPI: Sync linux/vhost.h with the kernel sources

[Stefano Garzarella]

On Mon, May 19, 2025 at 06:41:20PM -0300, Arnaldo Carvalho de Melo wrote:
>From: Arnaldo Carvalho de Melo <acme@redhat.com>
>
>To get the changes in:
>
>  a940e0a685575424 ("vhost: fix VHOST_*_OWNER documentation")
>
>That just changed lines in comments
>
>This addresses this perf build warning:
>
>  Warning: Kernel ABI header differences:
>    diff -u tools/perf/trace/beauty/include/uapi/linux/vhost.h include/uapi/linux/vhost.h
>
>Please see tools/include/uapi/README for further details.
>
>Cc: Adrian Hunter <adrian.hunter@intel.com>
>Cc: Ian Rogers <irogers@google.com>
>Cc: James Clark <james.clark@linaro.org>
>Cc: Jiri Olsa <jolsa@kernel.org>
>Cc: Kan Liang <kan.liang@linux.intel.com>
>Cc: Michael S. Tsirkin <mst@redhat.com>
>Cc: Namhyung Kim <namhyung@kernel.org>
>Cc: Stefano Garzarella <sgarzare@redhat.com>
>Link: https://lore.kernel.org/r/
>Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>---
> tools/perf/trace/beauty/include/uapi/linux/vhost.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Acked-by: Stefano Garzarella <sgarzare@redhat.com>

>
>diff --git a/tools/perf/trace/beauty/include/uapi/linux/vhost.h b/tools/perf/trace/beauty/include/uapi/linux/vhost.h
>index b95dd84eef2db231..d4b3e2ae1314d1fc 100644
>--- a/tools/perf/trace/beauty/include/uapi/linux/vhost.h
>+++ b/tools/perf/trace/beauty/include/uapi/linux/vhost.h
>@@ -28,10 +28,10 @@
>
> /* Set current process as the (exclusive) owner of this file descriptor.  This
>  * must be called before any other vhost command.  Further calls to
>- * VHOST_OWNER_SET fail until VHOST_OWNER_RESET is called. */
>+ * VHOST_SET_OWNER fail until VHOST_RESET_OWNER is called. */
> #define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01)
> /* Give up ownership, and reset the device to default values.
>- * Allows subsequent call to VHOST_OWNER_SET to succeed. */
>+ * Allows subsequent call to VHOST_SET_OWNER to succeed. */
> #define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02)
>
> /* Set up/modify memory layout */
>-- 
>2.49.0
>

Re: [PATCH 1/7] tools include UAPI: Sync linux/vhost.h with the kernel sources

[Arnaldo Carvalho de Melo]

On Tue, May 20, 2025 at 09:20:04AM +0200, Stefano Garzarella wrote:
> On Mon, May 19, 2025 at 06:41:20PM -0300, Arnaldo Carvalho de Melo wrote:
> > From: Arnaldo Carvalho de Melo <acme@redhat.com

> > To get the changes in:
 
> >  a940e0a685575424 ("vhost: fix VHOST_*_OWNER documentation")
 
> Acked-by: Stefano Garzarella <sgarzare@redhat.com>

Thanks, added to the patch,

- Arnaldo

Re: [PATCH 1/7] tools include UAPI: Sync linux/vhost.h with the kernel sources

[Michael S. Tsirkin]

On Mon, May 19, 2025 at 06:41:20PM -0300, Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> To get the changes in:
> 
>   a940e0a685575424 ("vhost: fix VHOST_*_OWNER documentation")
> 
> That just changed lines in comments
> 
> This addresses this perf build warning:
> 
>   Warning: Kernel ABI header differences:
>     diff -u tools/perf/trace/beauty/include/uapi/linux/vhost.h include/uapi/linux/vhost.h
> 
> Please see tools/include/uapi/README for further details.
> 
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Ian Rogers <irogers@google.com>
> Cc: James Clark <james.clark@linaro.org>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Kan Liang <kan.liang@linux.intel.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Stefano Garzarella <sgarzare@redhat.com>
> Link: https://lore.kernel.org/r/
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  tools/perf/trace/beauty/include/uapi/linux/vhost.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/trace/beauty/include/uapi/linux/vhost.h b/tools/perf/trace/beauty/include/uapi/linux/vhost.h
> index b95dd84eef2db231..d4b3e2ae1314d1fc 100644
> --- a/tools/perf/trace/beauty/include/uapi/linux/vhost.h
> +++ b/tools/perf/trace/beauty/include/uapi/linux/vhost.h
> @@ -28,10 +28,10 @@
>  
>  /* Set current process as the (exclusive) owner of this file descriptor.  This
>   * must be called before any other vhost command.  Further calls to
> - * VHOST_OWNER_SET fail until VHOST_OWNER_RESET is called. */
> + * VHOST_SET_OWNER fail until VHOST_RESET_OWNER is called. */
>  #define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01)
>  /* Give up ownership, and reset the device to default values.
> - * Allows subsequent call to VHOST_OWNER_SET to succeed. */
> + * Allows subsequent call to VHOST_SET_OWNER to succeed. */
>  #define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02)
>  
>  /* Set up/modify memory layout */
> -- 
> 2.49.0

[PATCH 2/7] tools arch x86: Sync the msr-index.h copy with the kernel sources

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

To pick up the changes from these csets:

  159013a7ca18c271 ("x86/its: Enumerate Indirect Target Selection (ITS) bug")

That cause no changes to tooling as it doesn't include a new MSR to be
captured by the tools/perf/trace/beauty/tracepoints/x86_msr.sh script,
for instance:

  $ tools/perf/trace/beauty/tracepoints/x86_msr.sh | head
  static const char * const x86_MSRs[] = {
  	[0x00000000] = "IA32_P5_MC_ADDR",
  	[0x00000001] = "IA32_P5_MC_TYPE",
  	[0x00000010] = "IA32_TSC",
  	[0x00000017] = "IA32_PLATFORM_ID",
  	[0x0000001b] = "IA32_APICBASE",
  	[0x00000020] = "KNC_PERFCTR0",
  	[0x00000021] = "KNC_PERFCTR1",
  	[0x00000028] = "KNC_EVNTSEL0",
  	[0x00000029] = "KNC_EVNTSEL1",
  $

Just silences this perf build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h

Please see tools/include/uapi/README for further details.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Link: https://lore.kernel.org/r/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/arch/x86/include/asm/msr-index.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h
index e6134ef2263d50d1..e7d2f460fcc699e4 100644
--- a/tools/arch/x86/include/asm/msr-index.h
+++ b/tools/arch/x86/include/asm/msr-index.h
@@ -211,6 +211,14 @@
 						 * VERW clears CPU Register
 						 * File.
 						 */
+#define ARCH_CAP_ITS_NO			BIT_ULL(62) /*
+						     * Not susceptible to
+						     * Indirect Target Selection.
+						     * This bit is not set by
+						     * HW, but is synthesized by
+						     * VMMs for guests to know
+						     * their affected status.
+						     */
 
 #define MSR_IA32_FLUSH_CMD		0x0000010b
 #define L1D_FLUSH			BIT(0)	/*
-- 
2.49.0

[PATCH 3/7] tools headers x86 cpufeatures: Sync with the kernel sources to pick ZEN6 and Indirect Target Selection (ITS) bits

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

To pick the changes from:

  24ee8d9432b5744f ("x86/CPU/AMD: Add X86_FEATURE_ZEN6")
  2665281a07e19550 ("x86/its: Add "vmexit" option to skip mitigation on some CPUs")
  8754e67ad4ac692c ("x86/its: Add support for ITS-safe indirect thunk")
  159013a7ca18c271 ("x86/its: Enumerate Indirect Target Selection (ITS) bug")

This causes these perf files to be rebuilt and brings some X86_FEATURE
that will be used when updating the copies of
tools/arch/x86/lib/mem{cpy,set}_64.S with the kernel sources:

      CC       /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o
      CC       /tmp/build/perf/bench/mem-memset-x86-64-asm.o

And addresses this perf build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h

Please see tools/include/uapi/README for further details.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Cc: Yazen Ghannam <yazen.ghannam@amd.com>
Link: https://lore.kernel.org/r/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/arch/x86/include/asm/cpufeatures.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h
index 6c2c152d8a67b9bf..30144ef9ef02fb62 100644
--- a/tools/arch/x86/include/asm/cpufeatures.h
+++ b/tools/arch/x86/include/asm/cpufeatures.h
@@ -75,7 +75,7 @@
 #define X86_FEATURE_CENTAUR_MCR		( 3*32+ 3) /* "centaur_mcr" Centaur MCRs (= MTRRs) */
 #define X86_FEATURE_K8			( 3*32+ 4) /* Opteron, Athlon64 */
 #define X86_FEATURE_ZEN5		( 3*32+ 5) /* CPU based on Zen5 microarchitecture */
-/* Free                                 ( 3*32+ 6) */
+#define X86_FEATURE_ZEN6		( 3*32+ 6) /* CPU based on Zen6 microarchitecture */
 /* Free                                 ( 3*32+ 7) */
 #define X86_FEATURE_CONSTANT_TSC	( 3*32+ 8) /* "constant_tsc" TSC ticks at a constant rate */
 #define X86_FEATURE_UP			( 3*32+ 9) /* "up" SMP kernel running on UP */
@@ -481,6 +481,7 @@
 #define X86_FEATURE_AMD_HETEROGENEOUS_CORES (21*32 + 6) /* Heterogeneous Core Topology */
 #define X86_FEATURE_AMD_WORKLOAD_CLASS	(21*32 + 7) /* Workload Classification */
 #define X86_FEATURE_PREFER_YMM		(21*32 + 8) /* Avoid ZMM registers due to downclocking */
+#define X86_FEATURE_INDIRECT_THUNK_ITS	(21*32 + 9) /* Use thunk for indirect branches in lower half of cacheline */
 
 /*
  * BUG word(s)
@@ -533,4 +534,6 @@
 #define X86_BUG_BHI			X86_BUG(1*32 + 3) /* "bhi" CPU is affected by Branch History Injection */
 #define X86_BUG_IBPB_NO_RET	   	X86_BUG(1*32 + 4) /* "ibpb_no_ret" IBPB omits return target predictions */
 #define X86_BUG_SPECTRE_V2_USER		X86_BUG(1*32 + 5) /* "spectre_v2_user" CPU is affected by Spectre variant 2 attack between user processes */
+#define X86_BUG_ITS			X86_BUG(1*32 + 6) /* "its" CPU is affected by Indirect Target Selection */
+#define X86_BUG_ITS_NATIVE_ONLY		X86_BUG(1*32 + 7) /* "its_native_only" CPU is affected by ITS, VMX is not affected */
 #endif /* _ASM_X86_CPUFEATURES_H */
-- 
2.49.0

[PATCH 4/7] tools headers: Sync the linux/unaligned.h copy with the kernel sources

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

To pick up the changes in:

  acea9943271b6290 ("vdso: Address variable shadowing in macros")

Addressing this perf tools build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/include/linux/unaligned.h include/linux/unaligned.h

Please see tools/include/uapi/README for further details.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peng Jiang <jiang.peng9@zte.com.cn>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/include/vdso/unaligned.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/include/vdso/unaligned.h b/tools/include/vdso/unaligned.h
index eee3d2a4dbe4d3df..ff0c06b6513eff61 100644
--- a/tools/include/vdso/unaligned.h
+++ b/tools/include/vdso/unaligned.h
@@ -2,14 +2,14 @@
 #ifndef __VDSO_UNALIGNED_H
 #define __VDSO_UNALIGNED_H
 
-#define __get_unaligned_t(type, ptr) ({						\
-	const struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr);	\
-	__pptr->x;								\
+#define __get_unaligned_t(type, ptr) ({							\
+	const struct { type x; } __packed * __get_pptr = (typeof(__get_pptr))(ptr);	\
+	__get_pptr->x;									\
 })
 
-#define __put_unaligned_t(type, val, ptr) do {					\
-	struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr);		\
-	__pptr->x = (val);							\
+#define __put_unaligned_t(type, val, ptr) do {						\
+	struct { type x; } __packed * __put_pptr = (typeof(__put_pptr))(ptr);		\
+	__put_pptr->x = (val);								\
 } while (0)
 
 #endif /* __VDSO_UNALIGNED_H */
-- 
2.49.0

[PATCH 5/7] tools headers: Synchronize uapi/linux/bits.h with the kernel sources

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

To pick up the changes in this cset:

  1e7933a575ed8af4 ("uapi: Revert "bitops: avoid integer overflow in GENMASK(_ULL)"")

This addresses this perf build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/include/uapi/linux/bits.h include/uapi/linux/bits.h

Please see tools/include/uapi/README for further details.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: I Hsin Cheng <richard120310@gmail.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/include/uapi/linux/bits.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/include/uapi/linux/bits.h b/tools/include/uapi/linux/bits.h
index 5ee30f882736cbd1..682b406e10679dc8 100644
--- a/tools/include/uapi/linux/bits.h
+++ b/tools/include/uapi/linux/bits.h
@@ -4,13 +4,9 @@
 #ifndef _UAPI_LINUX_BITS_H
 #define _UAPI_LINUX_BITS_H
 
-#define __GENMASK(h, l) \
-        (((~_UL(0)) - (_UL(1) << (l)) + 1) & \
-         (~_UL(0) >> (__BITS_PER_LONG - 1 - (h))))
+#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (BITS_PER_LONG - 1 - (h))))
 
-#define __GENMASK_ULL(h, l) \
-        (((~_ULL(0)) - (_ULL(1) << (l)) + 1) & \
-         (~_ULL(0) >> (__BITS_PER_LONG_LONG - 1 - (h))))
+#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))
 
 #define __GENMASK_U128(h, l) \
 	((_BIT128((h)) << 1) - (_BIT128(l)))
-- 
2.49.0

[PATCH 6/7] tools headers compiler: Pick the const_true() define from the kernel sources

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

The sync of include/linux/bits.h with the kernel sources will make use
of this define, so add it to the tools/include/linux/compiler. variant
used to build tools/ living code.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/include/linux/compiler.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
index 9c05a59f01842c34..d627e66a04a6192e 100644
--- a/tools/include/linux/compiler.h
+++ b/tools/include/linux/compiler.h
@@ -81,6 +81,28 @@
 #define __is_constexpr(x) \
 	(sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8)))
 
+/*
+ * Similar to statically_true() but produces a constant expression
+ *
+ * To be used in conjunction with macros, such as BUILD_BUG_ON_ZERO(),
+ * which require their input to be a constant expression and for which
+ * statically_true() would otherwise fail.
+ *
+ * This is a trade-off: const_true() requires all its operands to be
+ * compile time constants. Else, it would always returns false even on
+ * the most trivial cases like:
+ *
+ *   true || non_const_var
+ *
+ * On the opposite, statically_true() is able to fold more complex
+ * tautologies and will return true on expressions such as:
+ *
+ *   !(non_const_var * 8 % 4)
+ *
+ * For the general case, statically_true() is better.
+ */
+#define const_true(x) __builtin_choose_expr(__is_constexpr(x), x, false)
+
 #ifdef __ANDROID__
 /*
  * FIXME: Big hammer to get rid of tons of:
-- 
2.49.0

[PATCH 7/7] tools headers: Synchronize linux/bits.h with the kernel sources

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

To pick up the changes in this cset:

  0312e94abe484b9e ("treewide: fix typo 'unsigned __init128' -> 'unsigned __int128'")

This addresses these perf build warnings:

  Warning: Kernel ABI header differences:
    diff -u tools/include/linux/bits.h include/linux/bits.h

This required picking the const_true() define in linux/compiler.h as a
prep patch as that macro is used in the new linux/bits.h

Please see tools/include/uapi/README for further details.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/include/linux/bits.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/include/linux/bits.h b/tools/include/linux/bits.h
index 8de2914e65101463..14fd0ca9a6cd1733 100644
--- a/tools/include/linux/bits.h
+++ b/tools/include/linux/bits.h
@@ -20,9 +20,8 @@
  */
 #if !defined(__ASSEMBLY__)
 #include <linux/build_bug.h>
-#define GENMASK_INPUT_CHECK(h, l) \
-	(BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
-		__is_constexpr((l) > (h)), (l) > (h), 0)))
+#include <linux/compiler.h>
+#define GENMASK_INPUT_CHECK(h, l) BUILD_BUG_ON_ZERO(const_true((l) > (h)))
 #else
 /*
  * BUILD_BUG_ON_ZERO is not available in h files included from asm files,
-- 
2.49.0

Re: [PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Namhyung Kim]

Hi Arnaldo,

On Mon, May 19, 2025 at 06:41:19PM -0300, Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Just FYI,
> 
> 	Updating some kernel headers with the kernel sources.
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo (7):
>   tools include UAPI: Sync linux/vhost.h with the kernel sources
>   tools arch x86: Sync the msr-index.h copy with the kernel sources
>   tools headers x86 cpufeatures: Sync with the kernel sources to pick
>     ZEN6 and Indirect Target Selection (ITS) bits
>   tools headers: Sync the linux/unaligned.h copy with the kernel sources
>   tools headers: Synchronize uapi/linux/bits.h with the kernel sources
>   tools headers compiler: Pick the const_true() define from the kernel
>     sources
>   tools headers: Synchronize linux/bits.h with the kernel sources

Thanks for doing this!  Do you want to add it to v6.15?  I feel like
it's slightly late for this cycle, but I can try if you want.

Thanks,
Namhyung

> 
>  tools/arch/x86/include/asm/cpufeatures.h      |  5 ++++-
>  tools/arch/x86/include/asm/msr-index.h        |  8 +++++++
>  tools/include/linux/bits.h                    |  5 ++---
>  tools/include/linux/compiler.h                | 22 +++++++++++++++++++
>  tools/include/uapi/linux/bits.h               |  8 ++-----
>  tools/include/vdso/unaligned.h                | 12 +++++-----
>  .../trace/beauty/include/uapi/linux/vhost.h   |  4 ++--
>  7 files changed, 46 insertions(+), 18 deletions(-)
> 
> -- 
> 2.49.0
> 

Re: [PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Vincent Mailhol]

On Tue. 20 May 2025 at 06:41, Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> Just FYI,
>
>         Updating some kernel headers with the kernel sources.
>
> - Arnaldo
>
> Arnaldo Carvalho de Melo (7):
>   tools include UAPI: Sync linux/vhost.h with the kernel sources
>   tools arch x86: Sync the msr-index.h copy with the kernel sources
>   tools headers x86 cpufeatures: Sync with the kernel sources to pick
>     ZEN6 and Indirect Target Selection (ITS) bits
>   tools headers: Sync the linux/unaligned.h copy with the kernel sources
>   tools headers: Synchronize uapi/linux/bits.h with the kernel sources
>   tools headers compiler: Pick the const_true() define from the kernel
>     sources
>   tools headers: Synchronize linux/bits.h with the kernel sources

Note that there are new upcoming changes in bits.h and build_bug.h
which are queue in the bitmap tree:

  https://github.com/norov/linux/commits/bitmap-for-next/

So, if you prefer, you can wait for the beginning of the merge windows
when the above changes will be merged and do the sync with all those
changes (this is just a suggestion, I am not objecting to this series
in any way).

>  tools/arch/x86/include/asm/cpufeatures.h      |  5 ++++-
>  tools/arch/x86/include/asm/msr-index.h        |  8 +++++++
>  tools/include/linux/bits.h                    |  5 ++---
>  tools/include/linux/compiler.h                | 22 +++++++++++++++++++
>  tools/include/uapi/linux/bits.h               |  8 ++-----
>  tools/include/vdso/unaligned.h                | 12 +++++-----
>  .../trace/beauty/include/uapi/linux/vhost.h   |  4 ++--
>  7 files changed, 46 insertions(+), 18 deletions(-)

Yours sincerely,
Vincent Mailhol

Re: [PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Arnaldo Carvalho de Melo]

On Tue, May 20, 2025 at 09:44:05AM +0900, Vincent Mailhol wrote:
> On Tue. 20 May 2025 at 06:41, Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> > From: Arnaldo Carvalho de Melo <acme@redhat.com>
> >         Updating some kernel headers with the kernel sources.

> >   tools headers: Synchronize uapi/linux/bits.h with the kernel sources
> >   tools headers compiler: Pick the const_true() define from the kernel
> >     sources
> >   tools headers: Synchronize linux/bits.h with the kernel sources
 
> Note that there are new upcoming changes in bits.h and build_bug.h
> which are queue in the bitmap tree:
 
>   https://github.com/norov/linux/commits/bitmap-for-next/
 
> So, if you prefer, you can wait for the beginning of the merge windows
> when the above changes will be merged and do the sync with all those
> changes (this is just a suggestion, I am not objecting to this series
> in any way).

I think there is value in doing it now, as it clears up the build
warnings and solves already one prep work that syncing would entail,
namely the inclusion of const_true() in the tools compiler.h file.

I think I can take your "I am not objecting to this series in any way."
as an Acked-by?

Thanks!

- Arnaldo

Re: [PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Vincent Mailhol]

On 21/05/2025 at 00:52, Arnaldo Carvalho de Melo wrote:
> On Tue, May 20, 2025 at 09:44:05AM +0900, Vincent Mailhol wrote:
>> On Tue. 20 May 2025 at 06:41, Arnaldo Carvalho de Melo <acme@kernel.org> wrote:

(...)

> I think there is value in doing it now, as it clears up the build
> warnings and solves already one prep work that syncing would entail,
> namely the inclusion of const_true() in the tools compiler.h file.

Ack.

> I think I can take your "I am not objecting to this series in any way."
> as an Acked-by?

Sure. You can add my Acked-by to patch 6 and 7 (the ones in which you put me in
CC). I did not have a look at the other ones (and do not plan to do so).


Yours sincerely,
Vincent Mailhol

Re: [PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Arnaldo Carvalho de Melo]

On Wed, May 21, 2025 at 01:02:49AM +0900, Vincent Mailhol wrote:
> On 21/05/2025 at 00:52, Arnaldo Carvalho de Melo wrote:
> > On Tue, May 20, 2025 at 09:44:05AM +0900, Vincent Mailhol wrote:
> >> On Tue. 20 May 2025 at 06:41, Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> 
> (...)
> 
> > I think there is value in doing it now, as it clears up the build
> > warnings and solves already one prep work that syncing would entail,
> > namely the inclusion of const_true() in the tools compiler.h file.
> 
> Ack.
> 
> > I think I can take your "I am not objecting to this series in any way."
> > as an Acked-by?
> 
> Sure. You can add my Acked-by to patch 6 and 7 (the ones in which you put me in
> CC). I did not have a look at the other ones (and do not plan to do so).

Thanks, just did it,

- Arnaldo

Re: [PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Yury Norov]

On Mon, May 19, 2025 at 06:41:19PM -0300, Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Just FYI,
> 
> 	Updating some kernel headers with the kernel sources.
> 
> - Arnaldo

For patches 5, 6 and 7:
Acked-by: Yury Norov [NVIDIA] <yury.norov@gmail.com>

Would you like me to take those in bitmap-for-next?

Thanks,
Yury

Re: [PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Arnaldo Carvalho de Melo]

On Mon, May 19, 2025 at 11:48:11PM -0400, Yury Norov wrote:
> On Mon, May 19, 2025 at 06:41:19PM -0300, Arnaldo Carvalho de Melo wrote:
> > From: Arnaldo Carvalho de Melo <acme@redhat.com>
> > Just FYI,

> > 	Updating some kernel headers with the kernel sources.

> For patches 5, 6 and 7:
> Acked-by: Yury Norov [NVIDIA] <yury.norov@gmail.com>

Thanks, added to the patches.
 
> Would you like me to take those in bitmap-for-next?

Since this affects just the tooling, and removes a warning when building
them, I think its better for those to be carried in the perf-tools-next
tree, ok?

Cheers,

- Arnaldo

Re: [PATCH FYI 0/7] Updating some kernel headers with the kernel sources

[Yury Norov]

On Tue, May 20, 2025 at 12:56:36PM -0300, Arnaldo Carvalho de Melo wrote:
> On Mon, May 19, 2025 at 11:48:11PM -0400, Yury Norov wrote:
> > On Mon, May 19, 2025 at 06:41:19PM -0300, Arnaldo Carvalho de Melo wrote:
> > > From: Arnaldo Carvalho de Melo <acme@redhat.com>
> > > Just FYI,
> 
> > > 	Updating some kernel headers with the kernel sources.
> 
> > For patches 5, 6 and 7:
> > Acked-by: Yury Norov [NVIDIA] <yury.norov@gmail.com>
> 
> Thanks, added to the patches.
>  
> > Would you like me to take those in bitmap-for-next?
> 
> Since this affects just the tooling, and removes a warning when building
> them, I think its better for those to be carried in the perf-tools-next
> tree, ok?

Sure. Thanks for handling this.