Commit 8b98436a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v5.16-2021-11-19' of... 

Merge tag 'perf-tools-fixes-for-v5.16-2021-11-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix the 'local_weight', 'weight' (memory access latency),
   'local_ins_lat', 'ins_lat' (instruction latency) and 'pstage_cyc'
   (pipeline stage cycles) sort key sample aggregation.

 - Fix 'perf test' entry for watchpoints on s/390.

 - Fix branch_stack entry endianness check in the 'perf test' sample
   parsing test.

 - Fix ARM SPE handling on 'perf inject'.

 - Fix memory leaks detected with ASan.

 - Fix build on arm64 related to reallocarray() availability.

 - Sync copies of kernel headers: cpufeatures, kvm, MIPS syscalltable
   (futex_waitv).

* tag 'perf-tools-fixes-for-v5.16-2021-11-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf evsel: Fix memory leaks relating to unit
  perf report: Fix memory leaks around perf_tip()
  perf hist: Fix memory leak of a perf_hpp_fmt
  tools headers UAPI: Sync MIPS syscall table file changed by new futex_waitv syscall
  tools build: Fix removal of feature-sync-compare-and-swap feature detection
  perf inject: Fix ARM SPE handling
  perf bench: Fix two memory leaks detected with ASan
  perf test sample-parsing: Fix branch_stack entry endianness check
  tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
  perf sort: Fix the 'p_stage_cyc' sort key behavior
  perf sort: Fix the 'ins_lat' sort key behavior
  perf sort: Fix the 'weight' sort key behavior
  perf tools: Set COMPAT_NEED_REALLOCARRAY for CONFIG_AUXTRACE=1
  perf tests wp: Remove unused functions on s390
  tools headers UAPI: Sync linux/kvm.h with the kernel sources
  tools headers cpufeatures: Sync with the kernel sources
parents 9539ba43 b194c9cd

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

+2 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ 
#define X86_FEATURE_XSAVEC		(10*32+ 1) /* XSAVEC instruction */

#define X86_FEATURE_XGETBV1		(10*32+ 2) /* XGETBV with ECX = 1 instruction */

#define X86_FEATURE_XSAVES		(10*32+ 3) /* XSAVES/XRSTORS instructions */

#define X86_FEATURE_XFD			(10*32+ 4) /* "" eXtended Feature Disabling */



/*

 * Extended auxiliary flags: Linux defined - for features scattered in various
@@ -298,6 +299,7 @@ 
/* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */

#define X86_FEATURE_AVX_VNNI		(12*32+ 4) /* AVX VNNI instructions */

#define X86_FEATURE_AVX512_BF16		(12*32+ 5) /* AVX512 BFLOAT16 instructions */

#define X86_FEATURE_AMX_TILE		(18*32+24) /* AMX tile Support */



/* AMD-defined CPU features, CPUID level 0x80000008 (EBX), word 13 */

#define X86_FEATURE_CLZERO		(13*32+ 0) /* CLZERO instruction */

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

+4 −0
Original line number Diff line number Diff line
@@ -504,4 +504,8 @@ struct kvm_pmu_event_filter { 
#define KVM_PMU_EVENT_ALLOW 0

#define KVM_PMU_EVENT_DENY 1



/* for KVM_{GET,SET,HAS}_DEVICE_ATTR */

#define KVM_VCPU_TSC_CTRL 0 /* control group for the timestamp counter (TSC) */

#define   KVM_VCPU_TSC_OFFSET 0 /* attribute for the TSC offset */



#endif /* _ASM_X86_KVM_H */

tools/build/feature/test-all.c

+0 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ int main(int argc, char *argv[]) 
	main_test_timerfd();

	main_test_stackprotector_all();

	main_test_libdw_dwarf_unwind();

	main_test_sync_compare_and_swap(argc, argv);

	main_test_zlib();

	main_test_pthread_attr_setaffinity_np();

	main_test_pthread_barrier();

tools/include/uapi/linux/kvm.h

+27 −3
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ struct kvm_xen_exit { 
#define KVM_EXIT_AP_RESET_HOLD    32

#define KVM_EXIT_X86_BUS_LOCK     33

#define KVM_EXIT_XEN              34

#define KVM_EXIT_RISCV_SBI        35



/* For KVM_EXIT_INTERNAL_ERROR */

/* Emulate instruction failed. */
@@ -397,13 +398,23 @@ struct kvm_run { 
		 * "ndata" is correct, that new fields are enumerated in "flags",

		 * and that each flag enumerates fields that are 64-bit aligned

		 * and sized (so that ndata+internal.data[] is valid/accurate).

		 *

		 * Space beyond the defined fields may be used to store arbitrary

		 * debug information relating to the emulation failure. It is

		 * accounted for in "ndata" but the format is unspecified and is

		 * not represented in "flags". Any such information is *not* ABI!

		 */

		struct {

			__u32 suberror;

			__u32 ndata;

			__u64 flags;

			union {

				struct {

					__u8  insn_size;

					__u8  insn_bytes[15];

				};

			};

			/* Arbitrary debug data may follow. */

		} emulation_failure;

		/* KVM_EXIT_OSI */

		struct {
@@ -469,6 +480,13 @@ struct kvm_run { 
		} msr;

		/* KVM_EXIT_XEN */

		struct kvm_xen_exit xen;

		/* KVM_EXIT_RISCV_SBI */

		struct {

			unsigned long extension_id;

			unsigned long function_id;

			unsigned long args[6];

			unsigned long ret[2];

		} riscv_sbi;

		/* Fix the size of the union. */

		char padding[256];

	};
@@ -1112,6 +1130,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_BINARY_STATS_FD 203

#define KVM_CAP_EXIT_ON_EMULATION_FAILURE 204

#define KVM_CAP_ARM_MTE 205

#define KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM 206



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1223,11 +1242,16 @@ struct kvm_irqfd { 


/* Do not use 1, KVM_CHECK_EXTENSION returned it before we had flags.  */

#define KVM_CLOCK_TSC_STABLE		2

#define KVM_CLOCK_REALTIME		(1 << 2)

#define KVM_CLOCK_HOST_TSC		(1 << 3)



struct kvm_clock_data {

	__u64 clock;

	__u32 flags;

	__u32 pad[9];

	__u32 pad0;

	__u64 realtime;

	__u64 host_tsc;

	__u32 pad[4];

};



/* For KVM_CAP_SW_TLB */

tools/perf/Makefile.config

+3 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,9 @@ ifndef NO_AUXTRACE 
  ifndef NO_AUXTRACE

    $(call detected,CONFIG_AUXTRACE)

    CFLAGS += -DHAVE_AUXTRACE_SUPPORT

    ifeq ($(feature-reallocarray), 0)

      CFLAGS += -DCOMPAT_NEED_REALLOCARRAY

    endif

  endif

endif