Skip to contentSkip to conversation

perf build: Add tools/arch/x86/include/asm/amd/ibs.h to sync the headers

PATCH In review Athira Rajeev 4 participants 8 messages Apr 24, 2025 – Apr 25, 2025 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf build: Add tools/arch/x86/include/asm/amd/ibs.h to sync the headers

Headers sync up update for the patch that adds the original copy of the IBS header file in arch/x86/include/asm/amd/ibs.h

Without this, perf shows build warning:

 # make
  BUILD:   Doing 'make -j24' parallel build
diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory
Warning: Kernel ABI header differences:
  diff -u tools/include/uapi/linux/bits.h include/uapi/linux/bits.h
  diff -u tools/include/linux/bits.h include/linux/bits.h
  diff -u tools/include/vdso/unaligned.h include/vdso/unaligned.h
  diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h
  diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h
  diff -u tools/arch/x86/include/asm/amd/ibs.h arch/x86/include/asm/amd/ibs.h
  diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h

Add tools/arch/x86/include/asm/amd directory and also file tools/arch/x86/include/asm/amd/ibs.h to sync up the kernel headers with perf tools and fix the warning:

diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory

Apart from the warning, the perf build also fails as below on powerpc:

In file included from util/amd-sample-raw.c:12:0:
/root/bug/tip/tools/include/../../arch/x86/include/asm/amd/ibs.h:10:10: fatal error: asm/msr-index.h: No such file or directory

   #include <asm/msr-index.h>
            ^~~~~~~~~~~~~~~~~

compilation terminated.

To fix this, added this change:

-#include <asm/msr-index.h>
+#include "../msr-index.h"

And change the check-headers.sh entry to ignore this line when comparing with the original kernel header.

---
 tools/arch/x86/include/asm/amd/ibs.h | 158 +++++++++++++++++++++++++++
 tools/perf/check-headers.sh          |   2 +-
 2 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 tools/arch/x86/include/asm/amd/ibs.h
tools/arch/x86/include/asm/amd/ibs.h new file +158 -0
new file mode 100644
index 000000000000..cbce54fec7b9
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_X86_AMD_IBS_H
+#define _ASM_X86_AMD_IBS_H
+
+/*
+ * From PPR Vol 1 for AMD Family 19h Model 01h B1
+ * 55898 Rev 0.35 - Feb 5, 2021
+ */
+
+#include "../msr-index.h"
+
+/* IBS_OP_DATA2 DataSrc */
+#define IBS_DATA_SRC_LOC_CACHE			 2
+#define IBS_DATA_SRC_DRAM			 3
+#define IBS_DATA_SRC_REM_CACHE			 4
+#define IBS_DATA_SRC_IO				 7
+
+/* IBS_OP_DATA2 DataSrc Extension */
+#define IBS_DATA_SRC_EXT_LOC_CACHE		 1
+#define IBS_DATA_SRC_EXT_NEAR_CCX_CACHE		 2
+#define IBS_DATA_SRC_EXT_DRAM			 3
+#define IBS_DATA_SRC_EXT_FAR_CCX_CACHE		 5
+#define IBS_DATA_SRC_EXT_PMEM			 6
+#define IBS_DATA_SRC_EXT_IO			 7
+#define IBS_DATA_SRC_EXT_EXT_MEM		 8
+#define IBS_DATA_SRC_EXT_PEER_AGENT_MEM		12
+
+/*
+ * IBS Hardware MSRs
+ */
+
+/* MSR 0xc0011030: IBS Fetch Control */
+union ibs_fetch_ctl {
+	__u64 val;
+	struct {
+		__u64	fetch_maxcnt:16,/* 0-15: instruction fetch max. count */
+			fetch_cnt:16,	/* 16-31: instruction fetch count */
+			fetch_lat:16,	/* 32-47: instruction fetch latency */
+			fetch_en:1,	/* 48: instruction fetch enable */
+			fetch_val:1,	/* 49: instruction fetch valid */
+			fetch_comp:1,	/* 50: instruction fetch complete */
+			ic_miss:1,	/* 51: i-cache miss */
+			phy_addr_valid:1,/* 52: physical address valid */
+			l1tlb_pgsz:2,	/* 53-54: i-cache L1TLB page size
+					 *	  (needs IbsPhyAddrValid) */
+			l1tlb_miss:1,	/* 55: i-cache fetch missed in L1TLB */
+			l2tlb_miss:1,	/* 56: i-cache fetch missed in L2TLB */
+			rand_en:1,	/* 57: random tagging enable */
+			fetch_l2_miss:1,/* 58: L2 miss for sampled fetch
+					 *      (needs IbsFetchComp) */
+			l3_miss_only:1,	/* 59: Collect L3 miss samples only */
+			fetch_oc_miss:1,/* 60: Op cache miss for the sampled fetch */
+			fetch_l3_miss:1,/* 61: L3 cache miss for the sampled fetch */
+			reserved:2;	/* 62-63: reserved */
+	};
+};
+
+/* MSR 0xc0011033: IBS Execution Control */
+union ibs_op_ctl {
+	__u64 val;
+	struct {
+		__u64	opmaxcnt:16,	/* 0-15: periodic op max. count */
+			l3_miss_only:1,	/* 16: Collect L3 miss samples only */
+			op_en:1,	/* 17: op sampling enable */
+			op_val:1,	/* 18: op sample valid */
+			cnt_ctl:1,	/* 19: periodic op counter control */
+			opmaxcnt_ext:7,	/* 20-26: upper 7 bits of periodic op maximum count */
+			reserved0:5,	/* 27-31: reserved */
+			opcurcnt:27,	/* 32-58: periodic op counter current count */
+			ldlat_thrsh:4,	/* 59-62: Load Latency threshold */
+			ldlat_en:1;	/* 63: Load Latency enabled */
+	};
+};
+
+/* MSR 0xc0011035: IBS Op Data 1 */
+union ibs_op_data {
+	__u64 val;
+	struct {
+		__u64	comp_to_ret_ctr:16,	/* 0-15: op completion to retire count */
+			tag_to_ret_ctr:16,	/* 15-31: op tag to retire count */
+			reserved1:2,		/* 32-33: reserved */
+			op_return:1,		/* 34: return op */
+			op_brn_taken:1,		/* 35: taken branch op */
+			op_brn_misp:1,		/* 36: mispredicted branch op */
+			op_brn_ret:1,		/* 37: branch op retired */
+			op_rip_invalid:1,	/* 38: RIP is invalid */
+			op_brn_fuse:1,		/* 39: fused branch op */
+			op_microcode:1,		/* 40: microcode op */
+			reserved2:23;		/* 41-63: reserved */
+	};
+};
+
+/* MSR 0xc0011036: IBS Op Data 2 */
+union ibs_op_data2 {
+	__u64 val;
+	struct {
+		__u64	data_src_lo:3,	/* 0-2: data source low */
+			reserved0:1,	/* 3: reserved */
+			rmt_node:1,	/* 4: destination node */
+			cache_hit_st:1,	/* 5: cache hit state */
+			data_src_hi:2,	/* 6-7: data source high */
+			reserved1:56;	/* 8-63: reserved */
+	};
+};
+
+/* MSR 0xc0011037: IBS Op Data 3 */
+union ibs_op_data3 {
+	__u64 val;
+	struct {
+		__u64	ld_op:1,			/* 0: load op */
+			st_op:1,			/* 1: store op */
+			dc_l1tlb_miss:1,		/* 2: data cache L1TLB miss */
+			dc_l2tlb_miss:1,		/* 3: data cache L2TLB hit in 2M page */
+			dc_l1tlb_hit_2m:1,		/* 4: data cache L1TLB hit in 2M page */
+			dc_l1tlb_hit_1g:1,		/* 5: data cache L1TLB hit in 1G page */
+			dc_l2tlb_hit_2m:1,		/* 6: data cache L2TLB hit in 2M page */
+			dc_miss:1,			/* 7: data cache miss */
+			dc_mis_acc:1,			/* 8: misaligned access */
+			reserved:4,			/* 9-12: reserved */
+			dc_wc_mem_acc:1,		/* 13: write combining memory access */
+			dc_uc_mem_acc:1,		/* 14: uncacheable memory access */
+			dc_locked_op:1,			/* 15: locked operation */
+			dc_miss_no_mab_alloc:1,		/* 16: DC miss with no MAB allocated */
+			dc_lin_addr_valid:1,		/* 17: data cache linear address valid */
+			dc_phy_addr_valid:1,		/* 18: data cache physical address valid */
+			dc_l2_tlb_hit_1g:1,		/* 19: data cache L2 hit in 1GB page */
+			l2_miss:1,			/* 20: L2 cache miss */
+			sw_pf:1,			/* 21: software prefetch */
+			op_mem_width:4,			/* 22-25: load/store size in bytes */
+			op_dc_miss_open_mem_reqs:6,	/* 26-31: outstanding mem reqs on DC fill */
+			dc_miss_lat:16,			/* 32-47: data cache miss latency */
+			tlb_refill_lat:16;		/* 48-63: L1 TLB refill latency */
+	};
+};
+
+/* MSR 0xc001103c: IBS Fetch Control Extended */
+union ic_ibs_extd_ctl {
+	__u64 val;
+	struct {
+		__u64	itlb_refill_lat:16,	/* 0-15: ITLB Refill latency for sampled fetch */
+			reserved:48;		/* 16-63: reserved */
+	};
+};
+
+/*
+ * IBS driver related
+ */
+
+struct perf_ibs_data {
+	u32		size;
+	union {
+		u32	data[0];	/* data buffer starts here */
+		u32	caps;
+	};
+	u64		regs[MSR_AMD64_IBS_REG_COUNT_MAX];
+};
+
+#endif /* _ASM_X86_AMD_IBS_H */
tools/perf/check-headers.sh +1 -1
index e9fab20e9330..e1a1fdfa7115 100755
@@ -186,7 +186,7 @@ done
 # diff with extra ignore lines
 check arch/x86/lib/memcpy_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))" -I"^#include <linux/cfi_types.h>"'
 check arch/x86/lib/memset_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"'
-check arch/x86/include/asm/amd/ibs.h  '-I "^#include [<\"]\(asm/\)*msr-index.h"'
+check arch/x86/include/asm/amd/ibs.h  '-I "^#include <asm/msr-index.h>" -I "^#include \"\.\./msr-index.h\""'
 check arch/arm64/include/asm/cputype.h '-I "^#include [<\"]\(asm/\)*sysreg.h"'
 check include/linux/unaligned.h '-I "^#include <linux/unaligned/packed_struct.h>" -I "^#include <asm/byteorder.h>" -I "^#pragma GCC diagnostic"'
 check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'
Signature · 1 line
2.43.0
Tested-by on v1 1/1
#1 lore raw
Quoted 218 lines · Athira Rajeev

Headers sync up update for the patch that adds the original copy of the IBS header file in arch/x86/include/asm/amd/ibs.h

Without this, perf shows build warning:

  # make
   BUILD:   Doing 'make -j24' parallel build
diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory
Warning: Kernel ABI header differences:
   diff -u tools/include/uapi/linux/bits.h include/uapi/linux/bits.h
   diff -u tools/include/linux/bits.h include/linux/bits.h
   diff -u tools/include/vdso/unaligned.h include/vdso/unaligned.h
   diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h
   diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h
   diff -u tools/arch/x86/include/asm/amd/ibs.h arch/x86/include/asm/amd/ibs.h
   diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h

Add tools/arch/x86/include/asm/amd directory and also file tools/arch/x86/include/asm/amd/ibs.h to sync up the kernel headers with perf tools and fix the warning:

diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory

Apart from the warning, the perf build also fails as below on powerpc:

In file included from util/amd-sample-raw.c:12:0:

   /root/bug/tip/tools/include/../../arch/x86/include/asm/amd/ibs.h:10:10: fatal error: asm/msr-index.h: No such file or directory
    #include <asm/msr-index.h>
             ^~~~~~~~~~~~~~~~~
   compilation terminated.

To fix this, added this change:

   -#include <asm/msr-index.h>
   +#include "../msr-index.h"

And change the check-headers.sh entry to ignore this line when comparing with the original kernel header.

---
  tools/arch/x86/include/asm/amd/ibs.h | 158 +++++++++++++++++++++++++++
  tools/perf/check-headers.sh          |   2 +-
  2 files changed, 159 insertions(+), 1 deletion(-)

create mode 100644 tools/arch/x86/include/asm/amd/ibs.h

