Commit 5814bc2d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-2020-12-24' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux 

Pull more perf tools updates from Arnaldo Carvalho de Melo:

 - Refactor 'perf stat' per CPU/socket/die/thread aggregation fixing use
   cases in ARM machines.

 - Fix memory leak when synthesizing SDT probes in 'perf probe'.

 - Update kernel header copies related to KVM, epol_pwait. msr-index and
   powerpc and s390 syscall tables.

* tag 'perf-tools-2020-12-24' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (24 commits)
  perf probe: Fix memory leak when synthesizing SDT probes
  perf stat aggregation: Add separate thread member
  perf stat aggregation: Add separate core member
  perf stat aggregation: Add separate die member
  perf stat aggregation: Add separate socket member
  perf stat aggregation: Add separate node member
  perf stat aggregation: Start using cpu_aggr_id in map
  perf cpumap: Drop in cpu_aggr_map struct
  perf cpumap: Add new map type for aggregation
  perf stat: Replace aggregation ID with a struct
  perf cpumap: Add new struct for cpu aggregation
  perf cpumap: Use existing allocator to avoid using malloc
  perf tests: Improve topology test to check all aggregation types
  perf tools: Update s390's syscall.tbl copy from the kernel sources
  perf tools: Update powerpc's syscall.tbl copy from the kernel sources
  perf s390: Move syscall.tbl check into check-headers.sh
  perf powerpc: Move syscall.tbl check to check-headers.sh
  tools headers UAPI: Synch KVM's svm.h header with the kernel
  tools kvm headers: Update KVM headers from the kernel sources
  tools headers UAPI: Sync KVM's vmx.h header with the kernel sources
  ...
parents 42dc45e8 5149303f

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

+0 −3
Original line number Diff line number Diff line
@@ -156,9 +156,6 @@ struct kvm_sync_regs { 
	__u64 device_irq_level;

};



struct kvm_arch_memory_slot {

};



/*

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

 * action. To be used with KVM_ARM_VCPU_PMU_V3_FILTER.

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

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ 
#define X86_FEATURE_VMCALL		( 8*32+18) /* "" Hypervisor supports the VMCALL instruction */

#define X86_FEATURE_VMW_VMMCALL		( 8*32+19) /* "" VMware prefers VMMCALL hypercall instruction */

#define X86_FEATURE_SEV_ES		( 8*32+20) /* AMD Secure Encrypted Virtualization - Encrypted State */

#define X86_FEATURE_VM_PAGE_FLUSH	( 8*32+21) /* "" VM Page Flush MSR is supported */



/* Intel-defined CPU features, CPUID level 0x00000007:0 (EBX), word 9 */

#define X86_FEATURE_FSGSBASE		( 9*32+ 0) /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/
@@ -376,6 +377,7 @@ 
#define X86_FEATURE_TSXLDTRK		(18*32+16) /* TSX Suspend Load Address Tracking */

#define X86_FEATURE_PCONFIG		(18*32+18) /* Intel PCONFIG */

#define X86_FEATURE_ARCH_LBR		(18*32+19) /* Intel ARCH LBR */

#define X86_FEATURE_AVX512_FP16		(18*32+23) /* AVX512 FP16 */

#define X86_FEATURE_SPEC_CTRL		(18*32+26) /* "" Speculation Control (IBRS + IBPB) */

#define X86_FEATURE_INTEL_STIBP		(18*32+27) /* "" Single Thread Indirect Branch Predictors */

#define X86_FEATURE_FLUSH_L1D		(18*32+28) /* Flush L1D cache */

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

+1 −0
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ 
#define MSR_AMD64_ICIBSEXTDCTL		0xc001103c

#define MSR_AMD64_IBSOPDATA4		0xc001103d

#define MSR_AMD64_IBS_REG_COUNT_MAX	8 /* includes MSR_AMD64_IBSBRTARGET */

#define MSR_AMD64_VM_PAGE_FLUSH		0xc001011e

#define MSR_AMD64_SEV_ES_GHCB		0xc0010130

#define MSR_AMD64_SEV			0xc0010131

