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

Merge tag 'perf-tools-fixes-for-v5.19-2022-06-19' of... 

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

Pull perf tool fixes from Arnaldo Carvalho de Melo:

 - Don't set data source if it's not a memory operation in ARM SPE
   (Statistical Profiling Extensions).

 - Fix handling of exponent floating point values in perf stat
   expressions.

 - Don't leak fd on failure on libperf open.

 - Fix 'perf test' CPU topology test for PPC guest systems.

 - Fix undefined behaviour on breakpoint account 'perf test' entry.

 - Record only user callchains on the "Check ARM64 callgraphs are
   complete in FP mode" 'perf test' entry.

 - Fix "perf stat CSV output linter" test on s390.

 - Sync batch of kernel headers with tools/perf/.

* tag 'perf-tools-fixes-for-v5.19-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  tools headers UAPI: Sync linux/prctl.h with the kernel sources
  perf metrics: Ensure at least 1 id per metric
  tools headers arm64: Sync arm64's cputype.h with the kernel sources
  tools headers UAPI: Sync x86's asm/kvm.h with the kernel sources
  perf arm-spe: Don't set data source if it's not a memory operation
  perf expr: Allow exponents on floating point values
  perf test topology: Use !strncmp(right platform) to fix guest PPC comparision check
  perf test: Record only user callchains on the "Check Arm64 callgraphs are complete in fp mode" test
  perf beauty: Update copy of linux/socket.h with the kernel sources
  perf test: Fix variable length array undefined behavior in bp_account
  libperf evsel: Open shouldn't leak fd on failure
  perf test: Fix "perf stat CSV output linter" test on s390
  perf unwind: Fix uninitialized variable
parents 59b785fe 140cd9ec

tools/arch/arm64/include/asm/cputype.h

+10 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define MIDR_VARIANT(midr)	\

	(((midr) & MIDR_VARIANT_MASK) >> MIDR_VARIANT_SHIFT)

#define MIDR_IMPLEMENTOR_SHIFT	24

#define MIDR_IMPLEMENTOR_MASK	(0xff << MIDR_IMPLEMENTOR_SHIFT)

#define MIDR_IMPLEMENTOR_MASK	(0xffU << MIDR_IMPLEMENTOR_SHIFT)

#define MIDR_IMPLEMENTOR(midr)	\

	(((midr) & MIDR_IMPLEMENTOR_MASK) >> MIDR_IMPLEMENTOR_SHIFT)
@@ -118,6 +118,10 @@ 


#define APPLE_CPU_PART_M1_ICESTORM	0x022

#define APPLE_CPU_PART_M1_FIRESTORM	0x023

#define APPLE_CPU_PART_M1_ICESTORM_PRO	0x024

#define APPLE_CPU_PART_M1_FIRESTORM_PRO	0x025

#define APPLE_CPU_PART_M1_ICESTORM_MAX	0x028

#define APPLE_CPU_PART_M1_FIRESTORM_MAX	0x029



#define MIDR_CORTEX_A53 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A53)

#define MIDR_CORTEX_A57 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A57)
@@ -164,6 +168,10 @@ 
#define MIDR_HISI_TSV110 MIDR_CPU_MODEL(ARM_CPU_IMP_HISI, HISI_CPU_PART_TSV110)

#define MIDR_APPLE_M1_ICESTORM MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM)

#define MIDR_APPLE_M1_FIRESTORM MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM)

#define MIDR_APPLE_M1_ICESTORM_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_PRO)

#define MIDR_APPLE_M1_FIRESTORM_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_PRO)

#define MIDR_APPLE_M1_ICESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_ICESTORM_MAX)

#define MIDR_APPLE_M1_FIRESTORM_MAX MIDR_CPU_MODEL(ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M1_FIRESTORM_MAX)



/* Fujitsu Erratum 010001 affects A64FX 1.0 and 1.1, (v0r0 and v1r0) */

