| Message ID | 20121107191951.GD16211@us.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Nov 07, 2012 at 11:19:52AM -0800, Sukadev Bhattiprolu wrote: > > From bafc551c31ce23c1cba0b75d23de6c46aba90f26 Mon Sep 17 00:00:00 2001 > From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > Date: Tue, 6 Nov 2012 16:30:28 -0800 > Subject: [PATCH 4/4] perf: Create a sysfs entry for Power event format > > Create a sysfs entry, '/sys/bus/event_source/devices/cpu/format/event' > which describes the format of a POWER cpu. > > $ cat /sys/bus/event_source/devices/cpu/format/event > config:0-20 > > The format of the event is the same for all POWER cpus, so bulk of this > change is in the code common to POWER cpus. > > Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> > --- > arch/powerpc/include/asm/perf_event_server.h | 8 ++++++++ > arch/powerpc/perf/core-book3s.c | 19 +++++++++++++++++++ > arch/powerpc/perf/power7-pmu.c | 1 + > 3 files changed, 28 insertions(+), 0 deletions(-) > > diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h > index ad84f73..20a49bf 100644 > --- a/arch/powerpc/include/asm/perf_event_server.h > +++ b/arch/powerpc/include/asm/perf_event_server.h > @@ -130,3 +130,11 @@ extern ssize_t power_events_sysfs_show(struct device *dev, > .attr = __ATTR(_name, 0444, power_events_sysfs_show, NULL),\ > .id = PM_##_id, \ > }; > + > +/* > + * Format of a perf event is the same on all POWER cpus. Declare a > + * common sysfs attribute group that individual POWER cpus can share. > + */ > +extern struct attribute_group power_pmu_format_group; > + > + > diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c > index 19b23bd..388e2a1 100644 > --- a/arch/powerpc/perf/core-book3s.c > +++ b/arch/powerpc/perf/core-book3s.c > @@ -1315,6 +1315,25 @@ ssize_t power_events_sysfs_show(struct device *dev, > return sprintf(page, "event=0x%02llx\n", pmu_attr->id); > } > > +static ssize_t power_config_sysfs_show(struct device *dev, > + struct device_attribute *attr, char *page) > +{ > + return sprintf(page, "config:0-20\n"); > +} > + > +static struct device_attribute config_dev_attr = \ > + __ATTR(event, 0444, power_config_sysfs_show, NULL); there's PMU_FORMAT_ATTR in include/linux/perf_event.h macro doing this jirka
diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h index ad84f73..20a49bf 100644 --- a/arch/powerpc/include/asm/perf_event_server.h +++ b/arch/powerpc/include/asm/perf_event_server.h @@ -130,3 +130,11 @@ extern ssize_t power_events_sysfs_show(struct device *dev, .attr = __ATTR(_name, 0444, power_events_sysfs_show, NULL),\ .id = PM_##_id, \ }; + +/* + * Format of a perf event is the same on all POWER cpus. Declare a + * common sysfs attribute group that individual POWER cpus can share. + */ +extern struct attribute_group power_pmu_format_group; + + diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 19b23bd..388e2a1 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -1315,6 +1315,25 @@ ssize_t power_events_sysfs_show(struct device *dev, return sprintf(page, "event=0x%02llx\n", pmu_attr->id); } +static ssize_t power_config_sysfs_show(struct device *dev, + struct device_attribute *attr, char *page) +{ + return sprintf(page, "config:0-20\n"); +} + +static struct device_attribute config_dev_attr = \ + __ATTR(event, 0444, power_config_sysfs_show, NULL); + +static struct attribute *power_pmu_format_attr[] = { + &config_dev_attr.attr, + NULL, +}; + +struct attribute_group power_pmu_format_group = { + .name = "format", + .attrs = power_pmu_format_attr, +}; + struct pmu power_pmu = { .pmu_enable = power_pmu_enable, .pmu_disable = power_pmu_disable, diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c index 31c61ab..aa9f588 100644 --- a/arch/powerpc/perf/power7-pmu.c +++ b/arch/powerpc/perf/power7-pmu.c @@ -387,6 +387,7 @@ static struct attribute_group power7_pmu_events_group = { }; static const struct attribute_group *power7_pmu_attr_groups[] = { + &power_pmu_format_group, &power7_pmu_events_group, NULL, };