lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 604/772] perf jevents: Fix event syntax error caused by ExtSel
    Date
    From: Zhengjun Xing <zhengjun.xing@linux.intel.com>

    [ Upstream commit f4df0dbbe62ee8e4405a57b27ccd54393971c773 ]

    In the origin code, when "ExtSel" is 1, the eventcode will change to
    "eventcode |= 1 << 21”. For event “UNC_Q_RxL_CREDITS_CONSUMED_VN0.DRS",
    its "ExtSel" is "1", its eventcode will change from 0x1E to 0x20001E,
    but in fact the eventcode should <=0x1FF, so this will cause the parse
    fail:

    # perf stat -e "UNC_Q_RxL_CREDITS_CONSUMED_VN0.DRS" -a sleep 0.1
    event syntax error: '.._RxL_CREDITS_CONSUMED_VN0.DRS'
    \___ value too big for format, maximum is 511

    On the perf kernel side, the kernel assumes the valid bits are continuous.
    It will adjust the 0x100 (bit 8 for perf tool) to bit 21 in HW.

    DEFINE_UNCORE_FORMAT_ATTR(event_ext, event, "config:0-7,21");

    So the perf tool follows the kernel side and just set bit8 other than bit21.

    Fixes: fedb2b518239cbc0 ("perf jevents: Add support for parsing uncore json files")
    Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
    Signed-off-by: Xing Zhengjun <zhengjun.xing@linux.intel.com>
    Acked-by: Ian Rogers <irogers@google.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexander Shishkin <alexander.shishkin@intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: https://lore.kernel.org/r/20220525140410.1706851-1-zhengjun.xing@linux.intel.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/pmu-events/jevents.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
    index 1a57c3f81dd4..d07e24c1a889 100644
    --- a/tools/perf/pmu-events/jevents.c
    +++ b/tools/perf/pmu-events/jevents.c
    @@ -611,7 +611,7 @@ static int json_events(const char *fn,
    } else if (json_streq(map, field, "ExtSel")) {
    char *code = NULL;
    addfield(map, &code, "", "", val);
    - eventcode |= strtoul(code, NULL, 0) << 21;
    + eventcode |= strtoul(code, NULL, 0) << 8;
    free(code);
    } else if (json_streq(map, field, "EventName")) {
    addfield(map, &je.name, "", "", val);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 23:39    [W:2.469 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site