Commit 13a2e429 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v6.9-2024-04-19' of... 

Merge tag 'perf-tools-fixes-for-v6.9-2024-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools

Pull perf tools fixes from Namhyung Kim:
 "A random set of small bug fixes:

   - Fix perf annotate TUI when used with data type profiling

   - Work around BPF verifier about sighand lock checking

  And a set of kernel header synchronization"

* tag 'perf-tools-fixes-for-v6.9-2024-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools:
  tools/include: Sync arm64 asm/cputype.h with the kernel sources
  tools/include: Sync asm-generic/bitops/fls.h with the kernel sources
  tools/include: Sync x86 asm/msr-index.h with the kernel sources
  tools/include: Sync x86 asm/irq_vectors.h with the kernel sources
  tools/include: Sync x86 CPU feature headers with the kernel sources
  tools/include: Sync uapi/sound/asound.h with the kernel sources
  tools/include: Sync uapi/linux/kvm.h and asm/kvm.h with the kernel sources
  tools/include: Sync uapi/linux/fs.h with the kernel sources
  tools/include: Sync uapi/drm/i915_drm.h with the kernel sources
  perf lock contention: Add a missing NULL check
  perf annotate: Make sure to call symbol__annotate2() in TUI
parents 2d412262 1cebd7f7

tools/arch/arm64/include/asm/cputype.h

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#define ARM_CPU_IMP_HISI		0x48

#define ARM_CPU_IMP_APPLE		0x61

#define ARM_CPU_IMP_AMPERE		0xC0

#define ARM_CPU_IMP_MICROSOFT		0x6D



#define ARM_CPU_PART_AEM_V8		0xD0F

#define ARM_CPU_PART_FOUNDATION		0xD00
@@ -135,6 +136,8 @@ 


#define AMPERE_CPU_PART_AMPERE1		0xAC3



#define MICROSOFT_CPU_PART_AZURE_COBALT_100	0xD49 /* Based on r0p0 of ARM Neoverse N2 */



#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)

#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)

#define MIDR_CORTEX_A72 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A72)
@@ -193,6 +196,7 @@ 
#define MIDR_APPLE_M2_BLIZZARD_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX)

#define MIDR_APPLE_M2_AVALANCHE_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_AVALANCHE_MAX)

#define MIDR_AMPERE1 MIDR_CPU_MODEL(ARM_CPU_IMP_AMPERE, AMPERE_CPU_PART_AMPERE1)

#define MIDR_MICROSOFT_AZURE_COBALT_100 MIDR_CPU_MODEL(ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_AZURE_COBALT_100)



/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */

#define MIDR_FUJITSU_ERRATUM_010001		MIDR_FUJITSU_A64FX

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

+9 −6
Original line number Diff line number Diff line
@@ -37,9 +37,7 @@ 
#include <asm/ptrace.h>

#include <asm/sve_context.h>



#define __KVM_HAVE_GUEST_DEBUG

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_READONLY_MEM

#define __KVM_HAVE_VCPU_EVENTS



#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -76,10 +74,10 @@ struct kvm_regs { 


/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */

#define KVM_ARM_DEVICE_TYPE_SHIFT	0

#define KVM_ARM_DEVICE_TYPE_MASK	GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \

#define KVM_ARM_DEVICE_TYPE_MASK	__GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \

						  KVM_ARM_DEVICE_TYPE_SHIFT)

#define KVM_ARM_DEVICE_ID_SHIFT		16

#define KVM_ARM_DEVICE_ID_MASK		GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \

#define KVM_ARM_DEVICE_ID_MASK		__GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \

						  KVM_ARM_DEVICE_ID_SHIFT)



/* Supported device IDs */
@@ -162,6 +160,11 @@ struct kvm_sync_regs { 
	__u64 device_irq_level;

};



/* Bits for run->s.regs.device_irq_level */

#define KVM_ARM_DEV_EL1_VTIMER		(1 << 0)

#define KVM_ARM_DEV_EL1_PTIMER		(1 << 1)

#define KVM_ARM_DEV_PMU			(1 << 2)



