lkml.org 
[lkml]   [2013]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/x86] perf/x86: Improve sysfs event mapping with event string
    Commit-ID:  5256a7d63866c51815fb59d8b850d678b4e32357
    Gitweb: http://git.kernel.org/tip/5256a7d63866c51815fb59d8b850d678b4e32357
    Author: Stephane Eranian <eranian@google.com>
    AuthorDate: Thu, 24 Jan 2013 16:10:26 +0100
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Fri, 25 Jan 2013 10:19:01 +0100

    perf/x86: Improve sysfs event mapping with event string

    This patch extends Jiri's changes to make generic
    events mapping visible via sysfs. The patch extends
    the mechanism to non-generic events by allowing
    the mappings to be hardcoded in strings.

    This mechanism will be used by the PEBS-LL patch
    later on.

    Signed-off-by: Stephane Eranian <eranian@google.com>
    Cc: peterz@infradead.org
    Cc: ak@linux.intel.com
    Cc: acme@redhat.com
    Cc: jolsa@redhat.com
    Cc: namhyung.kim@lge.com
    Link: http://lkml.kernel.org/r/1359040242-8269-3-git-send-email-eranian@google.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/kernel/cpu/perf_event.c | 27 ++++++++++++---------------
    arch/x86/kernel/cpu/perf_event.h | 23 +++++++++++++++++++++++
    2 files changed, 35 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
    index f133091..fd80a0c 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -1310,20 +1310,22 @@ static struct attribute_group x86_pmu_format_group = {
    .attrs = NULL,
    };

    -struct perf_pmu_events_attr {
    - struct device_attribute attr;
    - u64 id;
    -};
    -
    /*
    * Remove all undefined events (x86_pmu.event_map(id) == 0)
    * out of events_attr attributes.
    */
    static void __init filter_events(struct attribute **attrs)
    {
    + struct device_attribute *d;
    + struct perf_pmu_events_attr *pmu_attr;
    int i, j;

    for (i = 0; attrs[i]; i++) {
    + d = (struct device_attribute *)attrs[i];
    + pmu_attr = container_of(d, struct perf_pmu_events_attr, attr);
    + /* str trumps id */
    + if (pmu_attr->event_str)
    + continue;
    if (x86_pmu.event_map(i))
    continue;

    @@ -1366,19 +1368,14 @@ static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *at
    {
    struct perf_pmu_events_attr *pmu_attr = \
    container_of(attr, struct perf_pmu_events_attr, attr);
    -
    u64 config = x86_pmu.event_map(pmu_attr->id);
    - return x86_pmu.events_sysfs_show(page, config);
    -}

    -#define EVENT_VAR(_id) event_attr_##_id
    -#define EVENT_PTR(_id) &event_attr_##_id.attr.attr
    + /* string trumps id */
    + if (pmu_attr->event_str)
    + return sprintf(page, "%s", pmu_attr->event_str);

    -#define EVENT_ATTR(_name, _id) \
    -static struct perf_pmu_events_attr EVENT_VAR(_id) = { \
    - .attr = __ATTR(_name, 0444, events_sysfs_show, NULL), \
    - .id = PERF_COUNT_HW_##_id, \
    -};
    + return x86_pmu.events_sysfs_show(page, config);
    +}

    EVENT_ATTR(cpu-cycles, CPU_CYCLES );
    EVENT_ATTR(instructions, INSTRUCTIONS );
    diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
    index 4170043..dda2101 100644
    --- a/arch/x86/kernel/cpu/perf_event.h
    +++ b/arch/x86/kernel/cpu/perf_event.h
    @@ -420,6 +420,29 @@ do { \
    #define ERF_NO_HT_SHARING 1
    #define ERF_HAS_RSP_1 2

    +#define EVENT_VAR(_id) event_attr_##_id
    +#define EVENT_PTR(_id) &event_attr_##_id.attr.attr
    +
    +#define EVENT_ATTR(_name, _id) \
    +static struct perf_pmu_events_attr EVENT_VAR(_id) = { \
    + .attr = __ATTR(_name, 0444, events_sysfs_show, NULL), \
    + .id = PERF_COUNT_HW_##_id, \
    + .event_str = NULL, \
    +};
    +
    +#define EVENT_ATTR_STR(_name, v, str) \
    +static struct perf_pmu_events_attr event_attr_##v = { \
    + .attr = __ATTR(_name, 0444, events_sysfs_show, NULL), \
    + .id = 0, \
    + .event_str = str, \
    +};
    +
    +struct perf_pmu_events_attr {
    + struct device_attribute attr;
    + u64 id;
    + const char *event_str;
    +};
    +
    extern struct x86_pmu x86_pmu __read_mostly;

    DECLARE_PER_CPU(struct cpu_hw_events, cpu_hw_events);

    \
     
     \ /
      Last update: 2013-01-25 23:22    [W:4.689 / U:21.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site