Commit 2fe1020d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v5.18-2022-05-14' of... 

Merge tag 'perf-tools-fixes-for-v5.18-2022-05-14' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix two NDEBUG warnings in 'perf bench numa'

 - Fix ARM coresight `perf test` failure

 - Sync linux/kvm.h with the kernel sources

 - Add James and Mike as Arm64 performance events reviewers

* tag 'perf-tools-fixes-for-v5.18-2022-05-14' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  MAINTAINERS: Add James and Mike as Arm64 performance events reviewers
  tools headers UAPI: Sync linux/kvm.h with the kernel sources
  perf tests: Fix coresight `perf test` failure.
  perf bench: Fix two numa NDEBUG warnings
parents ec7f4961 c46721e4

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -15477,7 +15477,8 @@ F: tools/perf/ 
PERFORMANCE EVENTS TOOLING ARM64

R:	John Garry <john.garry@huawei.com>

R:	Will Deacon <will@kernel.org>

R:	Mathieu Poirier <mathieu.poirier@linaro.org>

R:	James Clark <james.clark@arm.com>

R:	Mike Leach <mike.leach@linaro.org>

R:	Leo Yan <leo.yan@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

tools/include/uapi/linux/kvm.h

+9 −1
Original line number Diff line number Diff line
@@ -445,7 +445,13 @@ struct kvm_run { 
#define KVM_SYSTEM_EVENT_RESET          2

#define KVM_SYSTEM_EVENT_CRASH          3

			__u32 type;

			__u32 ndata;

			union {

#ifndef __KERNEL__

				__u64 flags;

#endif

				__u64 data[16];

			};

		} system_event;

		/* KVM_EXIT_S390_STSI */

		struct {
@@ -1144,6 +1150,8 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_S390_MEM_OP_EXTENSION 211

#define KVM_CAP_PMU_CAPABILITY 212

#define KVM_CAP_DISABLE_QUIRKS2 213

/* #define KVM_CAP_VM_TSC_CONTROL 214 */

#define KVM_CAP_SYSTEM_EVENT_DATA 215



#ifdef KVM_CAP_IRQ_ROUTING

tools/perf/bench/numa.c

+2 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ static cpu_set_t *bind_to_cpu(int target_cpu) 


	/* BUG_ON due to failure in allocation of orig_mask/mask */

	BUG_ON(-1);

	return NULL;

}



static cpu_set_t *bind_to_node(int target_node)
@@ -364,6 +365,7 @@ static cpu_set_t *bind_to_node(int target_node) 


	/* BUG_ON due to failure in allocation of orig_mask/mask */

	BUG_ON(-1);

	return NULL;

}



static void bind_to_cpumask(cpu_set_t *mask)

tools/perf/tests/shell/test_arm_coresight.sh

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ cleanup_files() 
	rm -f ${file}

	rm -f "${perfdata}.old"

	trap - exit term int

	kill -2 $$

	exit $glb_err

}