2022-11-17 12:34:48

by Alexander Antonov

Subject: [PATCH 05/11] perf/x86/intel/uncore: Generalize get_topology() for SKX PMUs

From: Alexander Antonov <[email protected]>

Factor out a generic code from skx_iio_get_topology() to skx_pmu_get_topology()
to avoid code duplication. This code will be used by get_topology() procedure
for SKX UPI PMUs in the further patch.

Signed-off-by: Alexander Antonov <[email protected]>
Reviewed-by: Kan Liang <[email protected]>
---
arch/x86/events/intel/uncore_snbep.c | 38 ++++++++++++++++++++--------
1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index e14b96398377..254ba0ad650a 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -3837,14 +3837,14 @@ static void pmu_free_topology(struct intel_uncore_type *type)
}
}

-static int skx_iio_get_topology(struct intel_uncore_type *type)
+static int skx_pmu_get_topology(struct intel_uncore_type *type,
+ int (*topology_cb)(struct intel_uncore_type*, int, int, u64))
{
int die, ret = -EPERM;
- u64 configuration;
- int idx;
+ u64 cpu_bus_msr;

for (die = 0; die < uncore_max_dies(); die++) {
- ret = skx_msr_cpu_bus_read(die_to_cpu(die), &configuration);
+ ret = skx_msr_cpu_bus_read(die_to_cpu(die), &cpu_bus_msr);
if (ret)
break;

@@ -3852,17 +3852,35 @@ static int skx_iio_get_topology(struct intel_uncore_type *type)
if (ret < 0)
break;

- for (idx = 0; idx < type->num_boxes; idx++) {
- type->topology[die][idx].pmu_idx = idx;
- type->topology[die][idx].iio->segment = ret;
- type->topology[die][idx].iio->pci_bus_no =
- (configuration >> (idx * BUS_NUM_STRIDE)) & 0xff;
- }
+ ret = topology_cb(type, ret, die, cpu_bus_msr);
+ if (ret)
+ break;
}

return ret;
}

+static int skx_iio_topology_cb(struct intel_uncore_type *type, int segment,
+ int die, u64 cpu_bus_msr)
+{
+ int idx;
+ struct intel_uncore_topology *t;
+
+ for (idx = 0; idx < type->num_boxes; idx++) {
+ t = &type->topology[die][idx];
+ t->pmu_idx = idx;
+ t->iio->segment = segment;
+ t->iio->pci_bus_no = (cpu_bus_msr >> (idx * BUS_NUM_STRIDE)) & 0xff;
+ }
+
+ return 0;
+}
+
+static int skx_iio_get_topology(struct intel_uncore_type *type)
+{
+ return skx_pmu_get_topology(type, skx_iio_topology_cb);
+}
+
static struct attribute_group skx_iio_mapping_group = {
.is_visible = skx_iio_mapping_visible,
};
--
2.25.1

2022-11-24 12:39:59

by tip-bot2 for Alexey Makhalov

Subject: [tip: perf/core] perf/x86/intel/uncore: Generalize get_topology() for SKX PMUs

The following commit has been merged into the perf/core branch of tip:

Commit-ID: 07813e2a59c93f10716ffa33d608d2c0685cf85b
Gitweb: https://git.kernel.org/tip/07813e2a59c93f10716ffa33d608d2c0685cf85b
Author: Alexander Antonov <[email protected]>
AuthorDate: Thu, 17 Nov 2022 12:28:27
Committer: Peter Zijlstra <[email protected]>
CommitterDate: Thu, 24 Nov 2022 11:09:22 +01:00

perf/x86/intel/uncore: Generalize get_topology() for SKX PMUs

Factor out a generic code from skx_iio_get_topology() to skx_pmu_get_topology()
to avoid code duplication. This code will be used by get_topology() procedure
for SKX UPI PMUs in the further patch.

Signed-off-by: Alexander Antonov <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Reviewed-by: Kan Liang <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/events/intel/uncore_snbep.c | 38 +++++++++++++++++++--------
1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
index e14b963..254ba0a 100644
--- a/arch/x86/events/intel/uncore_snbep.c
+++ b/arch/x86/events/intel/uncore_snbep.c
@@ -3837,14 +3837,14 @@ static void pmu_free_topology(struct intel_uncore_type *type)
}
}

-static int skx_iio_get_topology(struct intel_uncore_type *type)
+static int skx_pmu_get_topology(struct intel_uncore_type *type,
+ int (*topology_cb)(struct intel_uncore_type*, int, int, u64))
{
int die, ret = -EPERM;
- u64 configuration;
- int idx;
+ u64 cpu_bus_msr;

for (die = 0; die < uncore_max_dies(); die++) {
- ret = skx_msr_cpu_bus_read(die_to_cpu(die), &configuration);
+ ret = skx_msr_cpu_bus_read(die_to_cpu(die), &cpu_bus_msr);
if (ret)
break;

@@ -3852,17 +3852,35 @@ static int skx_iio_get_topology(struct intel_uncore_type *type)
if (ret < 0)
break;

- for (idx = 0; idx < type->num_boxes; idx++) {
- type->topology[die][idx].pmu_idx = idx;
- type->topology[die][idx].iio->segment = ret;
- type->topology[die][idx].iio->pci_bus_no =
- (configuration >> (idx * BUS_NUM_STRIDE)) & 0xff;
- }
+ ret = topology_cb(type, ret, die, cpu_bus_msr);
+ if (ret)
+ break;
}

return ret;
}

+static int skx_iio_topology_cb(struct intel_uncore_type *type, int segment,
+ int die, u64 cpu_bus_msr)
+{
+ int idx;
+ struct intel_uncore_topology *t;
+
+ for (idx = 0; idx < type->num_boxes; idx++) {
+ t = &type->topology[die][idx];
+ t->pmu_idx = idx;
+ t->iio->segment = segment;
+ t->iio->pci_bus_no = (cpu_bus_msr >> (idx * BUS_NUM_STRIDE)) & 0xff;
+ }
+
+ return 0;
+}
+
+static int skx_iio_get_topology(struct intel_uncore_type *type)
+{
+ return skx_pmu_get_topology(type, skx_iio_topology_cb);
+}
+
static struct attribute_group skx_iio_mapping_group = {
.is_visible = skx_iio_mapping_visible,
};