tools/arch/x86/include/asm/amd/ibs.h new file +158 -0
new file mode 100644
index 000000000000..cbce54fec7b9
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_X86_AMD_IBS_H
+#define _ASM_X86_AMD_IBS_H
+
+/*
+ * From PPR Vol 1 for AMD Family 19h Model 01h B1
+ * 55898 Rev 0.35 - Feb 5, 2021
+ */
+
+#include "../msr-index.h"
+
+/* IBS_OP_DATA2 DataSrc */
+#define IBS_DATA_SRC_LOC_CACHE			 2
+#define IBS_DATA_SRC_DRAM			 3
+#define IBS_DATA_SRC_REM_CACHE			 4
+#define IBS_DATA_SRC_IO				 7
+
+/* IBS_OP_DATA2 DataSrc Extension */
+#define IBS_DATA_SRC_EXT_LOC_CACHE		 1
+#define IBS_DATA_SRC_EXT_NEAR_CCX_CACHE		 2
+#define IBS_DATA_SRC_EXT_DRAM			 3
+#define IBS_DATA_SRC_EXT_FAR_CCX_CACHE		 5
+#define IBS_DATA_SRC_EXT_PMEM			 6
+#define IBS_DATA_SRC_EXT_IO			 7
+#define IBS_DATA_SRC_EXT_EXT_MEM		 8
+#define IBS_DATA_SRC_EXT_PEER_AGENT_MEM		12
+
+/*
+ * IBS Hardware MSRs
+ */
+
+/* MSR 0xc0011030: IBS Fetch Control */
+union ibs_fetch_ctl {
+	__u64 val;
+	struct {
+		__u64	fetch_maxcnt:16,/* 0-15: instruction fetch max. count */
+			fetch_cnt:16,	/* 16-31: instruction fetch count */
+			fetch_lat:16,	/* 32-47: instruction fetch latency */
+			fetch_en:1,	/* 48: instruction fetch enable */
+			fetch_val:1,	/* 49: instruction fetch valid */
+			fetch_comp:1,	/* 50: instruction fetch complete */
+			ic_miss:1,	/* 51: i-cache miss */
+			phy_addr_valid:1,/* 52: physical address valid */
+			l1tlb_pgsz:2,	/* 53-54: i-cache L1TLB page size
+					 *	  (needs IbsPhyAddrValid) */
+			l1tlb_miss:1,	/* 55: i-cache fetch missed in L1TLB */
+			l2tlb_miss:1,	/* 56: i-cache fetch missed in L2TLB */
+			rand_en:1,	/* 57: random tagging enable */
+			fetch_l2_miss:1,/* 58: L2 miss for sampled fetch
+					 *      (needs IbsFetchComp) */
+			l3_miss_only:1,	/* 59: Collect L3 miss samples only */
+			fetch_oc_miss:1,/* 60: Op cache miss for the sampled fetch */
+			fetch_l3_miss:1,/* 61: L3 cache miss for the sampled fetch */
+			reserved:2;	/* 62-63: reserved */
+	};
+};
+
+/* MSR 0xc0011033: IBS Execution Control */
+union ibs_op_ctl {
+	__u64 val;
+	struct {
+		__u64	opmaxcnt:16,	/* 0-15: periodic op max. count */
+			l3_miss_only:1,	/* 16: Collect L3 miss samples only */
+			op_en:1,	/* 17: op sampling enable */
+			op_val:1,	/* 18: op sample valid */
+			cnt_ctl:1,	/* 19: periodic op counter control */
+			opmaxcnt_ext:7,	/* 20-26: upper 7 bits of periodic op maximum count */
+			reserved0:5,	/* 27-31: reserved */
+			opcurcnt:27,	/* 32-58: periodic op counter current count */
+			ldlat_thrsh:4,	/* 59-62: Load Latency threshold */
+			ldlat_en:1;	/* 63: Load Latency enabled */
+	};
+};
+
+/* MSR 0xc0011035: IBS Op Data 1 */
+union ibs_op_data {
+	__u64 val;
+	struct {
+		__u64	comp_to_ret_ctr:16,	/* 0-15: op completion to retire count */
+			tag_to_ret_ctr:16,	/* 15-31: op tag to retire count */
+			reserved1:2,		/* 32-33: reserved */
+			op_return:1,		/* 34: return op */
+			op_brn_taken:1,		/* 35: taken branch op */
+			op_brn_misp:1,		/* 36: mispredicted branch op */
+			op_brn_ret:1,		/* 37: branch op retired */
+			op_rip_invalid:1,	/* 38: RIP is invalid */
+			op_brn_fuse:1,		/* 39: fused branch op */
+			op_microcode:1,		/* 40: microcode op */
+			reserved2:23;		/* 41-63: reserved */
+	};
+};
+
+/* MSR 0xc0011036: IBS Op Data 2 */
+union ibs_op_data2 {
+	__u64 val;
+	struct {
+		__u64	data_src_lo:3,	/* 0-2: data source low */
+			reserved0:1,	/* 3: reserved */
+			rmt_node:1,	/* 4: destination node */
+			cache_hit_st:1,	/* 5: cache hit state */
+			data_src_hi:2,	/* 6-7: data source high */
+			reserved1:56;	/* 8-63: reserved */
+	};
+};
+
+/* MSR 0xc0011037: IBS Op Data 3 */
+union ibs_op_data3 {
+	__u64 val;
+	struct {
+		__u64	ld_op:1,			/* 0: load op */
+			st_op:1,			/* 1: store op */
+			dc_l1tlb_miss:1,		/* 2: data cache L1TLB miss */
+			dc_l2tlb_miss:1,		/* 3: data cache L2TLB hit in 2M page */
+			dc_l1tlb_hit_2m:1,		/* 4: data cache L1TLB hit in 2M page */
+			dc_l1tlb_hit_1g:1,		/* 5: data cache L1TLB hit in 1G page */
+			dc_l2tlb_hit_2m:1,		/* 6: data cache L2TLB hit in 2M page */
+			dc_miss:1,			/* 7: data cache miss */
+			dc_mis_acc:1,			/* 8: misaligned access */
+			reserved:4,			/* 9-12: reserved */
+			dc_wc_mem_acc:1,		/* 13: write combining memory access */
+			dc_uc_mem_acc:1,		/* 14: uncacheable memory access */
+			dc_locked_op:1,			/* 15: locked operation */
+			dc_miss_no_mab_alloc:1,		/* 16: DC miss with no MAB allocated */
+			dc_lin_addr_valid:1,		/* 17: data cache linear address valid */
+			dc_phy_addr_valid:1,		/* 18: data cache physical address valid */
+			dc_l2_tlb_hit_1g:1,		/* 19: data cache L2 hit in 1GB page */
+			l2_miss:1,			/* 20: L2 cache miss */
+			sw_pf:1,			/* 21: software prefetch */
+			op_mem_width:4,			/* 22-25: load/store size in bytes */
+			op_dc_miss_open_mem_reqs:6,	/* 26-31: outstanding mem reqs on DC fill */
+			dc_miss_lat:16,			/* 32-47: data cache miss latency */
+			tlb_refill_lat:16;		/* 48-63: L1 TLB refill latency */
+	};
+};
+
+/* MSR 0xc001103c: IBS Fetch Control Extended */
+union ic_ibs_extd_ctl {
+	__u64 val;
+	struct {
+		__u64	itlb_refill_lat:16,	/* 0-15: ITLB Refill latency for sampled fetch */
+			reserved:48;		/* 16-63: reserved */
+	};
+};
+
+/*
+ * IBS driver related
+ */
+
+struct perf_ibs_data {
+	u32		size;
+	union {
+		u32	data[0];	/* data buffer starts here */
+		u32	caps;
+	};
+	u64		regs[MSR_AMD64_IBS_REG_COUNT_MAX];
+};
+
+#endif /* _ASM_X86_AMD_IBS_H */
tools/perf/check-headers.sh +0 -0
index e9fab20e9330..e1a1fdfa7115 100755

tools/perf/check-headers.sh done · line 192

Quoted 8 lines
tools/perf/check-headers.sh +1 -1
@@ -186,7 +186,7 @@ done
  # diff with extra ignore lines
  check arch/x86/lib/memcpy_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))" -I"^#include <linux/cfi_types.h>"'
  check arch/x86/lib/memset_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"'
-check arch/x86/include/asm/amd/ibs.h  '-I "^#include [<\"]\(asm/\)*msr-index.h"'
+check arch/x86/include/asm/amd/ibs.h  '-I "^#include <asm/msr-index.h>" -I "^#include \"\.\./msr-index.h\""'
  check arch/arm64/include/asm/cputype.h '-I "^#include [<\"]\(asm/\)*sysreg.h"'
  check include/linux/unaligned.h '-I "^#include <linux/unaligned/packed_struct.h>" -I "^#include <asm/byteorder.h>" -I "^#pragma GCC diagnostic"'
  check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'

