Commit b5b65f13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-for-v5.15-2021-09-11' of... 

Merge tag 'perf-tools-for-v5.15-2021-09-11' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull more perf tools updates from Arnaldo Carvalho de Melo:

 - Add missing fields and remove some duplicate fields when printing a
   perf_event_attr.

 - Fix hybrid config terms list corruption.

 - Update kernel header copies, some resulted in new kernel features
   being automagically added to 'perf trace' syscall/tracepoint argument
   id->string translators.

 - Add a file generated during the documentation build to .gitignore.

 - Add an option to build without libbfd, as some distros, like Debian
   consider its ABI unstable.

 - Add support to print a textual representation of IBS raw sample data
   in 'perf report'.

 - Fix bpf 'perf test' sample mismatch reporting

 - Fix passing arguments to stackcollapse report in a 'perf script'
   python script.

 - Allow build-id with trailing zeros.

 - Look for ImageBase in PE file to compute .text offset.

* tag 'perf-tools-for-v5.15-2021-09-11' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (25 commits)
  tools headers UAPI: Update tools's copy of drm.h headers
  tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
  tools headers UAPI: Sync linux/fs.h with the kernel sources
  tools headers UAPI: Sync linux/in.h copy with the kernel sources
  perf tools: Add an option to build without libbfd
  perf tools: Allow build-id with trailing zeros
  perf tools: Fix hybrid config terms list corruption
  perf tools: Factor out copy_config_terms() and free_config_terms()
  perf tools: Fix perf_event_attr__fprintf() missing/dupl. fields
  perf tools: Ignore Documentation dependency file
  perf bpf: Provide a weak btf__load_from_kernel_by_id() for older libbpf versions
  tools include UAPI: Update linux/mount.h copy
  perf beauty: Cover more flags in the  move_mount syscall argument beautifier
  tools headers UAPI: Sync linux/prctl.h with the kernel sources
  tools include UAPI: Sync sound/asound.h copy with the kernel sources
  tools headers UAPI: Sync linux/kvm.h with the kernel sources
  tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
  perf report: Add support to print a textual representation of IBS raw sample data
  perf report: Add tools/arch/x86/include/asm/amd-ibs.h
  perf env: Add perf_env__cpuid, perf_env__{nr_}pmu_mappings
  ...
parents c3e46874 17a99e52

tools/arch/x86/include/asm/amd-ibs.h

0 → 100644
+132 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * From PPR Vol 1 for AMD Family 19h Model 01h B1

 * 55898 Rev 0.35 - Feb 5, 2021

 */



#include "msr-index.h"



/*

 * 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) */

			reserved:5;	/* 59-63: reserved */

	};

};



/* MSR 0xc0011033: IBS Execution Control */

union ibs_op_ctl {

	__u64 val;

	struct {

		__u64	opmaxcnt:16,	/* 0-15: periodic op max. count */

			reserved0:1,	/* 16: reserved */

			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 */

			reserved1:5,	/* 27-31: reserved */

			opcurcnt:27,	/* 32-58: periodic op counter current count */

			reserved2:5;	/* 59-63: reserved */

	};

};



/* MSR 0xc0011035: IBS Op Data 2 */

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:3,	/* 0-2: data source */

			reserved0:1,	/* 3: reserved */

			rmt_node:1,	/* 4: destination node */

			cache_hit_st:1,	/* 5: cache hit state */

			reserved1:57;	/* 5-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];

};

tools/arch/x86/include/uapi/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ struct kvm_debug_exit_arch { 
#define KVM_GUESTDBG_USE_HW_BP		0x00020000

#define KVM_GUESTDBG_INJECT_DB		0x00040000

#define KVM_GUESTDBG_INJECT_BP		0x00080000

#define KVM_GUESTDBG_BLOCKIRQ		0x00100000



/* for KVM_SET_GUEST_DEBUG */

struct kvm_guest_debug_arch {

tools/include/uapi/asm-generic/unistd.h

+8 −6
Original line number Diff line number Diff line
@@ -673,15 +673,15 @@ __SYSCALL(__NR_madvise, sys_madvise) 
#define __NR_remap_file_pages 234

__SYSCALL(__NR_remap_file_pages, sys_remap_file_pages)

#define __NR_mbind 235

__SC_COMP(__NR_mbind, sys_mbind, compat_sys_mbind)

__SYSCALL(__NR_mbind, sys_mbind)

#define __NR_get_mempolicy 236

__SC_COMP(__NR_get_mempolicy, sys_get_mempolicy, compat_sys_get_mempolicy)

__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)

#define __NR_set_mempolicy 237

__SC_COMP(__NR_set_mempolicy, sys_set_mempolicy, compat_sys_set_mempolicy)

__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)

#define __NR_migrate_pages 238

__SC_COMP(__NR_migrate_pages, sys_migrate_pages, compat_sys_migrate_pages)

__SYSCALL(__NR_migrate_pages, sys_migrate_pages)

#define __NR_move_pages 239

__SC_COMP(__NR_move_pages, sys_move_pages, compat_sys_move_pages)

__SYSCALL(__NR_move_pages, sys_move_pages)

#endif



#define __NR_rt_tgsigqueueinfo 240
@@ -877,9 +877,11 @@ __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self) 
#define __NR_memfd_secret 447

__SYSCALL(__NR_memfd_secret, sys_memfd_secret)

#endif

#define __NR_process_mrelease 448

__SYSCALL(__NR_process_mrelease, sys_process_mrelease)



#undef __NR_syscalls

#define __NR_syscalls 448

#define __NR_syscalls 449



/*

 * 32 bit systems traditionally used different

tools/include/uapi/drm/drm.h

+12 −2
Original line number Diff line number Diff line
@@ -635,8 +635,8 @@ struct drm_gem_open { 
/**

 * DRM_CAP_VBLANK_HIGH_CRTC

 *

 * If set to 1, the kernel supports specifying a CRTC index in the high bits of

 * &drm_wait_vblank_request.type.

 * If set to 1, the kernel supports specifying a :ref:`CRTC index<crtc_index>`

 * in the high bits of &drm_wait_vblank_request.type.

 *

 * Starting kernel version 2.6.39, this capability is always set to 1.

 */
@@ -1050,6 +1050,16 @@ extern "C" { 
#define DRM_IOCTL_MODE_GETPROPBLOB	DRM_IOWR(0xAC, struct drm_mode_get_blob)

#define DRM_IOCTL_MODE_GETFB		DRM_IOWR(0xAD, struct drm_mode_fb_cmd)

#define DRM_IOCTL_MODE_ADDFB		DRM_IOWR(0xAE, struct drm_mode_fb_cmd)

/**

 * DRM_IOCTL_MODE_RMFB - Remove a framebuffer.

 *

 * This removes a framebuffer previously added via ADDFB/ADDFB2. The IOCTL

 * argument is a framebuffer object ID.

 *

 * Warning: removing a framebuffer currently in-use on an enabled plane will

 * disable that plane. The CRTC the plane is linked to may also be disabled

 * (depending on driver capabilities).

 */

#define DRM_IOCTL_MODE_RMFB		DRM_IOWR(0xAF, unsigned int)

#define DRM_IOCTL_MODE_PAGE_FLIP	DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)

#define DRM_IOCTL_MODE_DIRTYFB		DRM_IOWR(0xB1, struct drm_mode_fb_dirty_cmd)

tools/include/uapi/drm/i915_drm.h

+417 −81

File changed.

Preview size limit exceeded, changes collapsed.