p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

perf/x86: Use update attribute groups for extra format 

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

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Peter 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: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Jiri Olsa 2019-05-12 17:55:16 +02:00 committed by Ingo Molnar
parent 1f15728682
commit 3ea40ac772
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/events/intel/core.c
View File

@ -4417,6 +4417,12 @@ lbr_is_visible(struct kobject *kobj, struct attribute *attr, int i)
return x86_pmu.lbr_nr ? attr->mode : 0; 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 = { static struct attribute_group group_events_td = {
.name = "events", .name = "events",
}; };
@ -4442,12 +4448,18 @@ static struct attribute_group group_caps_lbr = {
.is_visible = lbr_is_visible, .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[] = { static const struct attribute_group *attr_update[] = {
&group_events_td, &group_events_td,
&group_events_mem, &group_events_mem,
&group_events_tsx, &group_events_tsx,
&group_caps_gen, &group_caps_gen,
&group_caps_lbr, &group_caps_lbr,
&group_format_extra,
NULL, NULL,
}; };
@ -5016,15 +5028,11 @@ __init int intel_pmu_init(void)
snprintf(pmu_name_str, sizeof(pmu_name_str), "%s", name); 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_td.attrs = td_attr;
group_events_mem.attrs = mem_attr; group_events_mem.attrs = mem_attr;
group_events_tsx.attrs = tsx_attr; group_events_tsx.attrs = tsx_attr;
group_format_extra.attrs = extra_attr;
x86_pmu.attr_update = attr_update; x86_pmu.attr_update = attr_update;