xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf/x86/intel/uncore: Clear attr_update properly

Browse Source 
[ Upstream commit 6532783310e2b2f50dc13f46c49aa6546cb6e7a3 ]

Current clear_attr_update procedure in pmu_set_mapping() sets attr_update
field in NULL that is not correct because intel_uncore_type pmu types can
contain several groups in attr_update field. For example, SPR platform
already has uncore_alias_group to update and then UPI topology group will
be added in next patches.

Fix current behavior and clear attr_update group related to mapping only.

Fixes: bb42b3d397 ("perf/x86/intel/uncore: Expose an Uncore unit to IIO PMON mapping")
Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20221117122833.3103580-4-alexander.antonov@linux.intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Alexander Antonov
2022-11-17 12:28:25 +00:00
committed by Greg Kroah-Hartman
parent 53d24a9592
commit 7a04f85009
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/events/intel/uncore_snbep.c
View File

@@ -3747,6 +3747,21 @@ static const struct attribute_group *skx_iio_attr_update[] = {
NULL, NULL,
}; };
static void pmu_clear_mapping_attr(const struct attribute_group **groups,
struct attribute_group *ag)
{
int i;
for (i = 0; groups[i]; i++) {
if (groups[i] == ag) {
for (i++; groups[i]; i++)
groups[i - 1] = groups[i];
groups[i - 1] = NULL;
break;
}
}
}
static int static int
pmu_iio_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag) pmu_iio_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag)
{ {
@@ -3795,7 +3810,7 @@ clear_attrs:
clear_topology: clear_topology:
kfree(type->topology); kfree(type->topology);
clear_attr_update: clear_attr_update:
type->attr_update = NULL; pmu_clear_mapping_attr(type->attr_update, ag);
return ret; return ret;
} }