Commit 16b3d851 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v6.0-2022-08-19' of... 

Merge tag 'perf-tools-fixes-for-v6.0-2022-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix alignment for cpu map masks in event encoding.

 - Support reading PERF_FORMAT_LOST, perf tool counterpart for a feature
   that was added in this merge window.

 - Sync perf tools copies of kernel headers: socket, msr-index, fscrypt,
   cpufeatures, i915_drm, kvm, vhost, perf_event.

* tag 'perf-tools-fixes-for-v6.0-2022-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf tools: Support reading PERF_FORMAT_LOST
  libperf: Add a test case for read formats
  libperf: Handle read format in perf_evsel__read()
  tools headers UAPI: Sync linux/perf_event.h with the kernel sources
  tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
  tools headers UAPI: Sync KVM's vmx.h header with the kernel sources
  tools include UAPI: Sync linux/vhost.h with the kernel sources
  tools headers kvm s390: Sync headers with the kernel sources
  tools headers UAPI: Sync linux/kvm.h with the kernel sources
  tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
  tools headers cpufeatures: Sync with the kernel sources
  tools headers UAPI: Sync linux/fscrypt.h with the kernel sources
  tools arch x86: Sync the msr-index.h copy with the kernel sources
  perf beauty: Update copy of linux/socket.h with the kernel sources
  perf cpumap: Fix alignment for masks in event encoding
  perf cpumap: Compute mask size in constant time
  perf cpumap: Synthetic events and const/static
  perf cpumap: Const map for max()
parents cc1807b9 f52679b7

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

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct kvm_s390_io_adapter_req { 
#define KVM_S390_VM_CRYPTO		2

#define KVM_S390_VM_CPU_MODEL		3

#define KVM_S390_VM_MIGRATION		4

#define KVM_S390_VM_CPU_TOPOLOGY	5



/* kvm attributes for mem_ctrl */

#define KVM_S390_VM_MEM_ENABLE_CMMA	0

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

+4 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ 
#define X86_FEATURE_IBRS		( 7*32+25) /* Indirect Branch Restricted Speculation */

#define X86_FEATURE_IBPB		( 7*32+26) /* Indirect Branch Prediction Barrier */

#define X86_FEATURE_STIBP		( 7*32+27) /* Single Thread Indirect Branch Predictors */

#define X86_FEATURE_ZEN			( 7*32+28) /* "" CPU is AMD family 0x17 or above (Zen) */

#define X86_FEATURE_ZEN			(7*32+28) /* "" CPU based on Zen microarchitecture */

#define X86_FEATURE_L1TF_PTEINV		( 7*32+29) /* "" L1TF workaround PTE inversion */

#define X86_FEATURE_IBRS_ENHANCED	( 7*32+30) /* Enhanced IBRS */

#define X86_FEATURE_MSR_IA32_FEAT_CTL	( 7*32+31) /* "" MSR IA32_FEAT_CTL configured */
@@ -303,7 +303,7 @@ 
#define X86_FEATURE_RETHUNK		(11*32+14) /* "" Use REturn THUNK */

#define X86_FEATURE_UNRET		(11*32+15) /* "" AMD BTB untrain return */

#define X86_FEATURE_USE_IBPB_FW		(11*32+16) /* "" Use IBPB during runtime firmware calls */

#define X86_FEATURE_RSB_VMEXIT_LITE	(11*32+17) /* "" Fill RSB on VM-Exit when EIBRS is enabled */

#define X86_FEATURE_RSB_VMEXIT_LITE	(11*32+17) /* "" Fill RSB on VM exit when EIBRS is enabled */



/* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */

#define X86_FEATURE_AVX_VNNI		(12*32+ 4) /* AVX VNNI instructions */
@@ -354,6 +354,7 @@ 
#define X86_FEATURE_AVIC		(15*32+13) /* Virtual Interrupt Controller */

#define X86_FEATURE_V_VMSAVE_VMLOAD	(15*32+15) /* Virtual VMSAVE VMLOAD */

#define X86_FEATURE_VGIF		(15*32+16) /* Virtual GIF */

#define X86_FEATURE_X2AVIC		(15*32+18) /* Virtual x2apic */

#define X86_FEATURE_V_SPEC_CTRL		(15*32+20) /* Virtual SPEC_CTRL */

#define X86_FEATURE_SVME_ADDR_CHK	(15*32+28) /* "" SVME addr check */
@@ -457,5 +458,6 @@ 
#define X86_BUG_SRBDS			X86_BUG(24) /* CPU may leak RNG bits if not mitigated */

#define X86_BUG_MMIO_STALE_DATA		X86_BUG(25) /* CPU is affected by Processor MMIO Stale Data vulnerabilities */

#define X86_BUG_RETBLEED		X86_BUG(26) /* CPU is affected by RETBleed */

#define X86_BUG_EIBRS_PBRSB		X86_BUG(27) /* EIBRS is vulnerable to Post Barrier RSB Predictions */



#endif /* _ASM_X86_CPUFEATURES_H */

tools/arch/x86/include/asm/msr-index.h

+8 −0
Original line number Diff line number Diff line
@@ -235,6 +235,12 @@ 
#define PERF_CAP_PT_IDX			16



#define MSR_PEBS_LD_LAT_THRESHOLD	0x000003f6

#define PERF_CAP_PEBS_TRAP             BIT_ULL(6)

#define PERF_CAP_ARCH_REG              BIT_ULL(7)

#define PERF_CAP_PEBS_FORMAT           0xf00

#define PERF_CAP_PEBS_BASELINE         BIT_ULL(14)

#define PERF_CAP_PEBS_MASK	(PERF_CAP_PEBS_TRAP | PERF_CAP_ARCH_REG | \

				 PERF_CAP_PEBS_FORMAT | PERF_CAP_PEBS_BASELINE)



