Skip to content

Commit f797f05

Browse files
Alexander AntonovPeter Zijlstra
authored andcommitted
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: bb42b3d ("perf/x86/intel/uncore: Expose an Uncore unit to IIO PMON mapping") Reported-by: Kyle Meyer <kyle.meyer@hpe.com> Suggested-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Alexei Budankov <alexey.budankov@linux.intel.com> Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Link: https://lkml.kernel.org/r/20200928102133.61041-1-alexander.antonov@linux.intel.com
1 parent c3bb8a9 commit f797f05

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

arch/x86/events/intel/uncore_snbep.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3754,7 +3754,9 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)
37543754

37553755
ret = skx_iio_get_topology(type);
37563756
if (ret)
3757-
return ret;
3757+
goto clear_attr_update;
3758+
3759+
ret = -ENOMEM;
37583760

37593761
/* One more for NULL. */
37603762
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)
37863788
kfree(eas);
37873789
kfree(attrs);
37883790
kfree(type->topology);
3791+
clear_attr_update:
37893792
type->attr_update = NULL;
3790-
return -ENOMEM;
3793+
return ret;
37913794
}
37923795

37933796
static void skx_iio_cleanup_mapping(struct intel_uncore_type *type)

0 commit comments

Comments
 (0)