#define MSR_AMD64_SEV_ENABLED_BIT	0

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

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#define KVM_PIO_PAGE_OFFSET 1

#define KVM_COALESCED_MMIO_PAGE_OFFSET 2

#define KVM_DIRTY_LOG_PAGE_OFFSET 64



#define DE_VECTOR 0

#define DB_VECTOR 1

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

+28 −0
Original line number Diff line number Diff line
@@ -77,10 +77,28 @@ 
#define SVM_EXIT_MWAIT_COND    0x08c

#define SVM_EXIT_XSETBV        0x08d

#define SVM_EXIT_RDPRU         0x08e

#define SVM_EXIT_EFER_WRITE_TRAP		0x08f

#define SVM_EXIT_CR0_WRITE_TRAP			0x090

#define SVM_EXIT_CR1_WRITE_TRAP			0x091

#define SVM_EXIT_CR2_WRITE_TRAP			0x092

#define SVM_EXIT_CR3_WRITE_TRAP			0x093

#define SVM_EXIT_CR4_WRITE_TRAP			0x094

#define SVM_EXIT_CR5_WRITE_TRAP			0x095

#define SVM_EXIT_CR6_WRITE_TRAP			0x096

#define SVM_EXIT_CR7_WRITE_TRAP			0x097

#define SVM_EXIT_CR8_WRITE_TRAP			0x098

#define SVM_EXIT_CR9_WRITE_TRAP			0x099

#define SVM_EXIT_CR10_WRITE_TRAP		0x09a

#define SVM_EXIT_CR11_WRITE_TRAP		0x09b

#define SVM_EXIT_CR12_WRITE_TRAP		0x09c

#define SVM_EXIT_CR13_WRITE_TRAP		0x09d

#define SVM_EXIT_CR14_WRITE_TRAP		0x09e

#define SVM_EXIT_CR15_WRITE_TRAP		0x09f

#define SVM_EXIT_INVPCID       0x0a2

#define SVM_EXIT_NPF           0x400

#define SVM_EXIT_AVIC_INCOMPLETE_IPI		0x401

#define SVM_EXIT_AVIC_UNACCELERATED_ACCESS	0x402

#define SVM_EXIT_VMGEXIT       0x403



/* SEV-ES software-defined VMGEXIT events */

#define SVM_VMGEXIT_MMIO_READ			0x80000001
@@ -183,10 +201,20 @@ 
	{ SVM_EXIT_MONITOR,     "monitor" }, \

	{ SVM_EXIT_MWAIT,       "mwait" }, \

	{ SVM_EXIT_XSETBV,      "xsetbv" }, \

	{ SVM_EXIT_EFER_WRITE_TRAP,	"write_efer_trap" }, \

	{ SVM_EXIT_CR0_WRITE_TRAP,	"write_cr0_trap" }, \

	{ SVM_EXIT_CR4_WRITE_TRAP,	"write_cr4_trap" }, \

	{ SVM_EXIT_CR8_WRITE_TRAP,	"write_cr8_trap" }, \

	{ SVM_EXIT_INVPCID,     "invpcid" }, \

	{ SVM_EXIT_NPF,         "npf" }, \

	{ SVM_EXIT_AVIC_INCOMPLETE_IPI,		"avic_incomplete_ipi" }, \

	{ SVM_EXIT_AVIC_UNACCELERATED_ACCESS,   "avic_unaccelerated_access" }, \

	{ SVM_EXIT_VMGEXIT,		"vmgexit" }, \

	{ SVM_VMGEXIT_MMIO_READ,	"vmgexit_mmio_read" }, \

	{ SVM_VMGEXIT_MMIO_WRITE,	"vmgexit_mmio_write" }, \

	{ SVM_VMGEXIT_NMI_COMPLETE,	"vmgexit_nmi_complete" }, \

	{ SVM_VMGEXIT_AP_HLT_LOOP,	"vmgexit_ap_hlt_loop" }, \

	{ SVM_VMGEXIT_AP_JUMP_TABLE,	"vmgexit_ap_jump_table" }, \

	{ SVM_EXIT_ERR,         "invalid_guest_state" }

CRA Git | Maintained and supported by SUSTech CRA and CCSE