#define MSR_IA32_RTIT_CTL		0x00000570

#define RTIT_CTL_TRACEEN		BIT(0)
@@ -392,6 +398,7 @@ 
#define MSR_TURBO_ACTIVATION_RATIO	0x0000064C



#define MSR_PLATFORM_ENERGY_STATUS	0x0000064D

#define MSR_SECONDARY_TURBO_RATIO_LIMIT	0x00000650



#define MSR_PKG_WEIGHTED_CORE_C0_RES	0x00000658

#define MSR_PKG_ANY_CORE_C0_RES		0x00000659
@@ -1022,6 +1029,7 @@ 
#define MSR_IA32_VMX_TRUE_EXIT_CTLS      0x0000048f

#define MSR_IA32_VMX_TRUE_ENTRY_CTLS     0x00000490

#define MSR_IA32_VMX_VMFUNC             0x00000491

#define MSR_IA32_VMX_PROCBASED_CTLS3	0x00000492



/* VMX_BASIC bits and bitmasks */

#define VMX_BASIC_VMCS_SIZE_SHIFT	32

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

+8 −2
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ struct kvm_pit_state { 
};



#define KVM_PIT_FLAGS_HPET_LEGACY     0x00000001

#define KVM_PIT_FLAGS_SPEAKER_DATA_ON 0x00000002



struct kvm_pit_state2 {

	struct kvm_pit_channel_state channels[3];
@@ -325,6 +326,7 @@ struct kvm_reinject_control { 
#define KVM_VCPUEVENT_VALID_SHADOW	0x00000004

#define KVM_VCPUEVENT_VALID_SMM		0x00000008

#define KVM_VCPUEVENT_VALID_PAYLOAD	0x00000010

#define KVM_VCPUEVENT_VALID_TRIPLE_FAULT	0x00000020



/* Interrupt shadow states */

#define KVM_X86_SHADOW_INT_MOV_SS	0x01
@@ -359,7 +361,10 @@ struct kvm_vcpu_events { 
		__u8 smm_inside_nmi;

		__u8 latched_init;

	} smi;

	__u8 reserved[27];

	struct {

		__u8 pending;

	} triple_fault;

	__u8 reserved[26];

	__u8 exception_has_payload;

	__u64 exception_payload;

};
@@ -434,6 +439,7 @@ struct kvm_sync_regs { 
#define KVM_X86_QUIRK_OUT_7E_INC_RIP		(1 << 3)

#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT	(1 << 4)

#define KVM_X86_QUIRK_FIX_HYPERCALL_INSN	(1 << 5)

#define KVM_X86_QUIRK_MWAIT_NEVER_UD_FAULTS	(1 << 6)



#define KVM_STATE_NESTED_FORMAT_VMX	0

#define KVM_STATE_NESTED_FORMAT_SVM	1

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

+3 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#define EXIT_REASON_UMWAIT              67

#define EXIT_REASON_TPAUSE              68

#define EXIT_REASON_BUS_LOCK            74

#define EXIT_REASON_NOTIFY              75



#define VMX_EXIT_REASONS \

	{ EXIT_REASON_EXCEPTION_NMI,         "EXCEPTION_NMI" }, \
@@ -153,7 +154,8 @@ 
	{ EXIT_REASON_XRSTORS,               "XRSTORS" }, \

	{ EXIT_REASON_UMWAIT,                "UMWAIT" }, \

	{ EXIT_REASON_TPAUSE,                "TPAUSE" }, \

	{ EXIT_REASON_BUS_LOCK,              "BUS_LOCK" }

	{ EXIT_REASON_BUS_LOCK,              "BUS_LOCK" }, \

	{ EXIT_REASON_NOTIFY,                "NOTIFY" }



#define VMX_EXIT_REASON_FLAGS \

	{ VMX_EXIT_REASONS_FAILED_VMENTRY,	"FAILED_VMENTRY" }