From nobody Thu Feb 12 10:55:20 2026 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2407A136E3F; Thu, 13 Jun 2024 06:35:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718260538; cv=none; b=NRQKkEUCsJFs1NRsHQksQH/MlIGaMPmYI02XAQ23oEgu9/fgM0sbvM0llvW3tGcAN6QbbFdThlO2niu39YQt910W/ltqapATBJohnHOLak8JIyYfFM096cadKpvke/bFSq+ESsge9dwXYGa1Qub9yXfwmqnjvSO44NZHTAkWqyk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718260538; c=relaxed/simple; bh=f1k3+jxT+uAnGHNOgq2B1xIWYSBpoajflHSOApkuKVo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=X2cplPpmN7g31BqyGuhE/6b49S/n16GW2zW0fjNrttbxRAtszvhOSQJL96nGSLqAbd4DFJ/hF+sa9ODd0tUNVu0IPpCzQTlWwESeHShSXcgqg6cu6VVSz0VOhyFxYyu292AafWFxPJh43KCbPJxqXJYjZX2TT5IAZqWCeU3Ml+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4W0CHG6BWbz2CkSN; Thu, 13 Jun 2024 14:31:38 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id 2DB231A0188; Thu, 13 Jun 2024 14:35:27 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemd100011.china.huawei.com (7.221.188.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Thu, 13 Jun 2024 14:35:25 +0800 From: Changbin Du To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Nathan Chancellor CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Nick Desaulniers , Bill Wendling , Justin Stitt , , , , Changbin Du Subject: [PATCH 1/2] perf: support specify vdso path in cmdline Date: Thu, 13 Jun 2024 14:35:09 +0800 Message-ID: <20240613063510.348692-2-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240613063510.348692-1-changbin.du@huawei.com> References: <20240613063510.348692-1-changbin.du@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" The vdso dumped from process memory (in buildid-cache) lacks debugging info. To annotate vdso symbols with source lines we need specify a debugging version. For x86, we can find them from your local build as arch/x86/entry/vdso/vdso{32,64}.so.dbg. Or they may reside in /lib/modules//vdso/vdso{32,64}.so on Ubuntu. But notice that the buildid has to match. $ sudo perf record -a $ sudo perf report --objdump=3Dllvm-objdump \ --vdso arch/x86/entry/vdso/vdso64.so.dbg,arch/x86/entry/vdso/vdso32.so.dbg When doing cross platform analysis, we also need specify the vdso path if we are interested in its symbols. Signed-off-by: Changbin Du --- tools/perf/builtin-annotate.c | 2 + tools/perf/builtin-c2c.c | 2 + tools/perf/builtin-inject.c | 2 + tools/perf/builtin-report.c | 2 + tools/perf/builtin-script.c | 2 + tools/perf/builtin-top.c | 2 + tools/perf/util/symbol.c | 74 +++++++++++++++++++++++++++++++++++ tools/perf/util/symbol_conf.h | 5 +++ 8 files changed, 91 insertions(+) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 50d2fb222d48..ff466882065d 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -742,6 +742,8 @@ int cmd_annotate(int argc, const char **argv) "file", "vmlinux pathname"), OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, "load module symbols - WARNING: use only with -k and LIVE kernel"), + OPT_CALLBACK(0, "vdso", NULL, "vdso1[,vdso2]", "vdso pathnames", + parse_vdso_pathnames), OPT_BOOLEAN('l', "print-line", &annotate_opts.print_lines, "print matching source lines (may be slow)"), OPT_BOOLEAN('P', "full-paths", &annotate_opts.full_path, diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index c157bd31f2e5..4764f9139661 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -3018,6 +3018,8 @@ static int perf_c2c__report(int argc, const char **ar= gv) const struct option options[] =3D { OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name, "file", "vmlinux pathname"), + OPT_CALLBACK(0, "vdso", NULL, "vdso1[,vdso2]", "vdso pathnames", + parse_vdso_pathnames), OPT_STRING('i', "input", &input_name, "file", "the input file to process"), OPT_INCR('N', "node-info", &c2c.node_info, diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index a212678d47be..e774e83d0a0f 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -2247,6 +2247,8 @@ int cmd_inject(int argc, const char **argv) "don't load vmlinux even if found"), OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, "file", "kallsyms pathname"), + OPT_CALLBACK(0, "vdso", NULL, "vdso1[,vdso2]", "vdso pathnames", + parse_vdso_pathnames), OPT_BOOLEAN('f', "force", &data.force, "don't complain, do it"), OPT_CALLBACK_OPTARG(0, "itrace", &inject.itrace_synth_opts, NULL, "opts", "Instruction Tracing options\n" diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 69618fb0110b..a64b48460dce 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -1324,6 +1324,8 @@ int cmd_report(int argc, const char **argv) "don't load vmlinux even if found"), OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, "file", "kallsyms pathname"), + OPT_CALLBACK(0, "vdso", NULL, "vdso1[,vdso2]", "vdso pathnames", + parse_vdso_pathnames), OPT_BOOLEAN('f', "force", &symbol_conf.force, "don't complain, do it"), OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, "load module symbols - WARNING: use only with -k and LIVE kernel"), diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index c16224b1fef3..2e358922a8d1 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -3965,6 +3965,8 @@ int cmd_script(int argc, const char **argv) "file", "vmlinux pathname"), OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, "file", "kallsyms pathname"), + OPT_CALLBACK(0, "vdso", NULL, "vdso1[,vdso2]", "vdso pathnames", + parse_vdso_pathnames), OPT_BOOLEAN('G', "hide-call-graph", &no_callchain, "When printing symbols do not display call chain"), OPT_CALLBACK(0, "symfs", NULL, "directory", diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 1d6aef51c122..a3cce4e76eb9 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1479,6 +1479,8 @@ int cmd_top(int argc, const char **argv) "file", "kallsyms pathname"), OPT_BOOLEAN('K', "hide_kernel_symbols", &top.hide_kernel_symbols, "hide kernel symbols"), + OPT_CALLBACK(0, "vdso", NULL, "vdso1[,vdso2]", "vdso pathnames", + parse_vdso_pathnames), OPT_CALLBACK('m', "mmap-pages", &opts->mmap_pages, "pages", "number of mmap data pages", evlist__parse_mmap_pages), OPT_INTEGER('r', "realtime", &top.realtime_prio, diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 9e5940b5bc59..8d040039a7ce 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -19,6 +19,7 @@ #include "build-id.h" #include "cap.h" #include "dso.h" +#include "vdso.h" #include "util.h" // lsdir() #include "debug.h" #include "event.h" @@ -44,6 +45,7 @@ =20 static int dso__load_kernel_sym(struct dso *dso, struct map *map); static int dso__load_guest_kernel_sym(struct dso *dso, struct map *map); +static int dso__load_vdso_sym(struct dso *dso, struct map *map); static bool symbol__is_idle(const char *name); =20 int vmlinux_path__nr_entries; @@ -1833,6 +1835,12 @@ int dso__load(struct dso *dso, struct map *map) goto out; } =20 + if (dso__is_vdso(dso)) { + ret =3D dso__load_vdso_sym(dso, map); + if (ret > 0) + goto out; + } + dso__set_adjust_symbols(dso, false); =20 if (perfmap) { @@ -2349,6 +2357,72 @@ static int vmlinux_path__init(struct perf_env *env) return -1; } =20 +int parse_vdso_pathnames(const struct option *opt __maybe_unused, + const char *arg, int unset __maybe_unused) +{ + char *tmp, *tok, *str =3D strdup(arg); + unsigned int i =3D 0; + + for (tok =3D strtok_r(str, ",", &tmp); tok && i < ARRAY_SIZE(symbol_conf.= vdso_name); + tok =3D strtok_r(NULL, ",", &tmp)) { + symbol_conf.vdso_name[i++] =3D strdup(tok); + } + + free(str); + return 0; +} + +static int dso__load_vdso(struct dso *dso, struct map *map, + const char *vdso) +{ + int err =3D -1; + struct symsrc ss; + char symfs_vdso[PATH_MAX]; + + if (vdso[0] =3D=3D '/') + snprintf(symfs_vdso, sizeof(symfs_vdso), "%s", vdso); + else + symbol__join_symfs(symfs_vdso, vdso); + + if (symsrc__init(&ss, dso, symfs_vdso, DSO_BINARY_TYPE__SYSTEM_PATH_DSO)) + return -1; + + /* + * dso__load_sym() may copy 'dso' which will result in the copies having + * an incorrect long name unless we set it here first. + */ + dso__set_long_name(dso, vdso, false); + dso__set_binary_type(dso, DSO_BINARY_TYPE__SYSTEM_PATH_DSO); + + err =3D dso__load_sym(dso, map, &ss, &ss, 0); + symsrc__destroy(&ss); + + if (err > 0) { + dso__set_loaded(dso); + pr_debug("Using %s for %s symbols\n", symfs_vdso, dso__short_name(dso)); + } + + return err; +} + +static int dso__load_vdso_sym(struct dso *dso, struct map *map) +{ + int ret; + + if (!dso__is_vdso(dso)) + return -1; + + for (unsigned int i =3D 0; i < ARRAY_SIZE(symbol_conf.vdso_name); i++) { + if (symbol_conf.vdso_name[i] !=3D NULL) { + ret =3D dso__load_vdso(dso, map, symbol_conf.vdso_name[i]); + if (ret > 0) + return ret; + } + } + + return -1; +} + int setup_list(struct strlist **list, const char *list_str, const char *list_name) { diff --git a/tools/perf/util/symbol_conf.h b/tools/perf/util/symbol_conf.h index c114bbceef40..108356e3c981 100644 --- a/tools/perf/util/symbol_conf.h +++ b/tools/perf/util/symbol_conf.h @@ -3,6 +3,7 @@ #define __PERF_SYMBOL_CONF 1 =20 #include +#include =20 struct strlist; struct intlist; @@ -55,6 +56,7 @@ struct symbol_conf { const char *default_guest_vmlinux_name, *default_guest_kallsyms, *default_guest_modules; + const char *vdso_name[2]; const char *guestmount; const char *dso_list_str, *comm_list_str, @@ -85,4 +87,7 @@ struct symbol_conf { =20 extern struct symbol_conf symbol_conf; =20 +int parse_vdso_pathnames(const struct option *opt __maybe_unused, + const char *arg, int unset __maybe_unused); + #endif // __PERF_SYMBOL_CONF --=20 2.34.1 From nobody Thu Feb 12 10:55:20 2026 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 899D7137C22; Thu, 13 Jun 2024 06:35:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718260538; cv=none; b=j5b2PZ18e4NuFT0M/fpPqDttPsbIt4sjfGYvWabLVnjmS8ijyHzLBtTA0c8XGXPVpWs5cn/mI6p9SMjv/rhJgQg/9OWkohOHJEWufTptro1Lh23jRnVYEo9V5cuzY+4FCzMqzB4Q6OqnfK4qgo0plToVHrn+A0oyujJQjU2xuaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718260538; c=relaxed/simple; bh=4+Y8Ka0zxULm0QTjXx+tuV1E6oFe1plf032g3zmI5sI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tdBM1n6NyEem7Cg347LcFbPwbqDZN52baXR+gschJSqTZsYnnLTI9esvnuIZLqp9E6XYo4mx7kmF7NkHUY0q7CUchdkXIFRgAOK3JJpAZDvZ90pb5vP91gofe9vDUCsBWS30ZsB0uTuda9H2N0jJC08xHn76+OCGb+XgiaVF83A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.190 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4W0CHl0hnhz1ytGk; Thu, 13 Jun 2024 14:32:03 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id 9BDFB140133; Thu, 13 Jun 2024 14:35:28 +0800 (CST) Received: from M910t.huawei.com (10.110.54.157) by kwepemd100011.china.huawei.com (7.221.188.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.34; Thu, 13 Jun 2024 14:35:27 +0800 From: Changbin Du To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Nathan Chancellor CC: Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Nick Desaulniers , Bill Wendling , Justin Stitt , , , , Changbin Du Subject: [PATCH 2/2] perf: disasm: prefer symsrc_filename for filename Date: Thu, 13 Jun 2024 14:35:10 +0800 Message-ID: <20240613063510.348692-3-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240613063510.348692-1-changbin.du@huawei.com> References: <20240613063510.348692-1-changbin.du@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" If we already found a debugging version when loading symbols for that dso, then use the same file for disasm instead of looking up in buildid-cache. Signed-off-by: Changbin Du --- tools/perf/util/disasm.c | 5 +++++ tools/perf/util/symbol.c | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 72aec8f61b94..75cfc6fbd11d 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1103,6 +1103,11 @@ static int dso__disassemble_filename(struct dso *dso= , char *filename, size_t fil !dso__is_kcore(dso)) return SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX; =20 + if (dso__symsrc_filename(dso)) { + strlcpy(filename, dso__symsrc_filename(dso), filename_size); + return 0; + } + build_id_filename =3D dso__build_id_filename(dso, NULL, 0, false); if (build_id_filename) { __symbol__join_symfs(filename, filename_size, build_id_filename); diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 8d040039a7ce..a90c647d37e1 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -2025,12 +2025,14 @@ int dso__load_vmlinux(struct dso *dso, struct map *= map, dso__set_binary_type(dso, DSO_BINARY_TYPE__VMLINUX); =20 err =3D dso__load_sym(dso, map, &ss, &ss, 0); - symsrc__destroy(&ss); - if (err > 0) { dso__set_loaded(dso); pr_debug("Using %s for symbols\n", symfs_vmlinux); + + if (symsrc__has_symtab(&ss) && !dso__symsrc_filename(dso)) + dso__set_symsrc_filename(dso, strdup(symfs_vmlinux)); } + symsrc__destroy(&ss); =20 return err; } @@ -2395,12 +2397,14 @@ static int dso__load_vdso(struct dso *dso, struct m= ap *map, dso__set_binary_type(dso, DSO_BINARY_TYPE__SYSTEM_PATH_DSO); =20 err =3D dso__load_sym(dso, map, &ss, &ss, 0); - symsrc__destroy(&ss); - if (err > 0) { dso__set_loaded(dso); pr_debug("Using %s for %s symbols\n", symfs_vdso, dso__short_name(dso)); + + if (symsrc__has_symtab(&ss) && !dso__symsrc_filename(dso)) + dso__set_symsrc_filename(dso, strdup(symfs_vdso)); } + symsrc__destroy(&ss); =20 return err; } --=20 2.34.1