lkml.org 
[lkml]   [2012]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/urgent] perf/x86/p4: Add format attributes
    Commit-ID:  7b8e6da46b921d30ac1553cac56d8fb74f0b431d
    Gitweb: http://git.kernel.org/tip/7b8e6da46b921d30ac1553cac56d8fb74f0b431d
    Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
    AuthorDate: Tue, 27 Mar 2012 16:50:42 +0200
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Tue, 3 Apr 2012 08:33:38 +0200

    perf/x86/p4: Add format attributes

    Steven reported his P4 not booting properly, the missing format
    attributes cause a NULL ptr deref. Cure this by adding the
    missing format specification.

    I took the format description out of the comment near
    p4_config_pack*() and hope that comment is still relatively
    accurate.

    Reported-by: Steven Rostedt <rostedt@goodmis.org>
    Reported-by: Bruno Prémont <bonbons@linux-vserver.org>
    Tested-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: Lin Ming <ming.m.lin@intel.com>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/r/1332859842.16159.227.camel@twins
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/kernel/cpu/perf_event_p4.c | 13 +++++++++++++
    1 files changed, 13 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c
    index ef484d9..a2dfacf 100644
    --- a/arch/x86/kernel/cpu/perf_event_p4.c
    +++ b/arch/x86/kernel/cpu/perf_event_p4.c
    @@ -1271,6 +1271,17 @@ done:
    return num ? -EINVAL : 0;
    }

    +PMU_FORMAT_ATTR(cccr, "config:0-31" );
    +PMU_FORMAT_ATTR(escr, "config:32-62");
    +PMU_FORMAT_ATTR(ht, "config:63" );
    +
    +static struct attribute *intel_p4_formats_attr[] = {
    + &format_attr_cccr.attr,
    + &format_attr_escr.attr,
    + &format_attr_ht.attr,
    + NULL,
    +};
    +
    static __initconst const struct x86_pmu p4_pmu = {
    .name = "Netburst P4/Xeon",
    .handle_irq = p4_pmu_handle_irq,
    @@ -1305,6 +1316,8 @@ static __initconst const struct x86_pmu p4_pmu = {
    * the former idea is taken from OProfile code
    */
    .perfctr_second_write = 1,
    +
    + .format_attrs = intel_p4_formats_attr,
    };

    __init int p4_pmu_init(void)
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2012-04-03 10:15    [W:0.026 / U:63.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site