This is a note to let you know that I've just added the patch titled
perf/x86/intel/uncore: Disable I/O stacks to PMU mapping on ICX-D
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
perf-x86-intel-uncore-disable-i-o-stacks-to-pmu-mapping-on-icx-d.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From efe062705d149b20a15498cb999a9edbb8241e6f Mon Sep 17 00:00:00 2001
From: Alexander Antonov <alexander.antonov@xxxxxxxxxxxxxxx>
Date: Thu, 17 Nov 2022 12:28:26 +0000
Subject: perf/x86/intel/uncore: Disable I/O stacks to PMU mapping on ICX-D
From: Alexander Antonov <alexander.antonov@xxxxxxxxxxxxxxx>
commit efe062705d149b20a15498cb999a9edbb8241e6f upstream.
Current implementation of I/O stacks to PMU mapping doesn't support ICX-D.
Detect ICX-D system to disable mapping.
Fixes: 10337e95e04c ("perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on ICX")
Signed-off-by: Alexander Antonov <alexander.antonov@xxxxxxxxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Reviewed-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/20221117122833.3103580-5-alexander.antonov@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/events/intel/uncore.h | 1 +
arch/x86/events/intel/uncore_snbep.c | 5 +++++
2 files changed, 6 insertions(+)
--- a/arch/x86/events/intel/uncore.h
+++ b/arch/x86/events/intel/uncore.h
@@ -2,6 +2,7 @@
#include <linux/slab.h>
#include <linux/pci.h>
#include <asm/apicdef.h>
+#include <asm/intel-family.h>
#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/perf_event.h>
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -5144,6 +5144,11 @@ static int icx_iio_get_topology(struct i
static int icx_iio_set_mapping(struct intel_uncore_type *type)
{
+ /* Detect ICX-D system. This case is not supported */
+ if (boot_cpu_data.x86_model == INTEL_FAM6_ICELAKE_D) {
+ pmu_clear_mapping_attr(type->attr_update, &icx_iio_mapping_group);
+ return -EPERM;
+ }
return pmu_iio_set_mapping(type, &icx_iio_mapping_group);
}
Patches currently in stable-queue which might be from alexander.antonov@xxxxxxxxxxxxxxx are
queue-6.0/perf-x86-intel-uncore-clear-attr_update-properly.patch
queue-6.0/perf-x86-intel-uncore-disable-i-o-stacks-to-pmu-mapping-on-icx-d.patch