#define MIDR_FUJITSU_ERRATUM_010001		MIDR_FUJITSU_A64FX
@@ -172,7 +180,7 @@ 


#ifndef __ASSEMBLY__



#include "sysreg.h"

#include <asm/sysreg.h>



#define read_cpuid(reg)			read_sysreg_s(SYS_ ## reg)

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

+6 −5
Original line number Diff line number Diff line
@@ -433,6 +433,7 @@ struct kvm_sync_regs { 
#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE		(1 << 2)

#define KVM_X86_QUIRK_OUT_7E_INC_RIP		(1 << 3)

#define KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT	(1 << 4)

#define KVM_X86_QUIRK_FIX_HYPERCALL_INSN	(1 << 5)



#define KVM_STATE_NESTED_FORMAT_VMX	0

#define KVM_STATE_NESTED_FORMAT_SVM	1

tools/include/uapi/linux/prctl.h

+9 −0
Original line number Diff line number Diff line
@@ -272,6 +272,15 @@ struct prctl_mm_map { 
# define PR_SCHED_CORE_SCOPE_THREAD_GROUP	1

# define PR_SCHED_CORE_SCOPE_PROCESS_GROUP	2



/* arm64 Scalable Matrix Extension controls */

/* Flag values must be in sync with SVE versions */

#define PR_SME_SET_VL			63	/* set task vector length */

# define PR_SME_SET_VL_ONEXEC		(1 << 18) /* defer effect until exec */

#define PR_SME_GET_VL			64	/* get task vector length */

/* Bits common to PR_SME_SET_VL and PR_SME_GET_VL */

# define PR_SME_VL_LEN_MASK		0xffff

# define PR_SME_VL_INHERIT		(1 << 17) /* inherit across exec */



#define PR_SET_VMA		0x53564d41

# define PR_SET_VMA_ANON_NAME		0

tools/lib/perf/evsel.c

+12 −5
Original line number Diff line number Diff line
@@ -149,23 +149,30 @@ int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus, 
			int fd, group_fd, *evsel_fd;



			evsel_fd = FD(evsel, idx, thread);

			if (evsel_fd == NULL)

				return -EINVAL;

			if (evsel_fd == NULL) {

				err = -EINVAL;

				goto out;

			}



			err = get_group_fd(evsel, idx, thread, &group_fd);

			if (err < 0)

				return err;

				goto out;



			fd = sys_perf_event_open(&evsel->attr,

						 threads->map[thread].pid,

						 cpu, group_fd, 0);



			if (fd < 0)

				return -errno;

			if (fd < 0) {

				err = -errno;

				goto out;

			}



			*evsel_fd = fd;

		}

	}

out:

	if (err)

		perf_evsel__close(evsel);



	return err;

}

tools/perf/tests/bp_account.c

+14 −2
Original line number Diff line number Diff line
@@ -151,11 +151,21 @@ static int detect_ioctl(void) 
static int detect_share(int wp_cnt, int bp_cnt)

{

	struct perf_event_attr attr;

	int i, fd[wp_cnt + bp_cnt], ret;

	int i, *fd = NULL, ret = -1;



	if (wp_cnt + bp_cnt == 0)

		return 0;



	fd = malloc(sizeof(int) * (wp_cnt + bp_cnt));

	if (!fd)

		return -1;



	for (i = 0; i < wp_cnt; i++) {

		fd[i] = wp_event((void *)&the_var, &attr);

		TEST_ASSERT_VAL("failed to create wp\n", fd[i] != -1);

		if (fd[i] == -1) {

			pr_err("failed to create wp\n");

			goto out;

		}

	}



	for (; i < (bp_cnt + wp_cnt); i++) {
@@ -166,9 +176,11 @@ static int detect_share(int wp_cnt, int bp_cnt) 


	ret = i != (bp_cnt + wp_cnt);



out:

	while (i--)

		close(fd[i]);



	free(fd);

	return ret;

}