Commit 40c84321 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-for-v5.17-2022-01-22' of... 

Merge tag 'perf-tools-for-v5.17-2022-01-22' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull more perf tools updates from Arnaldo Carvalho de Melo:

 - Fix printing 'phys_addr' in 'perf script'.

 - Fix failure to add events with 'perf probe' in ppc64 due to not
   removing leading dot (ppc64 ABIv1).

 - Fix cpu_map__item() python binding building.

 - Support event alias in form foo-bar-baz, add pmu-events and
   parse-event tests for it.

 - No need to setup affinities when starting a workload or attaching to
   a pid.

 - Use path__join() to compose a path instead of ad-hoc snprintf()
   equivalent.

 - Override attr->sample_period for non-libpfm4 events.

 - Use libperf cpumap APIs instead of accessing the internal state
   directly.

 - Sync x86 arch prctl headers and files changed by the new
   set_mempolicy_home_node syscall with the kernel sources.

 - Remove duplicate include in cpumap.h.

 - Remove redundant err variable.

* tag 'perf-tools-for-v5.17-2022-01-22' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf tools: Remove redundant err variable
  perf test: Add parse-events test for aliases with hyphens
  perf test: Add pmu-events test for aliases with hyphens
  perf parse-events: Support event alias in form foo-bar-baz
  perf evsel: Override attr->sample_period for non-libpfm4 events
  perf cpumap: Remove duplicate include in cpumap.h
  perf cpumap: Migrate to libperf cpumap api
  perf python: Fix cpu_map__item() building
  perf script: Fix printing 'phys_addr' failure issue
  tools headers UAPI: Sync files changed by new set_mempolicy_home_node syscall
  tools headers UAPI: Sync x86 arch prctl headers with the kernel sources
  perf machine: Use path__join() to compose a path instead of snprintf(dir, '/', filename)
  perf evlist: No need to setup affinities when disabling events for pid targets
  perf evlist: No need to setup affinities when enabling events for pid targets
  perf stat: No need to setup affinities when starting a workload
  perf affinity: Allow passing a NULL arg to affinity__cleanup()
  perf probe: Fix ppc64 'perf probe add events failed' case
parents 67bfce0e f0ac5b85

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

+14 −12
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#define ARCH_GET_XCOMP_SUPP		0x1021

#define ARCH_GET_XCOMP_PERM		0x1022

#define ARCH_REQ_XCOMP_PERM		0x1023

#define ARCH_GET_XCOMP_GUEST_PERM	0x1024

#define ARCH_REQ_XCOMP_GUEST_PERM	0x1025



#define ARCH_MAP_VDSO_X32		0x2001

#define ARCH_MAP_VDSO_32		0x2002

tools/include/uapi/asm-generic/unistd.h

+4 −1
Original line number Diff line number Diff line
@@ -883,8 +883,11 @@ __SYSCALL(__NR_process_mrelease, sys_process_mrelease) 
#define __NR_futex_waitv 449

__SYSCALL(__NR_futex_waitv, sys_futex_waitv)



#define __NR_set_mempolicy_home_node 450

__SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node)



#undef __NR_syscalls

#define __NR_syscalls 450

#define __NR_syscalls 451



/*

 * 32 bit systems traditionally used different

tools/lib/perf/evsel.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus, 
	}



	if (evsel->fd == NULL &&

	    perf_evsel__alloc_fd(evsel, cpus->nr, threads->nr) < 0)

	    perf_evsel__alloc_fd(evsel, perf_cpu_map__nr(cpus), threads->nr) < 0)

		return -ENOMEM;



	perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
@@ -384,7 +384,7 @@ int perf_evsel__apply_filter(struct perf_evsel *evsel, const char *filter) 
{

	int err = 0, i;



	for (i = 0; i < evsel->cpus->nr && !err; i++)

	for (i = 0; i < perf_cpu_map__nr(evsel->cpus) && !err; i++)

		err = perf_evsel__run_ioctl(evsel,

				     PERF_EVENT_IOC_SET_FILTER,

				     (void *)filter, i);

tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl

+1 −0
Original line number Diff line number Diff line
@@ -364,3 +364,4 @@ 
# 447 reserved for memfd_secret

448	n64	process_mrelease		sys_process_mrelease

449	n64	futex_waitv			sys_futex_waitv

450	common	set_mempolicy_home_node		sys_set_mempolicy_home_node

tools/perf/arch/powerpc/entry/syscalls/syscall.tbl

+1 −0
Original line number Diff line number Diff line
@@ -529,3 +529,4 @@ 
# 447 reserved for memfd_secret

448	common	process_mrelease		sys_process_mrelease

449	common  futex_waitv                     sys_futex_waitv

450 	nospu	set_mempolicy_home_node		sys_set_mempolicy_home_node