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

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

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

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Skip invalid hybrid PMU on hybrid systems when the atom (little) CPUs
   are offlined.

 - Fix 'perf test' problems related to the recently added hybrid
   (BIG/little) code.

 - Split ARM's coresight (hw tracing) decode by aux records to avoid
   fatal decoding errors.

 - Fix add event failure in 'perf probe' when running 32-bit perf in a
   64-bit kernel.

 - Fix 'perf sched record' failure when CONFIG_SCHEDSTATS is not set.

 - Fix memory and refcount leaks detected by ASAn when running 'perf
   test', should be clean of warnings now.

 - Remove broken definition of __LITTLE_ENDIAN from tools'
   linux/kconfig.h, which was breaking the build in some systems.

 - Cast PTHREAD_STACK_MIN to int as it may turn into 'long
   sysconf(__SC_THREAD_STACK_MIN_VALUE), breaking the build in some
   systems.

 - Fix libperf build error with LIBPFM4=1.

 - Sync UAPI files changed by the memfd_secret new syscall.

* tag 'perf-tools-fixes-for-v5.14-2021-07-18' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (35 commits)
  perf sched: Fix record failure when CONFIG_SCHEDSTATS is not set
  perf probe: Fix add event failure when running 32-bit perf in a 64-bit kernel
  perf data: Close all files in close_dir()
  perf probe-file: Delete namelist in del_events() on the error path
  perf test bpf: Free obj_buf
  perf trace: Free strings in trace__parse_events_option()
  perf trace: Free syscall tp fields in evsel->priv
  perf trace: Free syscall->arg_fmt
  perf trace: Free malloc'd trace fields on exit
  perf lzma: Close lzma stream on exit
  perf script: Fix memory 'threads' and 'cpus' leaks on exit
  perf script: Release zstd data
  perf session: Cleanup trace_event
  perf inject: Close inject.output on exit
  perf report: Free generated help strings for sort option
  perf env: Fix memory leak of cpu_pmu_caps
  perf test maps__merge_in: Fix memory leak of maps
  perf dso: Fix memory leak in dso__new_map()
  perf test event_update: Fix memory leak of unit
  perf test event_update: Fix memory leak of evlist
  ...
parents f0eb870a b0f00855

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

+1 −0
Original line number Diff line number Diff line
@@ -20,5 +20,6 @@ 
#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_TIME32_SYSCALLS

#define __ARCH_WANT_SYS_CLONE3

#define __ARCH_WANT_MEMFD_SECRET



#include <asm-generic/unistd.h>

tools/include/linux/kconfig.h

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


/* CONFIG_CC_VERSION_TEXT (Do not delete this comment. See help in Kconfig) */



#ifdef CONFIG_CPU_BIG_ENDIAN

#define __BIG_ENDIAN 4321

#else

#define __LITTLE_ENDIAN 1234

#endif



#define __ARG_PLACEHOLDER_1 0,

#define __take_second_arg(__ignored, val, ...) val

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

+6 −1
Original line number Diff line number Diff line
@@ -873,8 +873,13 @@ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule) 
#define __NR_landlock_restrict_self 446

__SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)



#ifdef __ARCH_WANT_MEMFD_SECRET

#define __NR_memfd_secret 447

__SYSCALL(__NR_memfd_secret, sys_memfd_secret)

#endif



#undef __NR_syscalls

#define __NR_syscalls 447

#define __NR_syscalls 448



/*

 * 32 bit systems traditionally used different

tools/perf/arch/x86/entry/syscalls/syscall_64.tbl

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ 
444	common	landlock_create_ruleset	sys_landlock_create_ruleset

445	common	landlock_add_rule	sys_landlock_add_rule

446	common	landlock_restrict_self	sys_landlock_restrict_self

447	common	memfd_secret		sys_memfd_secret



#

# Due to a historical design error, certain syscalls are numbered differently

tools/perf/builtin-inject.c

+9 −4
Original line number Diff line number Diff line
@@ -361,9 +361,10 @@ static struct dso *findnew_dso(int pid, int tid, const char *filename, 
		dso = machine__findnew_dso_id(machine, filename, id);

	}



	if (dso)

	if (dso) {

		nsinfo__put(dso->nsinfo);

		dso->nsinfo = nsi;

	else

	} else

		nsinfo__put(nsi);



	thread__put(thread);
@@ -992,8 +993,10 @@ int cmd_inject(int argc, const char **argv) 


	data.path = inject.input_name;

	inject.session = perf_session__new(&data, inject.output.is_pipe, &inject.tool);

	if (IS_ERR(inject.session))

		return PTR_ERR(inject.session);

	if (IS_ERR(inject.session)) {

		ret = PTR_ERR(inject.session);

		goto out_close_output;

	}



	if (zstd_init(&(inject.session->zstd_data), 0) < 0)

		pr_warning("Decompression initialization failed.\n");
@@ -1035,6 +1038,8 @@ int cmd_inject(int argc, const char **argv) 
out_delete:

	zstd_fini(&(inject.session->zstd_data));

	perf_session__delete(inject.session);

out_close_output:

	perf_data__close(&inject.output);

	free(inject.itrace_synth_opts.vm_tm_corr_args);

	return ret;

}