Tested this patch by applying on tip HEAD: 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d and it fixes the reported issue. Hence,

Before Patch:

Below warning is observed at the start of compilation.

diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory

 CC      util/ordered-events.o
  CC      util/namespaces.o
In file included from util/amd-sample-raw.c:12:
/root/tip/tools/include/../../arch/x86/include/asm/amd/ibs.h:10:10: fatal error: asm/msr-index.h: No such file or directory 10 | #include <asm/msr-index.h>
      |          ^~~~~~~~~~~~~~~~~
compilation terminated.
  CC      util/comm.o
make[4]: *** [/root/tip/tools/build/Makefile.build:86: util/amd-sample-raw.o] Error 1
make[4]: *** Waiting for unfinished jobs....

After Patch:

Reproted warning is fixed.

  CC      util/bpf-filter-flex.o
  LD      util/perf-util-in.o
  LD      perf-in.o
  LD      perf-util-in.o
  AR      libperf-util.a
  LINK    perf
  GEN     python/perf.cpython-312-powerpc64le-linux-gnu.so

# ./perf version
perf version 6.15.rc3.g477fb4e08521

Regards,

Venkat.

#2 lore raw
Quoted 3 lines · Venkat Rao Bagalkote

On 24/04/25 10:00 pm, Athira Rajeev wrote:
Tested this patch by applying on tip HEAD:
7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d and it fixes the reported issue.

This is just a long list of characters, can you please next time provide something like, humm, tip/head, not really:

⬢ [acme@toolbx perf-tools-next]$ git remote -v | grep tip
tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (fetch)
tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (push)
⬢ [acme@toolbx perf-tools-next]$ git remote update tip
Fetching tip
⬢ [acme@toolbx perf-tools-next]$ git show 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d
fatal: bad object 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d
⬢ [acme@toolbx perf-tools-next]$

So please add the summary, that way we can try to figure out if this is a rebase and they look for the description instead of this sha1 that I'm not finding even after doing a 'git remore update tip'.

Quoted 1 line

Thanks,

- Arnaldo

maintainer
#3 lore raw

Hello,

Quoted 17 lines · Arnaldo Carvalho de Melo
Quoted 3 lines · Venkat Rao Bagalkote

On 24/04/25 10:00 pm, Athira Rajeev wrote:
Tested this patch by applying on tip HEAD:
7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d and it fixes the reported issue.

This is just a long list of characters, can you please next time provide something like, humm, tip/head, not really:

⬢ [acme@toolbx perf-tools-next]$ git remote -v | grep tip
tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (fetch)
tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (push)
⬢ [acme@toolbx perf-tools-next]$ git remote update tip
Fetching tip
⬢ [acme@toolbx perf-tools-next]$ git show 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d
fatal: bad object 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d
⬢ [acme@toolbx perf-tools-next]$

Quoted 3 lines

So please add the summary, that way we can try to figure out if this is a rebase and they look for the description instead of this sha1 that I'm not finding even after doing a 'git remore update tip'.

Does this mean the kernel change broke the tool build but we don't have it in the perf-tools-next yet? Then probably we need to wait for the next merge window to fix it in the tool side, no?

Thanks,
Namhyung

#4 lore raw
Quoted 17 lines · Namhyung Kim
Quoted 16 lines · Venkat Rao Bagalkote
Quoted 3 lines · Athira Rajeev

Tested this patch by applying on tip HEAD:
7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d and it fixes the reported issue.

This is just a long list of characters, can you please next time provide something like, humm, tip/head, not really:

⬢ [acme@toolbx perf-tools-next]$ git remote -v | grep tip
tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (fetch)
tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (push)
⬢ [acme@toolbx perf-tools-next]$ git remote update tip
Fetching tip
⬢ [acme@toolbx perf-tools-next]$ git show 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d
fatal: bad object 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d
⬢ [acme@toolbx perf-tools-next]$

Quoted 7 lines
Quoted 3 lines

So please add the summary, that way we can try to figure out if this is a rebase and they look for the description instead of this sha1 that I'm not finding even after doing a 'git remore update tip'.

Does this mean the kernel change broke the tool build but we don't have it in the perf-tools-next yet? Then probably we need to wait for the next merge window to fix it in the tool side, no?

I'm not noticing this with perf-tools-next on a 9950x3d fedora:42 and the referenced commit is not present in it nor in upstream nor in tip master, so I need the reporter to check his environment and report back.

- Arnaldo

#5 lore raw
In reply to Arnaldo Carvalho de Melo
Quoted 16 lines · Arnaldo Carvalho de Melo
Quoted 3 lines · Venkat Rao Bagalkote

On 24/04/25 10:00 pm, Athira Rajeev wrote:
Tested this patch by applying on tip HEAD:
7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d and it fixes the reported issue.

This is just a long list of characters, can you please next time provide something like, humm, tip/head, not really:

⬢ [acme@toolbx perf-tools-next]$ git remote -v | grep tip
tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (fetch)
tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git (push)
⬢ [acme@toolbx perf-tools-next]$ git remote update tip
Fetching tip
⬢ [acme@toolbx perf-tools-next]$ git show 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d
fatal: bad object 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d
⬢ [acme@toolbx perf-tools-next]$

Quoted 3 lines

So please add the summary, that way we can try to figure out if this is a rebase and they look for the description instead of this sha1 that I'm not finding even after doing a 'git remore update tip'.

Apolozies for the confusion.

The commit ID I shared was from the repo: https://kernel.googlesource.com/pub/scm/linux/kernel/git/tip/tip.

# git log
commit 7ab869c799fc0fb22f9b4c2f36aaa603d9c7cc9d (HEAD -> master)
Merge: 1e4babe52c11 e396dd85172c
Author: Ingo Molnar <[email protected]>
Date:   Tue Apr 22 14:42:13 2025 +0200

    Merge branch into tip/master: 'x86/sev'

     # New commits in x86/sev:
        e396dd85172c ("x86/sev: Register tpm-svsm platform device") 93b7c6b3ce91 ("tpm: Add SNP SVSM vTPM driver") b2849b072366 ("svsm: Add header with SVSM_VTPM_CMD helpers") 770de678bc28 ("x86/sev: Add SVSM vTPM probe/send_command functions")

I have freshly cloned the repo from https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/ and issue is seen here also. I have applied the patch on top of this, and issue is resolved.

Additional info regarding the environment:

git log

commit 0c6ae66ef164c408daeab6a61aace4b86010369a (HEAD -> master, origin/master, origin/HEAD)
Merge: b6e62c063f84 e396dd85172c
Author: Ingo Molnar <[email protected]>
Date:   Thu Apr 24 20:20:18 2025 +0200

    Merge branch into tip/master: 'x86/sev'

     # New commits in x86/sev:
        e396dd85172c ("x86/sev: Register tpm-svsm platform device") 93b7c6b3ce91 ("tpm: Add SNP SVSM vTPM driver") b2849b072366 ("svsm: Add header with SVSM_VTPM_CMD helpers") 770de678bc28 ("x86/sev: Add SVSM vTPM probe/send_command functions")

git branch
* master

