Commit 98d7e741 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-2020-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux 

Pull perf tooling fixes from Arnaldo Carvalho de Melo:

 - Update various UAPI headers, some automatically adding support for a
   new MSR and the faccess2 syscall.

 - Fix corner case NULL deref in the histograms code.

 - Fix corner case NULL deref in 'perf stat' aggregation code.

 - Fix array pointer deref and old style declaration in the parsing of
   events.

 - Fix segfault when processing ZSTD compressed perf.data files in 'perf
   script' due to lack of initialization of the ZSTD library.

 - Handle __attribute__((user)) in libtraceevent fixing the parsing of
   syscall tracepoints with user buffers.

 - Make libtraevent aware of __builtin_expect() appearing in tracepoint
   fields.

 - Make the BPF prologue generation use bpf_probe_read_{user,kernel}().

 - Fix the '@user' attribute parsing in kprobes variables in 'perf
   probe'.

 - Fix error message when asking for -fsanitize=address without required
   libraries.

* tag 'perf-tools-fixes-2020-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (22 commits)
  perf build: Fix error message when asking for -fsanitize=address without required libraries
  tools lib traceevent: Add handler for __builtin_expect()
  tools lib traceevent: Handle __attribute__((user)) in field names
  tools lib traceevent: Add append() function helper for appending strings
  tools headers UAPI: Sync linux/fs.h with the kernel sources
  tools include UAPI: Sync linux/vhost.h with the kernel sources
  tools arch x86: Sync the msr-index.h copy with the kernel sources
  perf script: Initialize zstd_data
  perf pmu: Remove unused declaration
  perf parse-events: Fix an old style declaration
  perf parse-events: Fix an incompatible pointer
  perf bpf: Fix bpf prologue generation
  perf probe: Fix user attribute access in kprobes
  perf stat: Fix NULL pointer dereference
  perf report: Fix NULL pointer dereference in hists__fprintf_nr_sample_events()
  tools headers UAPI: Sync kvm.h headers with the kernel sources
  tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
  tools headers UAPI: Sync linux/fscrypt.h with the kernel sources
  perf beauty: Add support to STATX_MNT_ID in the 'statx' syscall 'mask' argument
  tools headers uapi: Sync linux/stat.h with the kernel sources
  ...
parents 5e857ce6 6a1515c9

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

+2 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ 
#define X86_FEATURE_AVX512_4FMAPS	(18*32+ 3) /* AVX-512 Multiply Accumulation Single precision */

#define X86_FEATURE_FSRM		(18*32+ 4) /* Fast Short Rep Mov */

#define X86_FEATURE_AVX512_VP2INTERSECT (18*32+ 8) /* AVX-512 Intersect for D/Q */

#define X86_FEATURE_SRBDS_CTRL		(18*32+ 9) /* "" SRBDS mitigation MSR available */

#define X86_FEATURE_MD_CLEAR		(18*32+10) /* VERW clears CPU buffers */

#define X86_FEATURE_TSX_FORCE_ABORT	(18*32+13) /* "" TSX_FORCE_ABORT */

#define X86_FEATURE_PCONFIG		(18*32+18) /* Intel PCONFIG */
@@ -407,5 +408,6 @@ 
#define X86_BUG_SWAPGS			X86_BUG(21) /* CPU is affected by speculation through SWAPGS */

#define X86_BUG_TAA			X86_BUG(22) /* CPU is affected by TSX Async Abort(TAA) */

#define X86_BUG_ITLB_MULTIHIT		X86_BUG(23) /* CPU may incur MCE during certain page attribute changes */

#define X86_BUG_SRBDS			X86_BUG(24) /* CPU may leak RNG bits if not mitigated */



#endif /* _ASM_X86_CPUFEATURES_H */

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

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,10 @@ 
#define TSX_CTRL_RTM_DISABLE		BIT(0)	/* Disable RTM feature */

#define TSX_CTRL_CPUID_CLEAR		BIT(1)	/* Disable TSX enumeration */



/* SRBDS support */

#define MSR_IA32_MCU_OPT_CTRL		0x00000123

