lkml.org 
[lkml]   [2012]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/5] perf: Make EVENT_ATTR and EVENT_PTR global

    Rename EVENT_ATTR() and EVENT_PTR() PMU_EVENT_ATTR() and PMU_EVENT_PTR().
    Make them global so they are available to all architectures.

    Further to allow architectures flexibility, have PMU_EVENT_PTR() pass in the
    variable name as a parameter.

    Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    ---
    arch/x86/kernel/cpu/perf_event.c | 17 +++++------------
    include/linux/perf_event.h | 13 +++++++++++++
    2 files changed, 18 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
    index 4428fd1..24bc505 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -1316,11 +1316,6 @@ 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.
    @@ -1351,14 +1346,12 @@ static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *at
    return x86_pmu.events_sysfs_show(page, config);
    }

    -#define EVENT_VAR(_id) event_attr_##_id
    -#define EVENT_PTR(_id) &event_attr_##_id.attr.attr
    +#define EVENT_VAR(_id) event_attr_##_id
    +#define EVENT_ID(_id) PERF_COUNT_HW_##_id
    +#define EVENT_PTR(_id) PMU_EVENT_PTR(EVENT_VAR(_id))

    -#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, \
    -};
    +#define EVENT_ATTR(_name, _id) \
    + PMU_EVENT_ATTR(_name, EVENT_VAR(_id), EVENT_ID(_id), events_sysfs_show)

    EVENT_ATTR(cpu-cycles, CPU_CYCLES );
    EVENT_ATTR(instructions, INSTRUCTIONS );
    diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
    index 6bfb2fa..31692cb 100644
    --- a/include/linux/perf_event.h
    +++ b/include/linux/perf_event.h
    @@ -817,6 +817,19 @@ do { \
    } while (0)


    +struct perf_pmu_events_attr {
    + struct device_attribute attr;
    + u64 id;
    +};
    +
    +#define PMU_EVENT_PTR(_var) &_var.attr.attr
    +
    +#define PMU_EVENT_ATTR(_name, _var, _id, _show) \
    +static struct perf_pmu_events_attr _var = { \
    + .attr = __ATTR(_name, 0444, _show, NULL), \
    + .id = _id, \
    +};
    +
    #define PMU_FORMAT_ATTR(_name, _format) \
    static ssize_t \
    _name##_show(struct device *dev, \
    --
    1.7.1


    \
     
     \ /
      Last update: 2012-12-19 09:01    [W:2.760 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site