git remote show origin
* remote origin
  Fetch URL: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/
  Push  URL: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/
  HEAD branch: master
  Remote branches:
    auto-latest           tracked
    core/build            tracked
    core/core             tracked
    core/debugobjects     tracked
    core/documentation    tracked
    core/entry            tracked
    core/headers          tracked
    core/kprobes          tracked
    core/merge            tracked
    core/mm               tracked
    core/rcu              tracked
    core/static_call      tracked
    core/urgent           tracked
    efi/core              tracked
    efi/urgent            tracked
    irq/core              tracked
    irq/drivers           tracked
    irq/msi               tracked
    irq/urgent            tracked
    locking/core          tracked
    locking/debug         tracked
    locking/futex         tracked
    locking/header        tracked
    locking/kcsan         tracked
    locking/nmi           tracked
    locking/rcuref        tracked
    locking/rwsem         tracked
    locking/urgent        tracked
    locking/wwmutex       tracked
    master                tracked
    objtool/core          tracked
    objtool/urgent        tracked
    perf/core             tracked
    perf/kprobes          tracked
    perf/merge            tracked
    perf/urgent           tracked
    perf/vlbr             tracked
    ras/core              tracked
    ras/merge             tracked
    ras/urgent            tracked
    rcu/urgent            tracked
    sched/arm64           tracked
    sched/core            tracked
    sched/eevdf           tracked
    sched/fifo            tracked
    sched/migrate-disable tracked
    sched/psi             tracked
    sched/rt              tracked
    sched/smp             tracked
    sched/urgent          tracked
    smp/core              tracked
    smp/urgent            tracked
    timers/cleanups       tracked
    timers/clocksource    tracked
    timers/core           tracked
    timers/merge          tracked
    timers/nohz           tracked
    timers/ptp            tracked
    timers/urgent         tracked
    timers/vdso           tracked
    tip/tip               tracked
    tip/urgent            tracked
    x86/acpi              tracked
    x86/alternatives      tracked
    x86/apic              tracked
    x86/asm               tracked
    x86/boot              tracked
    x86/bugs              tracked
    x86/build             tracked
    x86/cache             tracked
    x86/cc                tracked
    x86/cleanups          tracked
    x86/core              tracked
    x86/cpu               tracked
    x86/entry             tracked
    x86/fpu               tracked
    x86/fred              tracked
    x86/fsgsbase          tracked
    x86/headers           tracked
    x86/hyperv            tracked
    x86/irq               tracked
    x86/kaslr             tracked
    x86/kconfig           tracked
    x86/kdump             tracked
    x86/merge             tracked
    x86/microcode         tracked
    x86/misc              tracked
    x86/mm                tracked
    x86/msr               tracked
    x86/mtrr              tracked
    x86/nmi               tracked
    x86/paravirt          tracked
    x86/pasid             tracked
    x86/percpu            tracked
    x86/platform          tracked
    x86/sev               tracked
    x86/seves             tracked
    x86/sgx               tracked
    x86/shstk             tracked
    x86/splitlock         tracked
    x86/tdx               tracked
    x86/timers            tracked
    x86/urgent            tracked
    x86/vdso              tracked
    x86/vmware            tracked
  Local branch configured for 'git pull':
    master merges with remote master
  Local ref configured for 'git push':

    master pushes to master (fast-forwardable)

Regards,

Venkat.

Quoted 6 lines
Quoted 2 lines

Thanks,

- Arnaldo

#6 lore raw
In reply to Athira Rajeev
Quoted 4 lines · Athira Rajeev

Headers sync up update for the patch that adds the original copy of the IBS header file in arch/x86/include/asm/amd/ibs.h

Without this, perf shows build warning:

Warning != error, so shouldn't result in something stopping to work.

Quoted 1 line
 # make

What is the cwd?

Probably tools/perf/

Quoted 25 lines

BUILD: Doing 'make -j24' parallel build
diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/linux/bits.h include/uapi/linux/bits.h diff -u tools/include/linux/bits.h include/linux/bits.h
diff -u tools/include/vdso/unaligned.h include/vdso/unaligned.h
diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h diff -u tools/arch/x86/include/asm/amd/ibs.h arch/x86/include/asm/amd/ibs.h diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h

Add tools/arch/x86/include/asm/amd directory and also file tools/arch/x86/include/asm/amd/ibs.h to sync up the kernel headers with perf tools and fix the warning:

diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory

Apart from the warning, the perf build also fails as below on powerpc:

In file included from util/amd-sample-raw.c:12:0:
/root/bug/tip/tools/include/../../arch/x86/include/asm/amd/ibs.h:10:10: fatal error: asm/msr-index.h: No such file or directory

   #include <asm/msr-index.h>
            ^~~~~~~~~~~~~~~~~

compilation terminated.

Quoted 7 lines

To fix this, added this change:

-#include <asm/msr-index.h>
+#include "../msr-index.h"

And change the check-headers.sh entry to ignore this line when comparing with the original kernel header.

So, was this caused by some file being updated under tools/ that didn't go thru the maintainers for that area?

It is important to read this file:

tools/include/uapi/README

Specially this part:

The tools/perf/check-headers.sh script, part of the tools/ build process, points out changes in the original files.

So its important not to touch the copies in tools/ when doing changes in the original kernel headers, that will be done later, when check-headers.sh inform about the change to the perf tools hackers.

--

So, files under tools/ should only be updated once it is determined that it doesn't break building tools/.

And for that to happen, just submit it as a separate patch that should be processed by tools people, if it makes sense.

- Arnaldo

Quoted 189 lines
---
 tools/arch/x86/include/asm/amd/ibs.h | 158 +++++++++++++++++++++++++++
 tools/perf/check-headers.sh          |   2 +-
 2 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 tools/arch/x86/include/asm/amd/ibs.h
