Commit 1ceffff6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2025-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf event fixes from Ingo Molnar:
 "Fix x86 Intel Lion Cove CPU event constraints, and fix uprobes
  debug/error printk output pointer-value verbosity"

* tag 'perf-urgent-2025-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Fix event constraints for LNC
  uprobes: Don't use %pK through printk
parents f112eea3 782cffee

arch/x86/events/intel/core.c

+7 −13
Original line number Diff line number Diff line
@@ -397,34 +397,28 @@ static struct event_constraint intel_lnc_event_constraints[] = { 
	METRIC_EVENT_CONSTRAINT(INTEL_TD_METRIC_FETCH_LAT, 6),

	METRIC_EVENT_CONSTRAINT(INTEL_TD_METRIC_MEM_BOUND, 7),



	INTEL_EVENT_CONSTRAINT(0x20, 0xf),



	INTEL_UEVENT_CONSTRAINT(0x012a, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x012b, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x0148, 0x4),

	INTEL_UEVENT_CONSTRAINT(0x0175, 0x4),



	INTEL_EVENT_CONSTRAINT(0x2e, 0x3ff),

	INTEL_EVENT_CONSTRAINT(0x3c, 0x3ff),

	/*

	 * Generally event codes < 0x90 are restricted to counters 0-3.

	 * The 0x2E and 0x3C are exception, which has no restriction.

	 */

	INTEL_EVENT_CONSTRAINT_RANGE(0x01, 0x8f, 0xf),



	INTEL_UEVENT_CONSTRAINT(0x01a3, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x02a3, 0xf),

	INTEL_UEVENT_CONSTRAINT(0x08a3, 0x4),

	INTEL_UEVENT_CONSTRAINT(0x0ca3, 0x4),

	INTEL_UEVENT_CONSTRAINT(0x04a4, 0x1),

	INTEL_UEVENT_CONSTRAINT(0x08a4, 0x1),

	INTEL_UEVENT_CONSTRAINT(0x10a4, 0x1),

	INTEL_UEVENT_CONSTRAINT(0x01b1, 0x8),

	INTEL_UEVENT_CONSTRAINT(0x01cd, 0x3fc),

	INTEL_UEVENT_CONSTRAINT(0x02cd, 0x3),

	INTEL_EVENT_CONSTRAINT(0xce, 0x1),



	INTEL_EVENT_CONSTRAINT_RANGE(0xd0, 0xdf, 0xf),

	/*

	 * Generally event codes >= 0x90 are likely to have no restrictions.

	 * The exception are defined as above.

	 */

	INTEL_EVENT_CONSTRAINT_RANGE(0x90, 0xfe, 0x3ff),



	INTEL_UEVENT_CONSTRAINT(0x00e0, 0xf),



	EVENT_CONSTRAINT_END

};

arch/x86/events/intel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,7 @@ struct event_constraint intel_lnc_pebs_event_constraints[] = { 
	INTEL_FLAGS_UEVENT_CONSTRAINT(0x100, 0x100000000ULL),	/* INST_RETIRED.PREC_DIST */

	INTEL_FLAGS_UEVENT_CONSTRAINT(0x0400, 0x800000000ULL),



	INTEL_HYBRID_LDLAT_CONSTRAINT(0x1cd, 0x3ff),

	INTEL_HYBRID_LDLAT_CONSTRAINT(0x1cd, 0x3fc),

	INTEL_HYBRID_STLAT_CONSTRAINT(0x2cd, 0x3),

	INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x11d0, 0xf),	/* MEM_INST_RETIRED.STLB_MISS_LOADS */

	INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x12d0, 0xf),	/* MEM_INST_RETIRED.STLB_MISS_STORES */

kernel/events/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static void update_ref_ctr_warn(struct uprobe *uprobe, 
				struct mm_struct *mm, short d)

{

	pr_warn("ref_ctr %s failed for inode: 0x%lx offset: "

		"0x%llx ref_ctr_offset: 0x%llx of mm: 0x%pK\n",

		"0x%llx ref_ctr_offset: 0x%llx of mm: 0x%p\n",

		d > 0 ? "increment" : "decrement", uprobe->inode->i_ino,

		(unsigned long long) uprobe->offset,

		(unsigned long long) uprobe->ref_ctr_offset, mm);