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

Merge tag 'perf-tools-for-v5.14-2021-07-01' of... 

Merge tag 'perf-tools-for-v5.14-2021-07-01' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tool updates from Arnaldo Carvalho de Melo:
 "Tools:

   - Add cgroup support for 'perf top' (-G).

   - Add support for KVM MSRs in 'perf kvm stat'

   - Support probes on init functions in 'perf probe', to support the
     bootconfig format.

   - Improve error reporting in 'perf probe'.

   - No need to synthesize BUILD_ID records in 'perf inject' if the
     MMAP2 records have build ids already.

   - Allow toggling source code ('s' hotkey) in 'perf annotate' in all
     lines.

   - Add itrace options support to 'perf annotate'.

   - Support to custom DSO filters for 'perf script'.

  Hardware enablement:

   - Support the HYBRID_TOPOLOGY and HYBRID_CPU_PMU_CAPS features in the
     perf.data file header.

   - Support PMU prefix for mem-load and mem-store events, to support
     hybrid (BIG little) CPUs such as Intel's Alderlake.

   - Support hybrid CPUs in 'perf mem' and 'perf c2c'.

  Hardware tracing:

   - Intel PT now supports tracing KVM guests.

   - Timestamp improvements for ARM's Coresight.

  Build:

   - Add 'make -C tools/perf build-test' entries for
     libopencsd/CORESIGHT=1 and libbpf/LIBBPF_DYNAMIC=1.

   - Use bison's --file-prefix-map option to avoid storing full paths
     when using O= in the perf build.

  Tests:

   - Improve the 'perf test' entries for libpfm4 and BPF counters.

  Misc:

   - Sync msr-index.h, mount.h, kvm headers with the kernel originals.

   - Add vendor events and metrics for Intel's Icelake Server & Client"

* tag 'perf-tools-for-v5.14-2021-07-01' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (123 commits)
  perf session: Add missing evlist__delete when deleting a session
  perf annotate: Allow 's' on source code lines
  perf dlfilter: Add object_code() to perf_dlfilter_fns
  perf dlfilter: Add attr() to perf_dlfilter_fns
  perf dlfilter: Add srcline() to perf_dlfilter_fns
  perf dlfilter: Add insn() to perf_dlfilter_fns
  perf dlfilter: Add resolve_address() to perf_dlfilter_fns
  perf build: Install perf_dlfilter.h
  perf script: Add option to pass arguments to dlfilters
  perf script: Add option to list dlfilters
  perf script: Add dlfilter__filter_event_early()
  perf script: Add API for filtering via dynamically loaded shared object
  perf llvm: Return -ENOMEM when asprintf() fails
  perf cs-etm: Delay decode of non-timeless data until cs_etm__flush_events()
  tools headers UAPI: Synch KVM's svm.h header with the kernel
  tools kvm headers arm64: Update KVM headers from the kernel sources
  tools headers UAPI: Sync linux/kvm.h with the kernel sources
  tools headers cpufeatures: Sync with the kernel sources
  tools include UAPI: Update linux/mount.h copy
  tools arch x86: Sync the msr-index.h copy with the kernel sources
  ...
parents 71bd9341 cf96b8e4

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

+11 −0
Original line number Diff line number Diff line
@@ -184,6 +184,17 @@ struct kvm_vcpu_events { 
	__u32 reserved[12];

};



struct kvm_arm_copy_mte_tags {

	__u64 guest_ipa;

	__u64 length;

	void __user *addr;

	__u64 flags;

	__u64 reserved[2];

};



#define KVM_ARM_TAGS_TO_GUEST		0

#define KVM_ARM_TAGS_FROM_GUEST		1



/* If you need to interpret the index values, here is the key: */

#define KVM_REG_ARM_COPROC_MASK		0x000000000FFF0000

#define KVM_REG_ARM_COPROC_SHIFT	16

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

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
#define X86_FEATURE_EXTD_APICID		( 3*32+26) /* Extended APICID (8 bits) */

#define X86_FEATURE_AMD_DCM		( 3*32+27) /* AMD multi-node processor */

#define X86_FEATURE_APERFMPERF		( 3*32+28) /* P-State hardware coordination feedback capability (APERF/MPERF MSRs) */

/* free					( 3*32+29) */

#define X86_FEATURE_RAPL		( 3*32+29) /* AMD/Hygon RAPL interface */

#define X86_FEATURE_NONSTOP_TSC_S3	( 3*32+30) /* TSC doesn't stop in S3 state */

#define X86_FEATURE_TSC_KNOWN_FREQ	( 3*32+31) /* TSC has known frequency */
@@ -378,6 +378,7 @@ 
#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_RTM_ALWAYS_ABORT	(18*32+11) /* "" RTM transaction always aborts */

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

#define X86_FEATURE_SERIALIZE		(18*32+14) /* SERIALIZE instruction */

#define X86_FEATURE_HYBRID_CPU		(18*32+15) /* "" This part has CPUs of more than one type */

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

+4 −0
Original line number Diff line number Diff line
@@ -772,6 +772,10 @@ 


#define MSR_TFA_RTM_FORCE_ABORT_BIT	0

#define MSR_TFA_RTM_FORCE_ABORT		BIT_ULL(MSR_TFA_RTM_FORCE_ABORT_BIT)

#define MSR_TFA_TSX_CPUID_CLEAR_BIT	1

#define MSR_TFA_TSX_CPUID_CLEAR		BIT_ULL(MSR_TFA_TSX_CPUID_CLEAR_BIT)

#define MSR_TFA_SDV_ENABLE_RTM_BIT	2

#define MSR_TFA_SDV_ENABLE_RTM		BIT_ULL(MSR_TFA_SDV_ENABLE_RTM_BIT)



/* P4/Xeon+ specific */

#define MSR_IA32_MCG_EAX		0x00000180

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

+13 −0
Original line number Diff line number Diff line
@@ -159,6 +159,19 @@ struct kvm_sregs { 
	__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];

};



struct kvm_sregs2 {

	/* out (KVM_GET_SREGS2) / in (KVM_SET_SREGS2) */

	struct kvm_segment cs, ds, es, fs, gs, ss;

	struct kvm_segment tr, ldt;

	struct kvm_dtable gdt, idt;

	__u64 cr0, cr2, cr3, cr4, cr8;

	__u64 efer;

	__u64 apic_base;

	__u64 flags;

	__u64 pdptrs[4];

};

#define KVM_SREGS2_FLAGS_PDPTRS_VALID 1



/* for KVM_GET_FPU and KVM_SET_FPU */

struct kvm_fpu {

	__u8  fpr[8][16];

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

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ 
#define SVM_VMGEXIT_GET_AP_JUMP_TABLE		1

#define SVM_VMGEXIT_UNSUPPORTED_EVENT		0x8000ffff



/* Exit code reserved for hypervisor/software use */

#define SVM_EXIT_SW				0xf0000000



#define SVM_EXIT_ERR           -1



#define SVM_EXIT_REASONS \