tools/arch/x86/include/asm/amd/ibs.h new file +158 -0
new file mode 100644
index 000000000000..cbce54fec7b9
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_X86_AMD_IBS_H
+#define _ASM_X86_AMD_IBS_H
+
+/*
+ * From PPR Vol 1 for AMD Family 19h Model 01h B1
+ * 55898 Rev 0.35 - Feb 5, 2021
+ */
+
+#include "../msr-index.h"
+
+/* IBS_OP_DATA2 DataSrc */
+#define IBS_DATA_SRC_LOC_CACHE			 2
+#define IBS_DATA_SRC_DRAM			 3
+#define IBS_DATA_SRC_REM_CACHE			 4
+#define IBS_DATA_SRC_IO				 7
+
+/* IBS_OP_DATA2 DataSrc Extension */
+#define IBS_DATA_SRC_EXT_LOC_CACHE		 1
+#define IBS_DATA_SRC_EXT_NEAR_CCX_CACHE		 2
+#define IBS_DATA_SRC_EXT_DRAM			 3
+#define IBS_DATA_SRC_EXT_FAR_CCX_CACHE		 5
+#define IBS_DATA_SRC_EXT_PMEM			 6
+#define IBS_DATA_SRC_EXT_IO			 7
+#define IBS_DATA_SRC_EXT_EXT_MEM		 8
+#define IBS_DATA_SRC_EXT_PEER_AGENT_MEM		12
+
+/*
+ * IBS Hardware MSRs
+ */
+
+/* MSR 0xc0011030: IBS Fetch Control */
+union ibs_fetch_ctl {
+	__u64 val;
+	struct {
+		__u64	fetch_maxcnt:16,/* 0-15: instruction fetch max. count */
+			fetch_cnt:16,	/* 16-31: instruction fetch count */
+			fetch_lat:16,	/* 32-47: instruction fetch latency */
+			fetch_en:1,	/* 48: instruction fetch enable */
+			fetch_val:1,	/* 49: instruction fetch valid */
+			fetch_comp:1,	/* 50: instruction fetch complete */
+			ic_miss:1,	/* 51: i-cache miss */
+			phy_addr_valid:1,/* 52: physical address valid */
+			l1tlb_pgsz:2,	/* 53-54: i-cache L1TLB page size
+					 *	  (needs IbsPhyAddrValid) */
+			l1tlb_miss:1,	/* 55: i-cache fetch missed in L1TLB */
+			l2tlb_miss:1,	/* 56: i-cache fetch missed in L2TLB */
+			rand_en:1,	/* 57: random tagging enable */
+			fetch_l2_miss:1,/* 58: L2 miss for sampled fetch
+					 *      (needs IbsFetchComp) */
+			l3_miss_only:1,	/* 59: Collect L3 miss samples only */
+			fetch_oc_miss:1,/* 60: Op cache miss for the sampled fetch */
+			fetch_l3_miss:1,/* 61: L3 cache miss for the sampled fetch */
+			reserved:2;	/* 62-63: reserved */
+	};
+};
+
+/* MSR 0xc0011033: IBS Execution Control */
+union ibs_op_ctl {
+	__u64 val;
+	struct {
+		__u64	opmaxcnt:16,	/* 0-15: periodic op max. count */
+			l3_miss_only:1,	/* 16: Collect L3 miss samples only */
+			op_en:1,	/* 17: op sampling enable */
+			op_val:1,	/* 18: op sample valid */
+			cnt_ctl:1,	/* 19: periodic op counter control */
+			opmaxcnt_ext:7,	/* 20-26: upper 7 bits of periodic op maximum count */
+			reserved0:5,	/* 27-31: reserved */
+			opcurcnt:27,	/* 32-58: periodic op counter current count */
+			ldlat_thrsh:4,	/* 59-62: Load Latency threshold */
+			ldlat_en:1;	/* 63: Load Latency enabled */
+	};
+};
+
+/* MSR 0xc0011035: IBS Op Data 1 */
+union ibs_op_data {
+	__u64 val;
+	struct {
+		__u64	comp_to_ret_ctr:16,	/* 0-15: op completion to retire count */
+			tag_to_ret_ctr:16,	/* 15-31: op tag to retire count */
+			reserved1:2,		/* 32-33: reserved */
+			op_return:1,		/* 34: return op */
+			op_brn_taken:1,		/* 35: taken branch op */
+			op_brn_misp:1,		/* 36: mispredicted branch op */
+			op_brn_ret:1,		/* 37: branch op retired */
+			op_rip_invalid:1,	/* 38: RIP is invalid */
+			op_brn_fuse:1,		/* 39: fused branch op */
+			op_microcode:1,		/* 40: microcode op */
+			reserved2:23;		/* 41-63: reserved */
+	};
+};
+
+/* MSR 0xc0011036: IBS Op Data 2 */
+union ibs_op_data2 {
+	__u64 val;
+	struct {
+		__u64	data_src_lo:3,	/* 0-2: data source low */
+			reserved0:1,	/* 3: reserved */
+			rmt_node:1,	/* 4: destination node */
+			cache_hit_st:1,	/* 5: cache hit state */
+			data_src_hi:2,	/* 6-7: data source high */
+			reserved1:56;	/* 8-63: reserved */
+	};
+};
+
+/* MSR 0xc0011037: IBS Op Data 3 */
+union ibs_op_data3 {
+	__u64 val;
+	struct {
+		__u64	ld_op:1,			/* 0: load op */
+			st_op:1,			/* 1: store op */
+			dc_l1tlb_miss:1,		/* 2: data cache L1TLB miss */
+			dc_l2tlb_miss:1,		/* 3: data cache L2TLB hit in 2M page */
+			dc_l1tlb_hit_2m:1,		/* 4: data cache L1TLB hit in 2M page */
+			dc_l1tlb_hit_1g:1,		/* 5: data cache L1TLB hit in 1G page */
+			dc_l2tlb_hit_2m:1,		/* 6: data cache L2TLB hit in 2M page */
+			dc_miss:1,			/* 7: data cache miss */
+			dc_mis_acc:1,			/* 8: misaligned access */
+			reserved:4,			/* 9-12: reserved */
+			dc_wc_mem_acc:1,		/* 13: write combining memory access */
+			dc_uc_mem_acc:1,		/* 14: uncacheable memory access */
+			dc_locked_op:1,			/* 15: locked operation */
+			dc_miss_no_mab_alloc:1,		/* 16: DC miss with no MAB allocated */
+			dc_lin_addr_valid:1,		/* 17: data cache linear address valid */
+			dc_phy_addr_valid:1,		/* 18: data cache physical address valid */
+			dc_l2_tlb_hit_1g:1,		/* 19: data cache L2 hit in 1GB page */
+			l2_miss:1,			/* 20: L2 cache miss */
+			sw_pf:1,			/* 21: software prefetch */
+			op_mem_width:4,			/* 22-25: load/store size in bytes */
+			op_dc_miss_open_mem_reqs:6,	/* 26-31: outstanding mem reqs on DC fill */
+			dc_miss_lat:16,			/* 32-47: data cache miss latency */
+			tlb_refill_lat:16;		/* 48-63: L1 TLB refill latency */
+	};
+};
+
+/* MSR 0xc001103c: IBS Fetch Control Extended */
+union ic_ibs_extd_ctl {
+	__u64 val;
+	struct {
+		__u64	itlb_refill_lat:16,	/* 0-15: ITLB Refill latency for sampled fetch */
+			reserved:48;		/* 16-63: reserved */
+	};
+};
+
+/*
+ * IBS driver related
+ */
+
+struct perf_ibs_data {
+	u32		size;
+	union {
+		u32	data[0];	/* data buffer starts here */
+		u32	caps;
+	};
+	u64		regs[MSR_AMD64_IBS_REG_COUNT_MAX];
+};
+
+#endif /* _ASM_X86_AMD_IBS_H */
tools/perf/check-headers.sh +1 -1
index e9fab20e9330..e1a1fdfa7115 100755
@@ -186,7 +186,7 @@ done
 # diff with extra ignore lines
 check arch/x86/lib/memcpy_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))" -I"^#include <linux/cfi_types.h>"'
 check arch/x86/lib/memset_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"'
-check arch/x86/include/asm/amd/ibs.h  '-I "^#include [<\"]\(asm/\)*msr-index.h"'
+check arch/x86/include/asm/amd/ibs.h  '-I "^#include <asm/msr-index.h>" -I "^#include \"\.\./msr-index.h\""'
 check arch/arm64/include/asm/cputype.h '-I "^#include [<\"]\(asm/\)*sysreg.h"'
 check include/linux/unaligned.h '-I "^#include <linux/unaligned/packed_struct.h>" -I "^#include <asm/byteorder.h>" -I "^#pragma GCC diagnostic"'
 check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'
