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

Merge tag 'perf-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Thomas Gleixner:
 "A pile of perf fixes:

  Kernel side:

   - AMD uncore driver: Replace the open coded sanity check with the
     core variant, which provides the correct error code and also leaves
     a hint in dmesg

  Tooling:

   - Fix the stdio input handling with glibc versions >= 2.28

   - Unbreak the futex-wake benchmark which was reduced to 0 test
     threads due to the conversion to cpumaps

   - Initialize sigaction structs before invoking sys_sigactio()

   - Plug the mapfile memory leak in perf jevents

   - Fix off by one relative directory includes

   - Fix an undefined string comparison in perf diff"

* tag 'perf-urgent-2020-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/amd/uncore: Replace manual sampling check with CAP_NO_INTERRUPT flag
  tools: Fix off-by 1 relative directory includes
  perf jevents: Fix leak of mapfile memory
  perf bench: Clear struct sigaction before sigaction() syscall
  perf bench futex-wake: Restore thread count default to online CPU count
  perf top: Fix stdio interface input handling with glibc 2.28+
  perf diff: Fix undefined string comparision spotted by clang's -Wstring-compare
  perf symbols: Don't try to find a vmlinux file when looking for kernel modules
  perf bench: Share some global variables to fix build with gcc 10
  perf parse-events: Use asprintf() instead of strncpy() to read tracepoint files
  perf env: Do not return pointers to local variables
  perf tests bp_account: Make global variable static
parents ffe6da91 f967140d

arch/x86/events/amd/uncore.c

+7 −10
Original line number Diff line number Diff line
@@ -190,15 +190,12 @@ static int amd_uncore_event_init(struct perf_event *event) 


	/*

	 * NB and Last level cache counters (MSRs) are shared across all cores

	 * that share the same NB / Last level cache. Interrupts can be directed

	 * to a single target core, however, event counts generated by processes

	 * running on other cores cannot be masked out. So we do not support

	 * sampling and per-thread events.

	 * that share the same NB / Last level cache.  On family 16h and below,

	 * Interrupts can be directed to a single target core, however, event

	 * counts generated by processes running on other cores cannot be masked

	 * out. So we do not support sampling and per-thread events via

	 * CAP_NO_INTERRUPT, and we do not enable counter overflow interrupts:

	 */

	if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)

		return -EINVAL;



	/* and we do not enable counter overflow interrupts */

	hwc->config = event->attr.config & AMD64_RAW_EVENT_MASK_NB;

	hwc->idx = -1;
@@ -306,7 +303,7 @@ static struct pmu amd_nb_pmu = { 
	.start		= amd_uncore_start,

	.stop		= amd_uncore_stop,

	.read		= amd_uncore_read,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE | PERF_PMU_CAP_NO_INTERRUPT,

};



static struct pmu amd_llc_pmu = {
@@ -317,7 +314,7 @@ static struct pmu amd_llc_pmu = { 
	.start		= amd_uncore_start,

	.stop		= amd_uncore_stop,

	.read		= amd_uncore_read,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE | PERF_PMU_CAP_NO_INTERRUPT,

};



static struct amd_uncore *amd_uncore_alloc(unsigned int cpu)

tools/include/uapi/asm/errno.h

+7 −7
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#if defined(__i386__) || defined(__x86_64__)

#include "../../arch/x86/include/uapi/asm/errno.h"

#include "../../../arch/x86/include/uapi/asm/errno.h"

#elif defined(__powerpc__)

#include "../../arch/powerpc/include/uapi/asm/errno.h"

#include "../../../arch/powerpc/include/uapi/asm/errno.h"

#elif defined(__sparc__)

#include "../../arch/sparc/include/uapi/asm/errno.h"

#include "../../../arch/sparc/include/uapi/asm/errno.h"

#elif defined(__alpha__)

#include "../../arch/alpha/include/uapi/asm/errno.h"

#include "../../../arch/alpha/include/uapi/asm/errno.h"

#elif defined(__mips__)

#include "../../arch/mips/include/uapi/asm/errno.h"

#include "../../../arch/mips/include/uapi/asm/errno.h"

#elif defined(__ia64__)

#include "../../arch/ia64/include/uapi/asm/errno.h"

#include "../../../arch/ia64/include/uapi/asm/errno.h"

#elif defined(__xtensa__)

#include "../../arch/xtensa/include/uapi/asm/errno.h"

#include "../../../arch/xtensa/include/uapi/asm/errno.h"

#else

#include <asm-generic/errno.h>

#endif

tools/perf/arch/arm64/util/arm-spe.c

+10 −10
Original line number Diff line number Diff line
@@ -11,17 +11,17 @@ 
#include <linux/zalloc.h>

#include <time.h>



#include "../../util/cpumap.h"

#include "../../util/event.h"

#include "../../util/evsel.h"

#include "../../util/evlist.h"

#include "../../util/session.h"

#include "../../../util/cpumap.h"

#include "../../../util/event.h"

#include "../../../util/evsel.h"

#include "../../../util/evlist.h"

#include "../../../util/session.h"

#include <internal/lib.h> // page_size

#include "../../util/pmu.h"

#include "../../util/debug.h"

#include "../../util/auxtrace.h"

#include "../../util/record.h"

#include "../../util/arm-spe.h"

#include "../../../util/pmu.h"

#include "../../../util/debug.h"

#include "../../../util/auxtrace.h"

#include "../../../util/record.h"

#include "../../../util/arm-spe.h"



#define KiB(x) ((x) * 1024)

#define MiB(x) ((x) * 1024 * 1024)

tools/perf/arch/arm64/util/perf_regs.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "../../util/perf_regs.h"

#include "../../../util/perf_regs.h"



const struct sample_reg sample_reg_masks[] = {

	SMPL_REG_END

tools/perf/arch/powerpc/util/perf_regs.c

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
#include <regex.h>

#include <linux/zalloc.h>



#include "../../util/perf_regs.h"

#include "../../util/debug.h"

#include "../../../util/perf_regs.h"

#include "../../../util/debug.h"



#include <linux/kernel.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE