From: Nicholas Fraser <nfra...@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 <nfra...@codeweavers.com>
Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Frank Ch. Eigler <f...@redhat.com>
Cc: Huw Davies <h...@codeweavers.com>
Cc: Ian Rogers <irog...@google.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Kim Phillips <kim.phill...@amd.com>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Remi Bernon <rber...@codeweavers.com>
Cc: Song Liu <songliubrav...@fb.com>
Cc: Tommi Rantala <tommi.t.rant...@nokia.com>
Cc: Ulrich Czekalla <uczeka...@codeweavers.com>
Link: 
http://lore.kernel.org/lkml/1671b43b-09c3-1911-dbf8-7f030242f...@codeweavers.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
Signed-off-by: Sasha Levin <sas...@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 da6036ba0cea4..4d569ad7db02d 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



Reply via email to