Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ea40ac7 authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar
Browse files

perf/x86: Use update attribute groups for extra format 



Using the new pmu::update_attrs attribute group for
extra "format" directory.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190512155518.21468-8-jolsa@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1f157286

arch/x86/events/intel/core.c

+13 −5
Original line number Diff line number Diff line
@@ -4417,6 +4417,12 @@ 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 struct attribute_group group_events_td  = {

	.name = "events",

};
@@ -4442,12 +4448,18 @@ static struct attribute_group group_caps_lbr = { 
	.is_visible = lbr_is_visible,

};



static struct attribute_group group_format_extra = {

	.name       = "format",

	.is_visible = exra_is_visible,

};



static const struct attribute_group *attr_update[] = {

	&group_events_td,

	&group_events_mem,

	&group_events_tsx,

	&group_caps_gen,

	&group_caps_lbr,

	&group_format_extra,

	NULL,

};
@@ -5016,15 +5028,11 @@ __init int intel_pmu_init(void) 


	snprintf(pmu_name_str, sizeof(pmu_name_str), "%s", name);



	if (version >= 2 && extra_attr) {

		x86_pmu.format_attrs = merge_attr(intel_arch3_formats_attr,

						  extra_attr);

		WARN_ON(!x86_pmu.format_attrs);

	}



	group_events_td.attrs  = td_attr;

	group_events_mem.attrs = mem_attr;

	group_events_tsx.attrs = tsx_attr;

	group_format_extra.attrs = extra_attr;



	x86_pmu.attr_update = attr_update;