Signature · 1 line
2.43.0
#7 lore raw
Quoted 10 lines · Arnaldo Carvalho de Melo
Quoted 4 lines · Athira Rajeev

Headers sync up update for the patch that adds the original copy of the IBS header file in arch/x86/include/asm/amd/ibs.h

Without this, perf shows build warning:

Quoted 7 lines

Warning != error, so shouldn't result in something stopping to work.

Quoted 1 line
# make

What is the cwd?

Probably tools/perf/

Yes, it is from tools/perf

Quoted 46 lines
Quoted 26 lines

BUILD: Doing 'make -j24' parallel build
diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory
Warning: Kernel ABI header differences:
diff -u tools/include/uapi/linux/bits.h include/uapi/linux/bits.h diff -u tools/include/linux/bits.h include/linux/bits.h
diff -u tools/include/vdso/unaligned.h include/vdso/unaligned.h
diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h diff -u tools/arch/x86/include/asm/amd/ibs.h arch/x86/include/asm/amd/ibs.h diff -u tools/arch/arm64/include/asm/cputype.h arch/arm64/include/asm/cputype.h

Add tools/arch/x86/include/asm/amd directory and also file tools/arch/x86/include/asm/amd/ibs.h to sync up the kernel headers with perf tools and fix the warning:

diff: tools/arch/x86/include/asm/amd/ibs.h: No such file or directory

Apart from the warning, the perf build also fails as below on powerpc:

In file included from util/amd-sample-raw.c:12:0:
/root/bug/tip/tools/include/../../arch/x86/include/asm/amd/ibs.h:10:10: fatal error: asm/msr-index.h: No such file or directory

  #include <asm/msr-index.h>
           ^~~~~~~~~~~~~~~~~

compilation terminated.

Quoted 7 lines

To fix this, added this change:

-#include <asm/msr-index.h>
+#include "../msr-index.h"

And change the check-headers.sh entry to ignore this line when comparing with the original kernel header.

So, was this caused by some file being updated under tools/ that didn't go thru the maintainers for that area?

It is important to read this file:

tools/include/uapi/README

Specially this part:

The tools/perf/check-headers.sh script, part of the tools/ build process, points out changes in the original files.

Quoted 8 lines

So its important not to touch the copies in tools/ when doing changes in the original kernel headers, that will be done later, when check-headers.sh inform about the change to the perf tools hackers.

--

So, files under tools/ should only be updated once it is determined that it doesn't break building tools/.

Hi Arnaldo, Namhyung

Thanks for responding and checking the patch.

This is breaking the tools/perf build in kernel tip. Sorry, I should have mentioned which tree this is observed and background. It is reported for https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
and discussed here: https://lore.kernel.org/all/[email protected]/
Reported build failure on powerpc for linux-next , after merge of the tip tree.

I could also recreate the build failure on powerpc when trying to compile perf with latest tip/master

In file included from util/amd-sample-raw.c:12:0:
/root/bug/tip/tools/include/../../arch/x86/include/asm/amd/ibs.h:10:10: fatal error: asm/msr-index.h: No such file or directory

   #include <asm/msr-index.h>
            ^~~~~~~~~~~~~~~~~

compilation terminated.

To note: Build break is observed even without picking the amd/ibs.h file to tools path. Since we can’t change the kernel header file, I took the approach to sync the kernel header file to tools , change the include for “../msr-index.h”, and update check-headers.sh

This is observed after the commit change which moved amd-ibs.h to amd/ibs.h Reference commit: https://lore.kernel.org/all/[email protected]/#t

This header file change is not landed in perf-tools-next : https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/arch/x86/include/asm?h=tmp.perf-tools-next
So it is not observed in perf-tools-next yet..

Arnaldo, Namhyung
I am not sure when we can merge this fix, but as reported by Stephen, we are seeing build failure on powerpc when using https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git without this fix patch

Please share your thoughts..

So we have two issues:
1. Header file change from arch/x86/include/asm/amd-ibs.h to arch/x86/include/asm/amd/ibs.h , this is used by code "tools/perf/util/amd-sample-raw.c” Reference commit : https://lore.kernel.org/all/[email protected]/#t

2. Build break on powerpc because it fails to find asm/msr-index.h which needs this change:

      -#include <asm/msr-index.h>
      +#include "../msr-index.h”
    And also check-headers.sh change to ignore this line when comparing with the original kernel header. 

Note: Similar change was done for tools/arch/x86/include/asm/amd-ibs.h as well. Reference commit below:

commit dde994dd54fbf84f8fd14230de3477d552e42470
Author: Kim Phillips <[email protected]>
Date: Tue Aug 17 17:15:08 2021 -0500

perf report: Add tools/arch/x86/include/asm/amd-ibs.h
This is a tools/-side patch for the patch that adds the original copy
of the IBS header file, in arch/x86/include/asm/.
We also add an entry to check-headers.sh, so future changes continue
to be copied.
Committer notes:
Had to add this
-#include <asm/msr-index.h>
+#include "msr-index.h"
And change the check-headers.sh entry to ignore this line when diffing
with the original kernel header.

Thanks
Athira

Quoted 195 lines

And for that to happen, just submit it as a separate patch that should be processed by tools people, if it makes sense.

- Arnaldo

Quoted 189 lines

---
tools/arch/x86/include/asm/amd/ibs.h | 158 +++++++++++++++++++++++++++
tools/perf/check-headers.sh | 2 +-

2 files changed, 159 insertions(+), 1 deletion(-)

create mode 100644 tools/arch/x86/include/asm/amd/ibs.h

