lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 453/775] perf symbols: Fix return value when loading PE DSO
    Date
    From: Nicholas Fraser <nfraser@codeweavers.com>

    [ Upstream commit 77771a97011fa9146ccfaf2983a3a2885dc57b6f ]

    The first time dso__load() was called on a PE file it always returned -1
    error. This caused the first call to map__find_symbol() to always fail
    on a PE file so the first sample from each PE file always had symbol
    <unknown>. Subsequent samples succeed however because the DSO is already
    loaded.

    This fixes dso__load() to return 0 when successfully loading a DSO with
    libbfd.

    Fixes: eac9a4342e5447ca ("perf symbols: Try reading the symbol table with libbfd")
    Signed-off-by: Nicholas Fraser <nfraser@codeweavers.com>
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Frank Ch. Eigler <fche@redhat.com>
    Cc: Huw Davies <huw@codeweavers.com>
    Cc: Ian Rogers <irogers@google.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Kim Phillips <kim.phillips@amd.com>
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Remi Bernon <rbernon@codeweavers.com>
    Cc: Song Liu <songliubraving@fb.com>
    Cc: Tommi Rantala <tommi.t.rantala@nokia.com>
    Cc: Ulrich Czekalla <uczekalla@codeweavers.com>
    Link: http://lore.kernel.org/lkml/1671b43b-09c3-1911-dbf8-7f030242fbf7@codeweavers.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/perf/util/symbol.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
    index 1645fb4ec9ed4..7dcf3327c5f7d 100644
    --- a/tools/perf/util/symbol.c
    +++ b/tools/perf/util/symbol.c
    @@ -1866,8 +1866,10 @@ int dso__load(struct dso *dso, struct map *map)
    if (nsexit)
    nsinfo__mountns_enter(dso->nsinfo, &nsc);

    - if (bfdrc == 0)
    + if (bfdrc == 0) {
    + ret = 0;
    break;
    + }

    if (!is_reg || sirc < 0)
    continue;
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 05:10    [W:4.035 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site