#define RNGDS_MITG_DIS			BIT(0)



#define MSR_IA32_SYSENTER_CS		0x00000174

#define MSR_IA32_SYSENTER_ESP		0x00000175

#define MSR_IA32_SYSENTER_EIP		0x00000176

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

+19 −2
Original line number Diff line number Diff line
@@ -385,33 +385,48 @@ struct kvm_sync_regs { 
#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT (1 << 4)



#define KVM_STATE_NESTED_FORMAT_VMX	0

#define KVM_STATE_NESTED_FORMAT_SVM	1	/* unused */

#define KVM_STATE_NESTED_FORMAT_SVM	1



#define KVM_STATE_NESTED_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_RUN_PENDING	0x00000002

#define KVM_STATE_NESTED_EVMCS		0x00000004

#define KVM_STATE_NESTED_MTF_PENDING	0x00000008

#define KVM_STATE_NESTED_GIF_SET	0x00000100



#define KVM_STATE_NESTED_SMM_GUEST_MODE	0x00000001

#define KVM_STATE_NESTED_SMM_VMXON	0x00000002



#define KVM_STATE_NESTED_VMX_VMCS_SIZE	0x1000



#define KVM_STATE_NESTED_SVM_VMCB_SIZE	0x1000



#define KVM_STATE_VMX_PREEMPTION_TIMER_DEADLINE	0x00000001



struct kvm_vmx_nested_state_data {

	__u8 vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

	__u8 shadow_vmcs12[KVM_STATE_NESTED_VMX_VMCS_SIZE];

	__u64 preemption_timer_deadline;

};



struct kvm_vmx_nested_state_hdr {

	__u32 flags;

	__u64 vmxon_pa;

	__u64 vmcs12_pa;

	__u64 preemption_timer_deadline;



	struct {

		__u16 flags;

	} smm;

};



struct kvm_svm_nested_state_data {

	/* Save area only used if KVM_STATE_NESTED_RUN_PENDING.  */

	__u8 vmcb12[KVM_STATE_NESTED_SVM_VMCB_SIZE];

};



struct kvm_svm_nested_state_hdr {

	__u64 vmcb_pa;

};



/* for KVM_CAP_NESTED_STATE */

struct kvm_nested_state {

	__u16 flags;
@@ -420,6 +435,7 @@ struct kvm_nested_state { 


	union {

		struct kvm_vmx_nested_state_hdr vmx;

		struct kvm_svm_nested_state_hdr svm;



		/* Pad the header to 128 bytes.  */

		__u8 pad[120];
@@ -432,6 +448,7 @@ struct kvm_nested_state { 
	 */

	union {

		struct kvm_vmx_nested_state_data vmx[0];

		struct kvm_svm_nested_state_data svm[0];

	} data;

};

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

+8 −1
Original line number Diff line number Diff line
@@ -2,7 +2,14 @@ 
#ifndef _UAPI_ASM_X86_UNISTD_H

#define _UAPI_ASM_X86_UNISTD_H



/* x32 syscall flag bit */

/*

 * x32 syscall flag bit.  Some user programs expect syscall NR macros

 * and __X32_SYSCALL_BIT to have type int, even though syscall numbers

 * are, for practical purposes, unsigned long.

 *

 * Fortunately, expressions like (nr & ~__X32_SYSCALL_BIT) do the right

 * thing regardless.

 */

#define __X32_SYSCALL_BIT	0x40000000



#ifndef __KERNEL__

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

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,9 @@ 
	{ EXIT_REASON_UMWAIT,                "UMWAIT" }, \

	{ EXIT_REASON_TPAUSE,                "TPAUSE" }



#define VMX_EXIT_REASON_FLAGS \

	{ VMX_EXIT_REASONS_FAILED_VMENTRY,	"FAILED_VMENTRY" }



#define VMX_ABORT_SAVE_GUEST_MSR_FAIL        1

#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL       2

#define VMX_ABORT_LOAD_HOST_MSR_FAIL         4

CRA Git | Maintained and supported by SUSTech CRA and CCSE