Commit f797f05d authored by Alexander Antonov's avatar Alexander Antonov Committed by Peter Zijlstra

perf/x86/intel/uncore: Fix for iio mapping on Skylake Server

Introduced early attributes /sys/devices/uncore_iio_<pmu_idx>/die* are
initialized by skx_iio_set_mapping(), however, for example, for multiple
segment platforms skx_iio_get_topology() returns -EPERM before a list of
attributes in skx_iio_mapping_group will have been initialized.
As a result the list is being NULL. Thus the warning
"sysfs: (bin_)attrs not set by subsystem for group: uncore_iio_*/" appears
and uncore_iio pmus are not available in sysfs. Clear IIO attr_update
to properly handle the cases when topology information cannot be
retrieved.

Fixes: bb42b3d3 ("perf/x86/intel/uncore: Expose an Uncore unit to IIO PMON mapping")
Reported-by: default avatarKyle Meyer <kyle.meyer@hpe.com>
Suggested-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarAlexander Antonov <alexander.antonov@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarAlexei Budankov <alexey.budankov@linux.intel.com>
Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Link: https://lkml.kernel.org/r/20200928102133.61041-1-alexander.antonov@linux.intel.com
parent c3bb8a9f
...@@ -3754,7 +3754,9 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type) ...@@ -3754,7 +3754,9 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)
ret = skx_iio_get_topology(type); ret = skx_iio_get_topology(type);
if (ret) if (ret)
return ret; goto clear_attr_update;
ret = -ENOMEM;
/* One more for NULL. */ /* One more for NULL. */
attrs = kcalloc((uncore_max_dies() + 1), sizeof(*attrs), GFP_KERNEL); attrs = kcalloc((uncore_max_dies() + 1), sizeof(*attrs), GFP_KERNEL);
...@@ -3786,8 +3788,9 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type) ...@@ -3786,8 +3788,9 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)
kfree(eas); kfree(eas);
kfree(attrs); kfree(attrs);
kfree(type->topology); kfree(type->topology);
clear_attr_update:
type->attr_update = NULL; type->attr_update = NULL;
return -ENOMEM; return ret;
} }
static void skx_iio_cleanup_mapping(struct intel_uncore_type *type) static void skx_iio_cleanup_mapping(struct intel_uncore_type *type)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment