| Message ID | 1422340442-4673-3-git-send-email-victor.kamensky@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Namhyung, On 28 January 2015 at 17:38, Namhyung Kim <namhyung@kernel.org> wrote: > Hi Victor, > > On Mon, Jan 26, 2015 at 10:34:02PM -0800, Victor Kamensky wrote: >> Currently code that tries to read corresponding debug symbol >> file from .gnu_debuglink section (DSO_BINARY_TYPE__DEBUGLINK) >> does not take in account symfs option, so filename__read_debuglink >> function cannot open ELF file, if symfs option is used. >> >> Fix is to add proper handling of symfs as it is done in other >> places: use __symbol__join_symfs function to get real file name >> of target ELF file. >> >> Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> >> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> >> Cc: Paul Mackerras <paulus@samba.org> >> Cc: Ingo Molnar <mingo@redhat.com> >> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> >> Cc: Jiri Olsa <jolsa@kernel.org> >> Cc: Adrian Hunter <adrian.hunter@intel.com> >> Cc: Waiman Long <Waiman.Long@hp.com> >> Cc: David Ahern <dsahern@gmail.com> >> Acked-and-tested-by: David Ahern <dsahern@gmail.com> > > Acked-by: Namhyung Kim <namhyung@kernel.org> Thank you for the Acks! Is there any action items on my side? Should I repost patches with your Acks? Or you or Arnaldo will add them once they got merged in proper tree for upstreaming? Thanks, Victor > Thanks, > Namhyung > > >> --- >> tools/perf/util/dso.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c >> index 45be944..ca8d8d5 100644 >> --- a/tools/perf/util/dso.c >> +++ b/tools/perf/util/dso.c >> @@ -45,13 +45,13 @@ int dso__read_binary_type_filename(const struct dso *dso, >> case DSO_BINARY_TYPE__DEBUGLINK: { >> char *debuglink; >> >> - strncpy(filename, dso->long_name, size); >> - debuglink = filename + dso->long_name_len; >> + len = __symbol__join_symfs(filename, size, dso->long_name); >> + debuglink = filename + len; >> while (debuglink != filename && *debuglink != '/') >> debuglink--; >> if (*debuglink == '/') >> debuglink++; >> - ret = filename__read_debuglink(dso->long_name, debuglink, >> + ret = filename__read_debuglink(filename, debuglink, >> size - (debuglink - filename)); >> } >> break; >> -- >> 1.9.3 >> >> -- >> 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/ -- 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/
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 45be944..ca8d8d5 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -45,13 +45,13 @@ int dso__read_binary_type_filename(const struct dso *dso, case DSO_BINARY_TYPE__DEBUGLINK: { char *debuglink; - strncpy(filename, dso->long_name, size); - debuglink = filename + dso->long_name_len; + len = __symbol__join_symfs(filename, size, dso->long_name); + debuglink = filename + len; while (debuglink != filename && *debuglink != '/') debuglink--; if (*debuglink == '/') debuglink++; - ret = filename__read_debuglink(dso->long_name, debuglink, + ret = filename__read_debuglink(filename, debuglink, size - (debuglink - filename)); } break;
Currently code that tries to read corresponding debug symbol file from .gnu_debuglink section (DSO_BINARY_TYPE__DEBUGLINK) does not take in account symfs option, so filename__read_debuglink function cannot open ELF file, if symfs option is used. Fix is to add proper handling of symfs as it is done in other places: use __symbol__join_symfs function to get real file name of target ELF file. Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Waiman Long <Waiman.Long@hp.com> Cc: David Ahern <dsahern@gmail.com> Acked-and-tested-by: David Ahern <dsahern@gmail.com> --- tools/perf/util/dso.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)