/*

 * PMU filter structure. Describe a range of events with a particular

 * action. To be used with KVM_ARM_VCPU_PMU_V3_FILTER.

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

+44 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#define __KVM_HAVE_PPC_SMT

#define __KVM_HAVE_IRQCHIP

#define __KVM_HAVE_IRQ_LINE

#define __KVM_HAVE_GUEST_DEBUG



/* Not always available, but if it is, this is the correct offset.  */

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -733,4 +732,48 @@ struct kvm_ppc_xive_eq { 
#define KVM_XIVE_TIMA_PAGE_OFFSET	0

#define KVM_XIVE_ESB_PAGE_OFFSET	4



/* for KVM_PPC_GET_PVINFO */



#define KVM_PPC_PVINFO_FLAGS_EV_IDLE   (1<<0)



struct kvm_ppc_pvinfo {

	/* out */

	__u32 flags;

	__u32 hcall[4];

	__u8  pad[108];

};



/* for KVM_PPC_GET_SMMU_INFO */

#define KVM_PPC_PAGE_SIZES_MAX_SZ	8



struct kvm_ppc_one_page_size {

	__u32 page_shift;	/* Page shift (or 0) */

	__u32 pte_enc;		/* Encoding in the HPTE (>>12) */

};



struct kvm_ppc_one_seg_page_size {

	__u32 page_shift;	/* Base page shift of segment (or 0) */

	__u32 slb_enc;		/* SLB encoding for BookS */

	struct kvm_ppc_one_page_size enc[KVM_PPC_PAGE_SIZES_MAX_SZ];

};



#define KVM_PPC_PAGE_SIZES_REAL		0x00000001

#define KVM_PPC_1T_SEGMENTS		0x00000002

#define KVM_PPC_NO_HASH			0x00000004



struct kvm_ppc_smmu_info {

	__u64 flags;

	__u32 slb_size;

	__u16 data_keys;	/* # storage keys supported for data */

	__u16 instr_keys;	/* # storage keys supported for instructions */

	struct kvm_ppc_one_seg_page_size sps[KVM_PPC_PAGE_SIZES_MAX_SZ];

};



/* for KVM_PPC_RESIZE_HPT_{PREPARE,COMMIT} */

struct kvm_ppc_resize_hpt {

	__u64 flags;

	__u32 shift;

	__u32 pad;

};



#endif /* __LINUX_KVM_POWERPC_H */

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

+314 −1
Original line number Diff line number Diff line
@@ -12,7 +12,320 @@ 
#include <linux/types.h>



#define __KVM_S390

#define __KVM_HAVE_GUEST_DEBUG



struct kvm_s390_skeys {

	__u64 start_gfn;

	__u64 count;

	__u64 skeydata_addr;

	__u32 flags;

	__u32 reserved[9];

};



#define KVM_S390_CMMA_PEEK (1 << 0)



/**

 * kvm_s390_cmma_log - Used for CMMA migration.

 *

 * Used both for input and output.

 *

 * @start_gfn: Guest page number to start from.

 * @count: Size of the result buffer.

 * @flags: Control operation mode via KVM_S390_CMMA_* flags

 * @remaining: Used with KVM_S390_GET_CMMA_BITS. Indicates how many dirty

 *             pages are still remaining.

 * @mask: Used with KVM_S390_SET_CMMA_BITS. Bitmap of bits to actually set

 *        in the PGSTE.

 * @values: Pointer to the values buffer.

 *

 * Used in KVM_S390_{G,S}ET_CMMA_BITS ioctls.

 */

struct kvm_s390_cmma_log {

	__u64 start_gfn;

	__u32 count;

	__u32 flags;

	union {

		__u64 remaining;

		__u64 mask;

	};

	__u64 values;

};



#define KVM_S390_RESET_POR       1

#define KVM_S390_RESET_CLEAR     2

#define KVM_S390_RESET_SUBSYSTEM 4

#define KVM_S390_RESET_CPU_INIT  8

#define KVM_S390_RESET_IPL       16



/* for KVM_S390_MEM_OP */

struct kvm_s390_mem_op {

	/* in */

	__u64 gaddr;		/* the guest address */

	__u64 flags;		/* flags */

	__u32 size;		/* amount of bytes */

	__u32 op;		/* type of operation */

	__u64 buf;		/* buffer in userspace */

	union {

		struct {

			__u8 ar;	/* the access register number */

			__u8 key;	/* access key, ignored if flag unset */

			__u8 pad1[6];	/* ignored */

			__u64 old_addr;	/* ignored if cmpxchg flag unset */

		};

		__u32 sida_offset; /* offset into the sida */

		__u8 reserved[32]; /* ignored */

	};

};

/* types for kvm_s390_mem_op->op */

#define KVM_S390_MEMOP_LOGICAL_READ	0

#define KVM_S390_MEMOP_LOGICAL_WRITE	1

#define KVM_S390_MEMOP_SIDA_READ	2

#define KVM_S390_MEMOP_SIDA_WRITE	3

#define KVM_S390_MEMOP_ABSOLUTE_READ	4

#define KVM_S390_MEMOP_ABSOLUTE_WRITE	5

#define KVM_S390_MEMOP_ABSOLUTE_CMPXCHG	6



/* flags for kvm_s390_mem_op->flags */

#define KVM_S390_MEMOP_F_CHECK_ONLY		(1ULL << 0)

#define KVM_S390_MEMOP_F_INJECT_EXCEPTION	(1ULL << 1)

#define KVM_S390_MEMOP_F_SKEY_PROTECTION	(1ULL << 2)



/* flags specifying extension support via KVM_CAP_S390_MEM_OP_EXTENSION */

#define KVM_S390_MEMOP_EXTENSION_CAP_BASE	(1 << 0)

#define KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG	(1 << 1)



struct kvm_s390_psw {

	__u64 mask;

	__u64 addr;

};



/* valid values for type in kvm_s390_interrupt */

#define KVM_S390_SIGP_STOP		0xfffe0000u

#define KVM_S390_PROGRAM_INT		0xfffe0001u

#define KVM_S390_SIGP_SET_PREFIX	0xfffe0002u

#define KVM_S390_RESTART		0xfffe0003u

#define KVM_S390_INT_PFAULT_INIT	0xfffe0004u

#define KVM_S390_INT_PFAULT_DONE	0xfffe0005u

#define KVM_S390_MCHK			0xfffe1000u

#define KVM_S390_INT_CLOCK_COMP		0xffff1004u

#define KVM_S390_INT_CPU_TIMER		0xffff1005u

#define KVM_S390_INT_VIRTIO		0xffff2603u

#define KVM_S390_INT_SERVICE		0xffff2401u

#define KVM_S390_INT_EMERGENCY		0xffff1201u

#define KVM_S390_INT_EXTERNAL_CALL	0xffff1202u

/* Anything below 0xfffe0000u is taken by INT_IO */

#define KVM_S390_INT_IO(ai,cssid,ssid,schid)   \

	(((schid)) |			       \

	 ((ssid) << 16) |		       \

	 ((cssid) << 18) |		       \

	 ((ai) << 26))

#define KVM_S390_INT_IO_MIN		0x00000000u

#define KVM_S390_INT_IO_MAX		0xfffdffffu

#define KVM_S390_INT_IO_AI_MASK		0x04000000u





struct kvm_s390_interrupt {

	__u32 type;

	__u32 parm;

	__u64 parm64;

};



struct kvm_s390_io_info {

	__u16 subchannel_id;

	__u16 subchannel_nr;

	__u32 io_int_parm;

	__u32 io_int_word;

};



struct kvm_s390_ext_info {

	__u32 ext_params;

	__u32 pad;

	__u64 ext_params2;

};



struct kvm_s390_pgm_info {

	__u64 trans_exc_code;

	__u64 mon_code;

	__u64 per_address;

	__u32 data_exc_code;

	__u16 code;

	__u16 mon_class_nr;

	__u8 per_code;

	__u8 per_atmid;

	__u8 exc_access_id;

	__u8 per_access_id;

	__u8 op_access_id;

#define KVM_S390_PGM_FLAGS_ILC_VALID	0x01

#define KVM_S390_PGM_FLAGS_ILC_0	0x02

#define KVM_S390_PGM_FLAGS_ILC_1	0x04

#define KVM_S390_PGM_FLAGS_ILC_MASK	0x06

#define KVM_S390_PGM_FLAGS_NO_REWIND	0x08

	__u8 flags;

	__u8 pad[2];

};



struct kvm_s390_prefix_info {

	__u32 address;

};



struct kvm_s390_extcall_info {

	__u16 code;

};



struct kvm_s390_emerg_info {

	__u16 code;

};



#define KVM_S390_STOP_FLAG_STORE_STATUS	0x01

struct kvm_s390_stop_info {

	__u32 flags;

};



struct kvm_s390_mchk_info {

	__u64 cr14;

	__u64 mcic;

	__u64 failing_storage_address;

	__u32 ext_damage_code;

	__u32 pad;

	__u8 fixed_logout[16];

};



struct kvm_s390_irq {

	__u64 type;

	union {

		struct kvm_s390_io_info io;

		struct kvm_s390_ext_info ext;

		struct kvm_s390_pgm_info pgm;

		struct kvm_s390_emerg_info emerg;

		struct kvm_s390_extcall_info extcall;

		struct kvm_s390_prefix_info prefix;

		struct kvm_s390_stop_info stop;

		struct kvm_s390_mchk_info mchk;

		char reserved[64];

	} u;

};



struct kvm_s390_irq_state {

	__u64 buf;

	__u32 flags;        /* will stay unused for compatibility reasons */

	__u32 len;

	__u32 reserved[4];  /* will stay unused for compatibility reasons */

};



struct kvm_s390_ucas_mapping {

	__u64 user_addr;

	__u64 vcpu_addr;

	__u64 length;

};



struct kvm_s390_pv_sec_parm {

	__u64 origin;

	__u64 length;

};



struct kvm_s390_pv_unp {

	__u64 addr;

	__u64 size;

	__u64 tweak;

};



enum pv_cmd_dmp_id {

	KVM_PV_DUMP_INIT,

	KVM_PV_DUMP_CONFIG_STOR_STATE,

	KVM_PV_DUMP_COMPLETE,

	KVM_PV_DUMP_CPU,

};



struct kvm_s390_pv_dmp {

	__u64 subcmd;

	__u64 buff_addr;

	__u64 buff_len;

	__u64 gaddr;		/* For dump storage state */

	__u64 reserved[4];

};



enum pv_cmd_info_id {

	KVM_PV_INFO_VM,

	KVM_PV_INFO_DUMP,

};



struct kvm_s390_pv_info_dump {

	__u64 dump_cpu_buffer_len;

	__u64 dump_config_mem_buffer_per_1m;

	__u64 dump_config_finalize_len;

};



struct kvm_s390_pv_info_vm {

	__u64 inst_calls_list[4];

	__u64 max_cpus;

	__u64 max_guests;

	__u64 max_guest_addr;

	__u64 feature_indication;

};



struct kvm_s390_pv_info_header {

	__u32 id;

	__u32 len_max;

	__u32 len_written;

	__u32 reserved;

};



struct kvm_s390_pv_info {

	struct kvm_s390_pv_info_header header;

	union {

		struct kvm_s390_pv_info_dump dump;

		struct kvm_s390_pv_info_vm vm;

	};

};



enum pv_cmd_id {

	KVM_PV_ENABLE,

	KVM_PV_DISABLE,

	KVM_PV_SET_SEC_PARMS,

	KVM_PV_UNPACK,

	KVM_PV_VERIFY,

	KVM_PV_PREP_RESET,

	KVM_PV_UNSHARE_ALL,

	KVM_PV_INFO,

	KVM_PV_DUMP,

	KVM_PV_ASYNC_CLEANUP_PREPARE,

	KVM_PV_ASYNC_CLEANUP_PERFORM,

};



struct kvm_pv_cmd {

	__u32 cmd;	/* Command to be executed */

	__u16 rc;	/* Ultravisor return code */

	__u16 rrc;	/* Ultravisor return reason code */

	__u64 data;	/* Data or address */

	__u32 flags;    /* flags for future extensions. Must be 0 for now */

	__u32 reserved[3];

};



struct kvm_s390_zpci_op {

	/* in */

	__u32 fh;               /* target device */

	__u8  op;               /* operation to perform */

	__u8  pad[3];

	union {

		/* for KVM_S390_ZPCIOP_REG_AEN */

		struct {

			__u64 ibv;      /* Guest addr of interrupt bit vector */

			__u64 sb;       /* Guest addr of summary bit */

			__u32 flags;

			__u32 noi;      /* Number of interrupts */

			__u8 isc;       /* Guest interrupt subclass */

			__u8 sbo;       /* Offset of guest summary bit vector */

			__u16 pad;

		} reg_aen;

		__u64 reserved[8];

	} u;

};



/* types for kvm_s390_zpci_op->op */

#define KVM_S390_ZPCIOP_REG_AEN                0

#define KVM_S390_ZPCIOP_DEREG_AEN      1



/* flags for kvm_s390_zpci_op->u.reg_aen.flags */

#define KVM_S390_ZPCIOP_REGAEN_HOST    (1 << 0)



/* Device control API: s390-specific devices */

#define KVM_DEV_FLIC_GET_ALL_IRQS	1

tools/arch/x86/include/asm/cpufeatures.h

+12 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
/*

 * Defines x86 CPU feature bits

 */

#define NCAPINTS			21	   /* N 32-bit words worth of info */

#define NCAPINTS			22	   /* N 32-bit words worth of info */

#define NBUGINTS			2	   /* N 32-bit bug flags */



/*
@@ -81,10 +81,8 @@ 
#define X86_FEATURE_K6_MTRR		( 3*32+ 1) /* AMD K6 nonstandard MTRRs */

#define X86_FEATURE_CYRIX_ARR		( 3*32+ 2) /* Cyrix ARRs (= MTRRs) */

#define X86_FEATURE_CENTAUR_MCR		( 3*32+ 3) /* Centaur MCRs (= MTRRs) */



/* CPU types for specific tunings: */

#define X86_FEATURE_K8			( 3*32+ 4) /* "" Opteron, Athlon64 */

/* FREE, was #define X86_FEATURE_K7			( 3*32+ 5) "" Athlon */

#define X86_FEATURE_ZEN5		( 3*32+ 5) /* "" CPU based on Zen5 microarchitecture */

#define X86_FEATURE_P3			( 3*32+ 6) /* "" P3 */

#define X86_FEATURE_P4			( 3*32+ 7) /* "" P4 */

#define X86_FEATURE_CONSTANT_TSC	( 3*32+ 8) /* TSC ticks at a constant rate */
@@ -97,7 +95,7 @@ 
#define X86_FEATURE_SYSENTER32		( 3*32+15) /* "" sysenter in IA32 userspace */

#define X86_FEATURE_REP_GOOD		( 3*32+16) /* REP microcode works well */

#define X86_FEATURE_AMD_LBR_V2		( 3*32+17) /* AMD Last Branch Record Extension Version 2 */

/* FREE, was #define X86_FEATURE_LFENCE_RDTSC		( 3*32+18) "" LFENCE synchronizes RDTSC */

#define X86_FEATURE_CLEAR_CPU_BUF	( 3*32+18) /* "" Clear CPU buffers using VERW */

#define X86_FEATURE_ACC_POWER		( 3*32+19) /* AMD Accumulated Power Mechanism */

#define X86_FEATURE_NOPL		( 3*32+20) /* The NOPL (0F 1F) instructions */

#define X86_FEATURE_ALWAYS		( 3*32+21) /* "" Always-present feature */
@@ -461,6 +459,14 @@ 
#define X86_FEATURE_IBPB_BRTYPE		(20*32+28) /* "" MSR_PRED_CMD[IBPB] flushes all branch type predictions */

#define X86_FEATURE_SRSO_NO		(20*32+29) /* "" CPU is not affected by SRSO */



/*

 * Extended auxiliary flags: Linux defined - for features scattered in various

 * CPUID levels like 0x80000022, etc.

 *

 * Reuse free bits when adding new feature flags!

 */

#define X86_FEATURE_AMD_LBR_PMC_FREEZE	(21*32+ 0) /* AMD LBR and PMC Freeze */



/*

 * BUG word(s)

 */
@@ -508,4 +514,5 @@ 
/* BUG word 2 */

#define X86_BUG_SRSO			X86_BUG(1*32 + 0) /* AMD SRSO bug */

#define X86_BUG_DIV0			X86_BUG(1*32 + 1) /* AMD DIV0 speculation bug */

#define X86_BUG_RFDS			X86_BUG(1*32 + 2) /* CPU is vulnerable to Register File Data Sampling */

#endif /* _ASM_X86_CPUFEATURES_H */