Add support to remove '[kernel.kallsyms]' file. Currently the removal fails because buildid read fails (obviously on kallsyms file).
However the file name itself holds the buildid which is used in the .build-id link. Adding check to detect the '[kernel.kallsyms]' removal and using the filename as the buildid. Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Corey Ashford <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Steven Rostedt <[email protected]> Signed-off-by: Jiri Olsa <[email protected]> --- tools/perf/builtin-buildid-cache.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c index 7a3504a1b494..5e076b8d5164 100644 --- a/tools/perf/builtin-buildid-cache.c +++ b/tools/perf/builtin-buildid-cache.c @@ -207,6 +207,25 @@ static int build_id_cache__add_file(const char *filename, const char *debugdir) return err; } +/* + * Takes basename from @filename argument and + * copy that into @buf. + */ +static int scnprintf_base(char *buf, int size, const char *filename) +{ + char *base = strrchr(filename, '/'); + + if (!base++) + return -1; + + return scnprintf(buf, size, base, strlen(base)); +} + +static bool is_kallsyms_file(const char *filename) +{ + return strstr(filename, "kernel.kallsyms"); +} + static int build_id_cache__remove_file(const char *filename, const char *debugdir) { @@ -217,10 +236,21 @@ static int build_id_cache__remove_file(const char *filename, if (filename__read_build_id(filename, &build_id, sizeof(build_id)) < 0) { pr_debug("Couldn't read a build-id in %s\n", filename); - return -1; + + if (!is_kallsyms_file(filename)) + return -1; + + pr_debug("Detected [kernel.kallsyms] file, trying basename as buildid.\n"); + + if (scnprintf_base(sbuild_id, sizeof(sbuild_id), + filename) < 0) { + pr_debug("failed to get build-id\n"); + return -1; + } + } else { + build_id__sprintf(build_id, sizeof(build_id), sbuild_id); } - build_id__sprintf(build_id, sizeof(build_id), sbuild_id); err = build_id_cache__remove_s(sbuild_id, debugdir); if (verbose) pr_info("Removing %s %s: %s\n", sbuild_id, filename, -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