tools/arch/x86/include/asm/amd/ibs.h new file +158 -0
new file mode 100644
index 000000000000..cbce54fec7b9
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _ASM_X86_AMD_IBS_H
+#define _ASM_X86_AMD_IBS_H
+
+/*
+ * From PPR Vol 1 for AMD Family 19h Model 01h B1
+ * 55898 Rev 0.35 - Feb 5, 2021
+ */
+
+#include "../msr-index.h"
+
+/* IBS_OP_DATA2 DataSrc */
+#define IBS_DATA_SRC_LOC_CACHE  2
+#define IBS_DATA_SRC_DRAM  3
+#define IBS_DATA_SRC_REM_CACHE  4
+#define IBS_DATA_SRC_IO  7
+
+/* IBS_OP_DATA2 DataSrc Extension */
+#define IBS_DATA_SRC_EXT_LOC_CACHE  1
+#define IBS_DATA_SRC_EXT_NEAR_CCX_CACHE  2
+#define IBS_DATA_SRC_EXT_DRAM  3
+#define IBS_DATA_SRC_EXT_FAR_CCX_CACHE  5
+#define IBS_DATA_SRC_EXT_PMEM  6
+#define IBS_DATA_SRC_EXT_IO  7
+#define IBS_DATA_SRC_EXT_EXT_MEM  8
+#define IBS_DATA_SRC_EXT_PEER_AGENT_MEM 12
+
+/*
+ * IBS Hardware MSRs
+ */
+
+/* MSR 0xc0011030: IBS Fetch Control */
+union ibs_fetch_ctl {
+ __u64 val;
+ struct {
+ __u64 fetch_maxcnt:16,/* 0-15: instruction fetch max. count */
+ fetch_cnt:16, /* 16-31: instruction fetch count */
+ fetch_lat:16, /* 32-47: instruction fetch latency */
+ fetch_en:1, /* 48: instruction fetch enable */
+ fetch_val:1, /* 49: instruction fetch valid */
+ fetch_comp:1, /* 50: instruction fetch complete */
+ ic_miss:1, /* 51: i-cache miss */
+ phy_addr_valid:1,/* 52: physical address valid */
+ l1tlb_pgsz:2, /* 53-54: i-cache L1TLB page size
+  *   (needs IbsPhyAddrValid) */
+ l1tlb_miss:1, /* 55: i-cache fetch missed in L1TLB */
+ l2tlb_miss:1, /* 56: i-cache fetch missed in L2TLB */
+ rand_en:1, /* 57: random tagging enable */
+ fetch_l2_miss:1,/* 58: L2 miss for sampled fetch
+  *      (needs IbsFetchComp) */
+ l3_miss_only:1, /* 59: Collect L3 miss samples only */
+ fetch_oc_miss:1,/* 60: Op cache miss for the sampled fetch */
+ fetch_l3_miss:1,/* 61: L3 cache miss for the sampled fetch */
+ reserved:2; /* 62-63: reserved */
+ };
+};
+
+/* MSR 0xc0011033: IBS Execution Control */
+union ibs_op_ctl {
+ __u64 val;
+ struct {
+ __u64 opmaxcnt:16, /* 0-15: periodic op max. count */
+ l3_miss_only:1, /* 16: Collect L3 miss samples only */
+ op_en:1, /* 17: op sampling enable */
+ op_val:1, /* 18: op sample valid */
+ cnt_ctl:1, /* 19: periodic op counter control */
+ opmaxcnt_ext:7, /* 20-26: upper 7 bits of periodic op maximum count */
+ reserved0:5, /* 27-31: reserved */
+ opcurcnt:27, /* 32-58: periodic op counter current count */
+ ldlat_thrsh:4, /* 59-62: Load Latency threshold */
+ ldlat_en:1; /* 63: Load Latency enabled */
+ };
+};
+
+/* MSR 0xc0011035: IBS Op Data 1 */
+union ibs_op_data {
+ __u64 val;
+ struct {
+ __u64 comp_to_ret_ctr:16, /* 0-15: op completion to retire count */
+ tag_to_ret_ctr:16, /* 15-31: op tag to retire count */
+ reserved1:2, /* 32-33: reserved */
+ op_return:1, /* 34: return op */
+ op_brn_taken:1, /* 35: taken branch op */
+ op_brn_misp:1, /* 36: mispredicted branch op */
+ op_brn_ret:1, /* 37: branch op retired */
+ op_rip_invalid:1, /* 38: RIP is invalid */
+ op_brn_fuse:1, /* 39: fused branch op */
+ op_microcode:1, /* 40: microcode op */
+ reserved2:23; /* 41-63: reserved */
+ };
+};
+
+/* MSR 0xc0011036: IBS Op Data 2 */
+union ibs_op_data2 {
+ __u64 val;
+ struct {
+ __u64 data_src_lo:3, /* 0-2: data source low */
+ reserved0:1, /* 3: reserved */
+ rmt_node:1, /* 4: destination node */
+ cache_hit_st:1, /* 5: cache hit state */
+ data_src_hi:2, /* 6-7: data source high */
+ reserved1:56; /* 8-63: reserved */
+ };
+};
+
+/* MSR 0xc0011037: IBS Op Data 3 */
+union ibs_op_data3 {
+ __u64 val;
+ struct {
+ __u64 ld_op:1, /* 0: load op */
+ st_op:1, /* 1: store op */
+ dc_l1tlb_miss:1, /* 2: data cache L1TLB miss */
+ dc_l2tlb_miss:1, /* 3: data cache L2TLB hit in 2M page */
+ dc_l1tlb_hit_2m:1, /* 4: data cache L1TLB hit in 2M page */
+ dc_l1tlb_hit_1g:1, /* 5: data cache L1TLB hit in 1G page */
+ dc_l2tlb_hit_2m:1, /* 6: data cache L2TLB hit in 2M page */
+ dc_miss:1, /* 7: data cache miss */
+ dc_mis_acc:1, /* 8: misaligned access */
+ reserved:4, /* 9-12: reserved */
+ dc_wc_mem_acc:1, /* 13: write combining memory access */
+ dc_uc_mem_acc:1, /* 14: uncacheable memory access */
+ dc_locked_op:1, /* 15: locked operation */
+ dc_miss_no_mab_alloc:1, /* 16: DC miss with no MAB allocated */
+ dc_lin_addr_valid:1, /* 17: data cache linear address valid */
+ dc_phy_addr_valid:1, /* 18: data cache physical address valid */
+ dc_l2_tlb_hit_1g:1, /* 19: data cache L2 hit in 1GB page */
+ l2_miss:1, /* 20: L2 cache miss */
+ sw_pf:1, /* 21: software prefetch */
+ op_mem_width:4, /* 22-25: load/store size in bytes */
+ op_dc_miss_open_mem_reqs:6, /* 26-31: outstanding mem reqs on DC fill */
+ dc_miss_lat:16, /* 32-47: data cache miss latency */
+ tlb_refill_lat:16; /* 48-63: L1 TLB refill latency */
+ };
+};
+
+/* MSR 0xc001103c: IBS Fetch Control Extended */
+union ic_ibs_extd_ctl {
+ __u64 val;
+ struct {
+ __u64 itlb_refill_lat:16, /* 0-15: ITLB Refill latency for sampled fetch */
+ reserved:48; /* 16-63: reserved */
+ };
+};
+
+/*
+ * IBS driver related
+ */
+
+struct perf_ibs_data {
+ u32 size;
+ union {
+ u32 data[0]; /* data buffer starts here */
+ u32 caps;
+ };
+ u64 regs[MSR_AMD64_IBS_REG_COUNT_MAX];
+};
+
+#endif /* _ASM_X86_AMD_IBS_H */
tools/perf/check-headers.sh +0 -0
index e9fab20e9330..e1a1fdfa7115 100755
@@ -186,7 +186,7 @@ done
 # diff with extra ignore lines
check arch/x86/lib/memcpy_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memcpy_\(erms\|orig\))" -I"^#include <linux/cfi_types.h>"'
check arch/x86/lib/memset_64.S        '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"'
tools/perf/check-headers.sh +1 -1
-check arch/x86/include/asm/amd/ibs.h  '-I "^#include [<\"]\(asm/\)*msr-index.h"'
+check arch/x86/include/asm/amd/ibs.h  '-I "^#include <asm/msr-index.h>" -I "^#include \"\.\./msr-index.h\""'

check arch/arm64/include/asm/cputype.h '-I "^#include [<\"]\(asm/\)*sysreg.h"'
check include/linux/unaligned.h '-I "^#include <linux/unaligned/packed_struct.h>" -I "^#include <asm/byteorder.h>" -I "^#pragma GCC diagnostic"' check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'

Signature · 1 line
2.43.0