Commit 4a2b88eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-core-2021-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 perf event updates from Ingo Molnar:

 - Add support for Intel Sapphire Rapids server CPU uncore events

 - Allow the AMD uncore driver to be built as a module

 - Misc cleanups and fixes

* tag 'perf-core-2021-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  perf/x86/amd/ibs: Add bitfield definitions in new <asm/amd-ibs.h> header
  perf/amd/uncore: Allow the driver to be built as a module
  x86/cpu: Add get_llc_id() helper function
  perf/amd/uncore: Clean up header use, use <linux/ include paths instead of <asm/
  perf/amd/uncore: Simplify code, use free_percpu()'s built-in check for NULL
  perf/hw_breakpoint: Replace deprecated CPU-hotplug functions
  perf/x86/intel: Replace deprecated CPU-hotplug functions
  perf/x86: Remove unused assignment to pointer 'e'
  perf/x86/intel/uncore: Fix IIO cleanup mapping procedure for SNR/ICX
  perf/x86/intel/uncore: Support IMC free-running counters on Sapphire Rapids server
  perf/x86/intel/uncore: Support IIO free-running counters on Sapphire Rapids server
  perf/x86/intel/uncore: Factor out snr_uncore_mmio_map()
  perf/x86/intel/uncore: Add alias PMU name
  perf/x86/intel/uncore: Add Sapphire Rapids server MDF support
  perf/x86/intel/uncore: Add Sapphire Rapids server M3UPI support
  perf/x86/intel/uncore: Add Sapphire Rapids server UPI support
  perf/x86/intel/uncore: Add Sapphire Rapids server M2M support
  perf/x86/intel/uncore: Add Sapphire Rapids server IMC support
  perf/x86/intel/uncore: Add Sapphire Rapids server PCU support
  perf/x86/intel/uncore: Add Sapphire Rapids server M2PCIe support
  ...
parents 5d3c0db4 6a371baf

Documentation/ABI/testing/sysfs-bus-event_source-devices-uncore

0 → 100644
+13 −0
Original line number Diff line number Diff line 
What:		/sys/bus/event_source/devices/uncore_*/alias

Date:		June 2021

KernelVersion:	5.15

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Read-only.  An attribute to describe the alias name of

		the uncore PMU if an alias exists on some platforms.

		The 'perf(1)' tool should treat both names the same.

		They both can be used to access the uncore PMU.



		Example:



		$ cat /sys/devices/uncore_cha_2/alias

		uncore_type_0_2

arch/x86/events/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -34,4 +34,14 @@ config PERF_EVENTS_AMD_POWER 
	  (CPUID Fn8000_0007_EDX[12]) interface to calculate the

	  average power consumption on Family 15h processors.



config PERF_EVENTS_AMD_UNCORE

	tristate "AMD Uncore performance events"

	depends on PERF_EVENTS && CPU_SUP_AMD

	default y

	help

	  Include support for AMD uncore performance events for use with

	  e.g., perf stat -e amd_l3/.../,amd_df/.../.



	  To compile this driver as a module, choose M here: the

	  module will be called 'amd-uncore'.

endmenu

arch/x86/events/amd/Makefile

+3 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_CPU_SUP_AMD)		+= core.o uncore.o

obj-$(CONFIG_CPU_SUP_AMD)		+= core.o

obj-$(CONFIG_PERF_EVENTS_AMD_POWER)	+= power.o

obj-$(CONFIG_X86_LOCAL_APIC)		+= ibs.o

obj-$(CONFIG_PERF_EVENTS_AMD_UNCORE)	+= amd-uncore.o

amd-uncore-objs				:= uncore.o

ifdef CONFIG_AMD_IOMMU

obj-$(CONFIG_CPU_SUP_AMD)		+= iommu.o

endif

arch/x86/events/amd/ibs.c

+9 −14
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ static u32 ibs_caps; 
#include <linux/hardirq.h>



#include <asm/nmi.h>

#include <asm/amd-ibs.h>



#define IBS_FETCH_CONFIG_MASK	(IBS_FETCH_RAND_EN | IBS_FETCH_MAX_CNT)

#define IBS_OP_CONFIG_MASK	IBS_OP_MAX_CNT
@@ -100,15 +101,6 @@ struct perf_ibs { 
	u64				(*get_count)(u64 config);

};



struct perf_ibs_data {

	u32		size;

	union {

		u32	data[0];	/* data buffer starts here */

		u32	caps;

	};

	u64		regs[MSR_AMD64_IBS_REG_COUNT_MAX];

};



static int

perf_event_set_period(struct hw_perf_event *hwc, u64 min, u64 max, u64 *hw_period)

{
@@ -329,11 +321,14 @@ static int perf_ibs_set_period(struct perf_ibs *perf_ibs, 


static u64 get_ibs_fetch_count(u64 config)

{

	return (config & IBS_FETCH_CNT) >> 12;

	union ibs_fetch_ctl fetch_ctl = (union ibs_fetch_ctl)config;



	return fetch_ctl.fetch_cnt << 4;

}



static u64 get_ibs_op_count(u64 config)

{

	union ibs_op_ctl op_ctl = (union ibs_op_ctl)config;

	u64 count = 0;



	/*
@@ -341,12 +336,12 @@ static u64 get_ibs_op_count(u64 config) 
	 * and the lower 7 bits of CurCnt are randomized.

	 * Otherwise CurCnt has the full 27-bit current counter value.

	 */

	if (config & IBS_OP_VAL) {

		count = (config & IBS_OP_MAX_CNT) << 4;

	if (op_ctl.op_val) {

		count = op_ctl.opmaxcnt << 4;

		if (ibs_caps & IBS_CAPS_OPCNTEXT)

			count += config & IBS_OP_MAX_CNT_EXT_MASK;

			count += op_ctl.opmaxcnt_ext << 20;

	} else if (ibs_caps & IBS_CAPS_RDWROPCNT) {

		count = (config & IBS_OP_CUR_CNT) >> 32;

		count = op_ctl.opcurcnt;

	}



	return count;

arch/x86/events/amd/uncore.c

+32 −8
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 
#include <linux/init.h>

#include <linux/cpu.h>

#include <linux/cpumask.h>

#include <linux/cpufeature.h>

#include <linux/smp.h>



#include <asm/cpufeature.h>

#include <asm/perf_event.h>

#include <asm/msr.h>

#include <asm/smp.h>



#define NUM_COUNTERS_NB		4

#define NUM_COUNTERS_L2		4
@@ -347,6 +347,7 @@ static struct pmu amd_nb_pmu = { 
	.stop		= amd_uncore_stop,

	.read		= amd_uncore_read,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE | PERF_PMU_CAP_NO_INTERRUPT,

	.module		= THIS_MODULE,

};



static struct pmu amd_llc_pmu = {
@@ -360,6 +361,7 @@ static struct pmu amd_llc_pmu = { 
	.stop		= amd_uncore_stop,

	.read		= amd_uncore_read,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE | PERF_PMU_CAP_NO_INTERRUPT,

	.module		= THIS_MODULE,

};



static struct amd_uncore *amd_uncore_alloc(unsigned int cpu)
@@ -452,7 +454,7 @@ static int amd_uncore_cpu_starting(unsigned int cpu) 


	if (amd_uncore_llc) {

		uncore = *per_cpu_ptr(amd_uncore_llc, cpu);

		uncore->id = per_cpu(cpu_llc_id, cpu);

		uncore->id = get_llc_id(cpu);



		uncore = amd_uncore_find_online_sibling(uncore, amd_uncore_llc);

		*per_cpu_ptr(amd_uncore_llc, cpu) = uncore;
@@ -659,12 +661,34 @@ static int __init amd_uncore_init(void) 
fail_llc:

	if (boot_cpu_has(X86_FEATURE_PERFCTR_NB))

		perf_pmu_unregister(&amd_nb_pmu);

	if (amd_uncore_llc)

	free_percpu(amd_uncore_llc);

fail_nb:

	if (amd_uncore_nb)

	free_percpu(amd_uncore_nb);



	return ret;

}

device_initcall(amd_uncore_init);
 


static void __exit amd_uncore_exit(void)

{

	cpuhp_remove_state(CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE);

	cpuhp_remove_state(CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING);

	cpuhp_remove_state(CPUHP_PERF_X86_AMD_UNCORE_PREP);



	if (boot_cpu_has(X86_FEATURE_PERFCTR_LLC)) {

		perf_pmu_unregister(&amd_llc_pmu);

		free_percpu(amd_uncore_llc);

		amd_uncore_llc = NULL;

	}



	if (boot_cpu_has(X86_FEATURE_PERFCTR_NB)) {

		perf_pmu_unregister(&amd_nb_pmu);

		free_percpu(amd_uncore_nb);

		amd_uncore_nb = NULL;

	}

}



module_init(amd_uncore_init);

module_exit(amd_uncore_exit);



MODULE_DESCRIPTION("AMD Uncore Driver");

MODULE_LICENSE("GPL v2");