Commit 318c4985 authored by Kan Liang's avatar Kan Liang Committed by Peter Zijlstra
Browse files

perf/x86/intel: Reorganize attrs and is_visible 



Some attrs and is_visible implementations are rather far away from one
another which makes the whole thing hard to interpret.

There are only two attribute groups which have both .attrs and
.is_visible, group_default and group_caps_lbr. Move them together.

No functional changes.

Suggested-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20231025201626.3000228-4-kan.liang@linux.intel.com
parent 1f2376cd

arch/x86/events/intel/core.c

+15 −15
Original line number Diff line number Diff line
@@ -5540,6 +5540,12 @@ static struct attribute *lbr_attrs[] = { 
	NULL

};



static umode_t

lbr_is_visible(struct kobject *kobj, struct attribute *attr, int i)

{

	return x86_pmu.lbr_nr ? attr->mode : 0;

}



static char pmu_name_str[30];



static ssize_t pmu_name_show(struct device *cdev,
@@ -5566,6 +5572,15 @@ static struct attribute *intel_pmu_attrs[] = { 
	NULL,

};



static umode_t

default_is_visible(struct kobject *kobj, struct attribute *attr, int i)

{

	if (attr == &dev_attr_allow_tsx_force_abort.attr)

		return x86_pmu.flags & PMU_FL_TFA ? attr->mode : 0;



	return attr->mode;

}



static umode_t

tsx_is_visible(struct kobject *kobj, struct attribute *attr, int i)

{
@@ -5587,27 +5602,12 @@ mem_is_visible(struct kobject *kobj, struct attribute *attr, int i) 
	return pebs_is_visible(kobj, attr, i);

}



static umode_t

lbr_is_visible(struct kobject *kobj, struct attribute *attr, int i)

{

	return x86_pmu.lbr_nr ? attr->mode : 0;

}



static umode_t

exra_is_visible(struct kobject *kobj, struct attribute *attr, int i)

{

	return x86_pmu.version >= 2 ? attr->mode : 0;

}



static umode_t

default_is_visible(struct kobject *kobj, struct attribute *attr, int i)

{

	if (attr == &dev_attr_allow_tsx_force_abort.attr)

		return x86_pmu.flags & PMU_FL_TFA ? attr->mode : 0;



	return attr->mode;

}



static struct attribute_group group_events_td  = {

	.name = "events",

};