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

Merge tag 'perf-urgent-2024-12-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 perf fixes from Ingo Molnar:

 - Fix Intel Lunar Lake build-in event definitions

 - Fall back to (compatible) legacy features on new Intel PEBS format v6
   hardware

 - Enable uncore support on Intel Clearwater Forest CPUs, which is the
   same as the existing Sierra Forest uncore driver

* tag 'perf-urgent-2024-12-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Fix bitmask of OCR and FRONTEND events for LNC
  perf/x86/intel/ds: Add PEBS format 6
  perf/x86/intel/uncore: Add Clearwater Forest support
parents bcfac553 aa5d2ca7

arch/x86/events/intel/core.c

+11 −1
Original line number Diff line number Diff line
@@ -429,6 +429,16 @@ static struct event_constraint intel_lnc_event_constraints[] = { 
	EVENT_CONSTRAINT_END

};



static struct extra_reg intel_lnc_extra_regs[] __read_mostly = {

	INTEL_UEVENT_EXTRA_REG(0x012a, MSR_OFFCORE_RSP_0, 0xfffffffffffull, RSP_0),

	INTEL_UEVENT_EXTRA_REG(0x012b, MSR_OFFCORE_RSP_1, 0xfffffffffffull, RSP_1),

	INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),

	INTEL_UEVENT_EXTRA_REG(0x02c6, MSR_PEBS_FRONTEND, 0x9, FE),

	INTEL_UEVENT_EXTRA_REG(0x03c6, MSR_PEBS_FRONTEND, 0x7fff1f, FE),

	INTEL_UEVENT_EXTRA_REG(0x40ad, MSR_PEBS_FRONTEND, 0xf, FE),

	INTEL_UEVENT_EXTRA_REG(0x04c2, MSR_PEBS_FRONTEND, 0x8, FE),

	EVENT_EXTRA_END

};



EVENT_ATTR_STR(mem-loads,	mem_ld_nhm,	"event=0x0b,umask=0x10,ldlat=3");

EVENT_ATTR_STR(mem-loads,	mem_ld_snb,	"event=0xcd,umask=0x1,ldlat=3");
@@ -6422,7 +6432,7 @@ static __always_inline void intel_pmu_init_lnc(struct pmu *pmu) 
	intel_pmu_init_glc(pmu);

	hybrid(pmu, event_constraints) = intel_lnc_event_constraints;

	hybrid(pmu, pebs_constraints) = intel_lnc_pebs_event_constraints;

	hybrid(pmu, extra_regs) = intel_rwc_extra_regs;

	hybrid(pmu, extra_regs) = intel_lnc_extra_regs;

}



static __always_inline void intel_pmu_init_skt(struct pmu *pmu)

arch/x86/events/intel/ds.c

+1 −0
Original line number Diff line number Diff line
@@ -2517,6 +2517,7 @@ void __init intel_ds_init(void) 
			x86_pmu.large_pebs_flags |= PERF_SAMPLE_TIME;

			break;



		case 6:

		case 5:

			x86_pmu.pebs_ept = 1;

			fallthrough;

arch/x86/events/intel/uncore.c

+1 −0
Original line number Diff line number Diff line
@@ -1910,6 +1910,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = { 
	X86_MATCH_VFM(INTEL_ATOM_GRACEMONT,	&adl_uncore_init),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X,	&gnr_uncore_init),

	X86_MATCH_VFM(INTEL_ATOM_CRESTMONT,	&gnr_uncore_init),

	X86_MATCH_VFM(INTEL_ATOM_DARKMONT_X,	&gnr_uncore_init),

	{},

};

MODULE_DEVICE_TABLE(x86cpu, intel_uncore_match);