From nobody Tue Dec 16 18:33:13 2025 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (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 1DECA4EB5E; Tue, 2 Jul 2024 04:19:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893947; cv=none; b=JUJ3sPnS6KhQviKMODm+m+YWzKIOYUTEXd0XR2O/O9xcNNsmWY4Bm9xBVuh10YrpizZ7VQMACFIYiyvc3QvWIGj/7kHtMscv8fs0HwsAoZdo+ig6WskzYZcsIUF/K1bOLVi40mULZ5G3aCETlp8b+Z2GTLKjPYIy7pRUqXYgLlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893947; c=relaxed/simple; bh=w9ZjZ6L6HAuWA2cmECtY8a56OvBAar0tLNwjPEqR870=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gdD9ZdXUOhJXW4kh1bIR+6rH/tea1EpH243ci68trlu+PclM/qQ2JlB91SVXhlpMhRxa4sWebHBecSx/g0NB/HIs40yiZfncs7/X1ALOTikwzwiD0D6NdBeFZS2XKKPuFYLBXaQMNnsqRN8OJy6v0JCVElwp02ZhQQ1fFkI6Hgk= 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.187 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.48]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4WCqL82fTqzZh3D; Tue, 2 Jul 2024 12:14:24 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id 27F88180064; Tue, 2 Jul 2024 12:18:56 +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; Tue, 2 Jul 2024 12:18:54 +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 , , , , Hui Wang , Changbin Du Subject: [PATCH v5 1/8] perf: support specify vdso path in cmdline Date: Tue, 2 Jul 2024 12:18:30 +0800 Message-ID: <20240702041837.5306-2-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240702041837.5306-1-changbin.du@huawei.com> References: <20240702041837.5306-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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd100011.china.huawei.com (7.221.188.204) 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 Samples: 17K of event 'cycles:P', 4000 Hz, Event count (approx.): 1760 __vdso_clock_gettime /work/linux-host/arch/x86/entry/vdso/vdso64.so.d Percent=E2=94=82 movq -48(%rbp),%rsi =E2=94=82 testq %rax,%rax =E2=94=82 ; return vread_hvclock(); =E2=94=82 movq %rax,%rdx =E2=94=82 ; if (unlikely(!vdso_cycles_ok(cycles))) =E2=94=82 =E2=86=91 js eb =E2=94=82 =E2=86=91 jmp 74 =E2=94=82 ; ts->tv_sec =3D vdso_ts->sec; 0.02 =E2=94=82147: leaq 2(%rbx),%rax =E2=94=82 shlq $4, %rax =E2=94=82 addq %r10,%rax =E2=94=82 ; while ((seq =3D READ_ONCE(vd->seq)) & = 1) { 9.38 =E2=94=82152: movl (%r10),%ecx When doing cross platform analysis, we also need specify the vdso path if we are interested in its symbols. v2: update documentation. Signed-off-by: Changbin Du --- tools/perf/Documentation/perf-annotate.txt | 3 + tools/perf/Documentation/perf-c2c.txt | 3 + tools/perf/Documentation/perf-inject.txt | 3 + tools/perf/Documentation/perf-report.txt | 3 + tools/perf/Documentation/perf-script.txt | 3 + tools/perf/Documentation/perf-top.txt | 3 + 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/disasm.c | 7 +- tools/perf/util/symbol.c | 82 +++++++++++++++++++++- tools/perf/util/symbol_conf.h | 5 ++ 15 files changed, 119 insertions(+), 5 deletions(-) diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Docume= ntation/perf-annotate.txt index b95524bea021..4b6692f9a793 100644 --- a/tools/perf/Documentation/perf-annotate.txt +++ b/tools/perf/Documentation/perf-annotate.txt @@ -58,6 +58,9 @@ OPTIONS --ignore-vmlinux:: Ignore vmlinux files. =20 +--vdso=3D:: + Specify vdso pathnames. You can specify up to two for multiarch-support. + --itrace:: Options for decoding instruction tracing data. The options are: =20 diff --git a/tools/perf/Documentation/perf-c2c.txt b/tools/perf/Documentati= on/perf-c2c.txt index 856f0dfb8e5a..7c07efca7542 100644 --- a/tools/perf/Documentation/perf-c2c.txt +++ b/tools/perf/Documentation/perf-c2c.txt @@ -71,6 +71,9 @@ REPORT OPTIONS --vmlinux=3D:: vmlinux pathname =20 +--vdso=3D:: + Specify vdso pathnames. You can specify up to two for multiarch-support. + -v:: --verbose:: Be more verbose (show counter open errors, etc). diff --git a/tools/perf/Documentation/perf-inject.txt b/tools/perf/Document= ation/perf-inject.txt index c972032f4ca0..3c88967b4c7f 100644 --- a/tools/perf/Documentation/perf-inject.txt +++ b/tools/perf/Documentation/perf-inject.txt @@ -62,6 +62,9 @@ OPTIONS --kallsyms=3D:: kallsyms pathname =20 +--vdso=3D:: + Specify vdso pathnames. You can specify up to two for multiarch-support. + --itrace:: Decode Instruction Tracing data, replacing it with synthesized events. Options are: diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Document= ation/perf-report.txt index d2b1593ef700..8a3ba5f74cac 100644 --- a/tools/perf/Documentation/perf-report.txt +++ b/tools/perf/Documentation/perf-report.txt @@ -345,6 +345,9 @@ OPTIONS Load module symbols. WARNING: This should only be used with -k and a LIVE kernel. =20 +--vdso=3D:: + Specify vdso pathnames. You can specify up to two for multiarch-support. + -f:: --force:: Don't do ownership validation. diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Document= ation/perf-script.txt index ff086ef05a0c..48f9974ca4c5 100644 --- a/tools/perf/Documentation/perf-script.txt +++ b/tools/perf/Documentation/perf-script.txt @@ -296,6 +296,9 @@ OPTIONS --kallsyms=3D:: kallsyms pathname =20 +--vdso=3D:: + Specify vdso pathnames. You can specify up to two for multiarch-support. + --symfs=3D:: Look for files with symbols relative to this directory. =20 diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentati= on/perf-top.txt index a754875fa5bb..1cf3ee16a0c1 100644 --- a/tools/perf/Documentation/perf-top.txt +++ b/tools/perf/Documentation/perf-top.txt @@ -76,6 +76,9 @@ Default is to monitor all CPUS. --kallsyms=3D:: kallsyms pathname =20 +--vdso=3D:: + Specify vdso pathnames. You can specify up to two for multiarch-support. + -m :: --mmap-pages=3D:: Number of mmap data pages (must be a power of two) or size 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/disasm.c b/tools/perf/util/disasm.c index 72aec8f61b94..8d9d78d3150c 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -16,6 +16,7 @@ #include "debug.h" #include "disasm.h" #include "dso.h" +#include "vdso.h" #include "env.h" #include "evsel.h" #include "map.h" @@ -1126,7 +1127,7 @@ static int dso__disassemble_filename(struct dso *dso,= char *filename, size_t fil if (pos && strlen(pos) < SBUILD_ID_SIZE - 2) dirname(build_id_path); =20 - if (dso__is_kcore(dso)) + if (dso__is_kcore(dso) || dso__is_vdso(dso)) goto fallback; =20 len =3D readlink(build_id_path, linkname, sizeof(linkname) - 1); @@ -1134,7 +1135,7 @@ static int dso__disassemble_filename(struct dso *dso,= char *filename, size_t fil goto fallback; =20 linkname[len] =3D '\0'; - if (strstr(linkname, DSO__NAME_KALLSYMS) || + if (strstr(linkname, DSO__NAME_KALLSYMS) || strstr(linkname, DSO__NAME_VD= SO) || access(filename, R_OK)) { fallback: /* @@ -1142,7 +1143,7 @@ static int dso__disassemble_filename(struct dso *dso,= char *filename, size_t fil * cache, or is just a kallsyms file, well, lets hope that this * DSO is the same as when 'perf record' ran. */ - if (dso__kernel(dso) && dso__long_name(dso)[0] =3D=3D '/') + if ((dso__kernel(dso) || dso__is_vdso(dso)) && dso__long_name(dso)[0] = =3D=3D '/') snprintf(filename, filename_size, "%s", dso__long_name(dso)); else __symbol__join_symfs(filename, filename_size, dso__long_name(dso)); diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 9e5940b5bc59..a90c647d37e1 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) { @@ -2017,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; } @@ -2349,6 +2359,74 @@ 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); + 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); + + 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 Tue Dec 16 18:33:13 2025 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) (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 1E0E5946C; Tue, 2 Jul 2024 04:18:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.255 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893942; cv=none; b=rHLa/Z+3dQhPxY1E8OjvdQoINGX/fPOf/hzJbPL1T4J3qo7QTN8vQnvOYADn1W7MpxKSBT8VoBN0NLNdViMhRVIaa/Fo8N7JX6z+NB+BQfzsLOIEELZdiVsw5TslOdqZrRZ29AhQGQuNGcqhJQLbrz5KzThZnINei4333wMZdbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893942; c=relaxed/simple; bh=aKhd4Q5pWziEBW3RHwgPV+LKXm5ZjHKMtk9LTLuQXEI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LOadtP7jfZlh/EB17Y8rC+VrbQXLGMLTHYgWxNV0+dLidrWtvE46ZTfY6i93yo9vhSvYzfR5Lj/ScI61ANYpQ2q38L74o0sgVGBWJbL/WJ2oX5aaRWPxda3j4dqzFC8PPNNUHqX2C/cONMPN1SEgln4vwFapM303TCqKnqFgb6Q= 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.255 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.174]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4WCqL96T0Yz1T4Yk; Tue, 2 Jul 2024 12:14:25 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id 87B0B14022D; Tue, 2 Jul 2024 12:18:57 +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; Tue, 2 Jul 2024 12:18:55 +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 , , , , Hui Wang , Changbin Du Subject: [PATCH v5 2/8] perf: disasm: refactor function dso__disassemble_filename Date: Tue, 2 Jul 2024 12:18:31 +0800 Message-ID: <20240702041837.5306-3-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240702041837.5306-1-changbin.du@huawei.com> References: <20240702041837.5306-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: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" To make change easy, this change refactors the dso__disassemble_filename() function by extracting two functions read_buildid_linkname() and fallback_filename(). Signed-off-by: Changbin Du --- v2: split refactoring from logical change. --- tools/perf/util/disasm.c | 117 +++++++++++++++++++++++---------------- 1 file changed, 70 insertions(+), 47 deletions(-) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 8d9d78d3150c..c4ab98c0eaa1 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1092,28 +1092,12 @@ int symbol__strerror_disassemble(struct map_symbol = *ms, int errnum, char *buf, s return 0; } =20 -static int dso__disassemble_filename(struct dso *dso, char *filename, size= _t filename_size) +static int read_buildid_linkname(char *filename, char *linkname, size_t li= nkname_size) { - char linkname[PATH_MAX]; - char *build_id_filename; char *build_id_path =3D NULL; char *pos; int len; =20 - if (dso__symtab_type(dso) =3D=3D DSO_BINARY_TYPE__KALLSYMS && - !dso__is_kcore(dso)) - return SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX; - - 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); - free(build_id_filename); - } else { - if (dso__has_build_id(dso)) - return ENOMEM; - goto fallback; - } - build_id_path =3D strdup(filename); if (!build_id_path) return ENOMEM; @@ -1127,41 +1111,80 @@ static int dso__disassemble_filename(struct dso *ds= o, char *filename, size_t fil if (pos && strlen(pos) < SBUILD_ID_SIZE - 2) dirname(build_id_path); =20 - if (dso__is_kcore(dso) || dso__is_vdso(dso)) - goto fallback; - - len =3D readlink(build_id_path, linkname, sizeof(linkname) - 1); - if (len < 0) - goto fallback; + len =3D readlink(build_id_path, linkname, linkname_size); + if (len < 0) { + free(build_id_path); + return -1; + } =20 linkname[len] =3D '\0'; - if (strstr(linkname, DSO__NAME_KALLSYMS) || strstr(linkname, DSO__NAME_VD= SO) || - access(filename, R_OK)) { -fallback: - /* - * If we don't have build-ids or the build-id file isn't in the - * cache, or is just a kallsyms file, well, lets hope that this - * DSO is the same as when 'perf record' ran. - */ - if ((dso__kernel(dso) || dso__is_vdso(dso)) && dso__long_name(dso)[0] = =3D=3D '/') - snprintf(filename, filename_size, "%s", dso__long_name(dso)); - else - __symbol__join_symfs(filename, filename_size, dso__long_name(dso)); - - mutex_lock(dso__lock(dso)); - if (access(filename, R_OK) && errno =3D=3D ENOENT && dso__nsinfo(dso)) { - char *new_name =3D dso__filename_with_chroot(dso, filename); - if (new_name) { - strlcpy(filename, new_name, filename_size); - free(new_name); - } + free(build_id_path); + return 0; +} + +static int fallback_filename(struct dso *dso, char *filename, size_t filen= ame_size) +{ + char filepath[PATH_MAX]; + + /* + * If we don't have build-ids or the build-id file isn't in the + * cache, or is just a kallsyms file, well, lets hope that this + * DSO is the same as when 'perf record' ran. + */ + if ((dso__kernel(dso) || dso__is_vdso(dso)) && dso__long_name(dso)[0] =3D= =3D '/') + snprintf(filepath, sizeof(filepath), "%s", dso__long_name(dso)); + else + __symbol__join_symfs(filepath, sizeof(filepath), dso__long_name(dso)); + + mutex_lock(dso__lock(dso)); + if (access(filepath, R_OK) && errno =3D=3D ENOENT && dso__nsinfo(dso)) { + char *new_name =3D dso__filename_with_chroot(dso, filepath); + if (new_name) { + strlcpy(filepath, new_name, sizeof(filepath)); + free(new_name); } - mutex_unlock(dso__lock(dso)); - } else if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__NOT_FOUND) { - dso__set_binary_type(dso, DSO_BINARY_TYPE__BUILD_ID_CACHE); } + mutex_unlock(dso__lock(dso)); =20 - free(build_id_path); + if (access(filepath, R_OK) && errno =3D=3D ENOENT) + return ENOENT; + + snprintf(filename, filename_size, "%s", filepath); + return 0; +} + +static int dso__disassemble_filename(struct dso *dso, char *filename, size= _t filename_size) +{ + char linkname[PATH_MAX]; + char *build_id_filename; + + if (dso__symtab_type(dso) =3D=3D DSO_BINARY_TYPE__KALLSYMS && + !dso__is_kcore(dso)) + return SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX; + + 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); + free(build_id_filename); + } else { + if (dso__has_build_id(dso)) + return ENOMEM; + return fallback_filename(dso, filename, filename_size); + } + + if (access(filename, R_OK)) + return fallback_filename(dso, filename, filename_size); + + if (dso__is_kcore(dso) || dso__is_vdso(dso)) + return fallback_filename(dso, filename, filename_size); + + if (read_buildid_linkname(filename, linkname, sizeof(linkname) - 1) || + strstr(linkname, DSO__NAME_KALLSYMS) || strstr(linkname, DSO__NAME_VD= SO)) { + return fallback_filename(dso, filename, filename_size); + } + + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__NOT_FOUND) + dso__set_binary_type(dso, DSO_BINARY_TYPE__BUILD_ID_CACHE); return 0; } =20 --=20 2.34.1 From nobody Tue Dec 16 18:33:13 2025 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) (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 C6C5E2030B; Tue, 2 Jul 2024 04:19:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.255 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893942; cv=none; b=UmgvQ1kK2HYOT5Kg/ynWFSZyqt3ZOAELM70lpur/fk9AyXmSfhHe8ZzOuBroLMr6dRXNbj7IKgQiqtxIW85KFo8AMNi/0sQwvfTTwBHjfziOyIPYU4zjY4Ntkrtq4TNrZo0Usu1fQKmTf+QHMEKfvOx1pgctMuu4GvSSCqFSPec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893942; c=relaxed/simple; bh=B1wopyCB6TwD/11E6lk/IigAXVhadQ1tVMMgoE/cy0g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZsU0HZ+QOsG7uAdI+1jOmqiJCXKWJ+WUWPf3tVH9w0lx2g2vvAWZ1o+Um+8IsNhDuENMKHQ90CicDL0SwXjoAUt6Mbe6hqFYrbVBE8NBD0OBqn7O47sLhzH5pvcgNNf7zp/ymeT5lmzqDJXCzU8JYkFcStjZRXgq7fgn1I6I95c= 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.255 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.105]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4WCqLC2R2Dz1T4HB; Tue, 2 Jul 2024 12:14:27 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id F12C114037D; Tue, 2 Jul 2024 12:18:58 +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; Tue, 2 Jul 2024 12:18:57 +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 , , , , Hui Wang , Changbin Du Subject: [PATCH v5 3/8] perf: disasm: use build_id_path if fallback failed Date: Tue, 2 Jul 2024 12:18:32 +0800 Message-ID: <20240702041837.5306-4-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240702041837.5306-1-changbin.du@huawei.com> References: <20240702041837.5306-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: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" If we can not fallback for special dso (vmlinx and vdso), use the build_id_path found previously. Signed-off-by: Changbin Du --- tools/perf/util/disasm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index c4ab98c0eaa1..f4e94ff37e50 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1176,15 +1176,21 @@ static int dso__disassemble_filename(struct dso *ds= o, char *filename, size_t fil return fallback_filename(dso, filename, filename_size); =20 if (dso__is_kcore(dso) || dso__is_vdso(dso)) - return fallback_filename(dso, filename, filename_size); + goto fallback; =20 - if (read_buildid_linkname(filename, linkname, sizeof(linkname) - 1) || - strstr(linkname, DSO__NAME_KALLSYMS) || strstr(linkname, DSO__NAME_VD= SO)) { - return fallback_filename(dso, filename, filename_size); + if (!read_buildid_linkname(filename, linkname, sizeof(linkname) - 1) && + (!strstr(linkname, DSO__NAME_KALLSYMS) && !strstr(linkname, DSO__NAME= _VDSO))) { + /* It's not kallsysms or vdso, use build_id path found above */ + goto out; } =20 - if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__NOT_FOUND) - dso__set_binary_type(dso, DSO_BINARY_TYPE__BUILD_ID_CACHE); +fallback: + if (fallback_filename(dso, filename, filename_size)) { + /* if fallback failed, use build_id path found above */ +out: + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__NOT_FOUND) + dso__set_binary_type(dso, DSO_BINARY_TYPE__BUILD_ID_CACHE); + } return 0; } =20 --=20 2.34.1 From nobody Tue Dec 16 18:33:13 2025 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (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 6B4F97EEE7; Tue, 2 Jul 2024 04:19:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893949; cv=none; b=TF1QjNSpwEv3wY5gOc7ODqNImMIm9swRa6GB7eGKOJFejiSecwmdy7iUjHO/B89ki/711Kxt+A+xLTWnWLOz+yuud353gm8JwS/7fXo0nyv8mdVrxcR7MoSMmMaxCBrhI0P7egpmjzObAuxSDDiHpp/quuqle23SRqWzpijr2fU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893949; c=relaxed/simple; bh=6KnXP5/kVbBhp4xtOY0o8D1oZBIYLXMx71oUKcb6ZK4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DqFiCazQe27z+rw7ed68Vh7nU8gvwozv+fyIhJvkudf6+ncpYysGO6IviDoT81zFMxRxj1Jp7/FJbYPu4zIg9w+iOakhmoY4gP21LGtoCAMvsFWkOL7q9D6kB5BspSJ7w9j4JrGmpnAqztsdS5Ki38wZL2omN41vkfe4FnVyWUM= 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.188 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.194]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WCqPb61qLzdfvf; Tue, 2 Jul 2024 12:17:23 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id 646271403D2; Tue, 2 Jul 2024 12:19:00 +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; Tue, 2 Jul 2024 12:18:58 +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 , , , , Hui Wang , Changbin Du Subject: [PATCH v5 4/8] perf: build-id: name debugging vdso as "debug" Date: Tue, 2 Jul 2024 12:18:33 +0800 Message-ID: <20240702041837.5306-5-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240702041837.5306-1-changbin.du@huawei.com> References: <20240702041837.5306-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: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" As normal objects, we will add debugging vdso elf to build-id cache later. Here we name the debugging one as "debug". Signed-off-by: Changbin Du --- tools/perf/util/build-id.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index 83a1581e8cf1..15530af2bad9 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -259,8 +259,8 @@ static bool build_id_cache__valid_id(char *sbuild_id) static const char *build_id_cache__basename(bool is_kallsyms, bool is_vdso, bool is_debug) { - return is_kallsyms ? "kallsyms" : (is_vdso ? "vdso" : (is_debug ? - "debug" : "elf")); + return is_kallsyms ? "kallsyms" : (is_debug ? "debug" : (is_vdso ? + "vdso" : "elf")); } =20 char *__dso__build_id_filename(const struct dso *dso, char *bf, size_t siz= e, --=20 2.34.1 From nobody Tue Dec 16 18:33:13 2025 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) (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 BAC4312FB29; Tue, 2 Jul 2024 04:19:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893952; cv=none; b=pus/fpg9RXwz2Jxu1eYh24uAxivCyatzQDeRLTf+hoSg3qqOfHc6EWN+vKDf75m7KFSf0Mncq0vDQMkrPlhV/Lh+7rARjHIUCwx8Uj8s/zrKeH5IQqAvxRv8RUYCXjMxHwiPOyiw0BugMC5NBYRkRijQ9R9e/eil8EJvfof1pJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893952; c=relaxed/simple; bh=YovWnQCUn5/Lz+pkf0LK7nOx1JZCjeR8Saq7TlagfeY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TPHCb6r1Xu/lla2mkOsrG9N5n6fvzPSDqMqmVlReKgReHVZXzvP6omIoqjIn0eWYub1WgaLeMuFTp0dU0O52qdSDC1hWS8LWaegK7QqOWSBdr4dmDUQB7/rd8MkPNHhaQWIPEF5oDCAd0LgN0EPpYTT/JHsQvwf8dPJMdvLAE+g= 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.189 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.252]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4WCqM70qbrzQjwK; Tue, 2 Jul 2024 12:15:15 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id D39E418007E; Tue, 2 Jul 2024 12:19:01 +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; Tue, 2 Jul 2024 12:19:00 +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 , , , , Hui Wang , Changbin Du Subject: [PATCH v5 5/8] perf: symbol: generalize vmlinux path searching Date: Tue, 2 Jul 2024 12:18:34 +0800 Message-ID: <20240702041837.5306-6-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240702041837.5306-1-changbin.du@huawei.com> References: <20240702041837.5306-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: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" This generalizes the vmlinux path searching logic. Later we will add another instance for vdso. The search pattern is described by struct dso_filename_pattern, and the formatted paths are hold in struct dso_filename_paths. Signed-off-by: Changbin Du --- tools/perf/util/machine.c | 4 +- tools/perf/util/symbol.c | 112 +++++++++++++++++++++----------------- tools/perf/util/symbol.h | 8 ++- 3 files changed, 70 insertions(+), 54 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 8477edefc299..68315520f15b 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -896,9 +896,9 @@ size_t machine__fprintf_vmlinux_path(struct machine *ma= chine, FILE *fp) printed +=3D fprintf(fp, "[0] %s\n", filename); } =20 - for (i =3D 0; i < vmlinux_path__nr_entries; ++i) { + for (i =3D 0; i < vmlinux_paths.nr_entries; ++i) { printed +=3D fprintf(fp, "[%d] %s\n", i + dso__has_build_id(kdso), - vmlinux_path[i]); + vmlinux_paths.paths[i]); } return printed; } diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index a90c647d37e1..83e5c3807a2c 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -48,8 +48,7 @@ static int dso__load_guest_kernel_sym(struct dso *dso, st= ruct 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; -char **vmlinux_path; +struct dso_filename_paths vmlinux_paths; =20 struct symbol_conf symbol_conf =3D { .nanosecs =3D false, @@ -2043,10 +2042,10 @@ int dso__load_vmlinux_path(struct dso *dso, struct = map *map) char *filename =3D NULL; =20 pr_debug("Looking at the vmlinux_path (%d entries long)\n", - vmlinux_path__nr_entries + 1); + vmlinux_paths.nr_entries + 1); =20 - for (i =3D 0; i < vmlinux_path__nr_entries; ++i) { - err =3D dso__load_vmlinux(dso, map, vmlinux_path[i], false); + for (i =3D 0; i < vmlinux_paths.nr_entries; ++i) { + err =3D dso__load_vmlinux(dso, map, vmlinux_paths.paths[i], false); if (err > 0) goto out; } @@ -2210,7 +2209,7 @@ static int dso__load_kernel_sym(struct dso *dso, stru= ct map *map) return err; } =20 - if (!symbol_conf.ignore_vmlinux && vmlinux_path !=3D NULL) { + if (!symbol_conf.ignore_vmlinux && vmlinux_paths.paths !=3D NULL) { err =3D dso__load_vmlinux_path(dso, map); if (err > 0) return err; @@ -2285,57 +2284,55 @@ static int dso__load_guest_kernel_sym(struct dso *d= so, struct map *map) return err; } =20 -static void vmlinux_path__exit(void) -{ - while (--vmlinux_path__nr_entries >=3D 0) - zfree(&vmlinux_path[vmlinux_path__nr_entries]); - vmlinux_path__nr_entries =3D 0; - - zfree(&vmlinux_path); -} - -static const char * const vmlinux_paths[] =3D { - "vmlinux", - "/boot/vmlinux" +struct dso_filename_pattern { + const char *pattern; + /* + * 0 for matching directly, + * 1 for matching by kernel_version, + * 2 for matching by kernel_version + arch. + */ + int match_type; }; =20 -static const char * const vmlinux_paths_upd[] =3D { - "/boot/vmlinux-%s", - "/usr/lib/debug/boot/vmlinux-%s", - "/lib/modules/%s/build/vmlinux", - "/usr/lib/debug/lib/modules/%s/vmlinux", - "/usr/lib/debug/boot/vmlinux-%s.debug" +struct dso_filename_pattern vmlinux_patterns[] =3D { + {"vmlinux", 0}, + {"/boot/vmlinux", 0}, + {"/boot/vmlinux-%s", 1}, + {"/usr/lib/debug/boot/vmlinux-%s", 1}, + {"/lib/modules/%s/build/vmlinux", 1}, + {"/usr/lib/debug/lib/modules/%s/vmlinux", 1}, + {"/usr/lib/debug/boot/vmlinux-%s.debug", 1}, }; =20 -static int vmlinux_path__add(const char *new_entry) +static int dso_filename_path__add(struct dso_filename_paths *paths, const = char *new_entry) { - vmlinux_path[vmlinux_path__nr_entries] =3D strdup(new_entry); - if (vmlinux_path[vmlinux_path__nr_entries] =3D=3D NULL) + paths->paths[paths->nr_entries] =3D strdup(new_entry); + if (paths->paths[paths->nr_entries] =3D=3D NULL) return -1; - ++vmlinux_path__nr_entries; + ++paths->nr_entries; =20 return 0; } =20 -static int vmlinux_path__init(struct perf_env *env) +static void dso_filename_path__exit(struct dso_filename_paths *paths) { - struct utsname uts; - char bf[PATH_MAX]; - char *kernel_version; - unsigned int i; + while (--paths->nr_entries >=3D 0) + zfree(&paths->paths[paths->nr_entries]); + paths->nr_entries =3D 0; =20 - vmlinux_path =3D malloc(sizeof(char *) * (ARRAY_SIZE(vmlinux_paths) + - ARRAY_SIZE(vmlinux_paths_upd))); - if (vmlinux_path =3D=3D NULL) - return -1; - - for (i =3D 0; i < ARRAY_SIZE(vmlinux_paths); i++) - if (vmlinux_path__add(vmlinux_paths[i]) < 0) - goto out_fail; + zfree(&paths->paths); +} =20 - /* only try kernel version if no symfs was given */ - if (symbol_conf.symfs[0] !=3D 0) - return 0; +static int dso_filename_path__init(struct dso_filename_paths *paths, + struct dso_filename_pattern *patterns, + int nr_patterns, + struct perf_env *env) +{ + struct utsname uts; + char bf[PATH_MAX]; + const char *kernel_version; + const char *arch =3D perf_env__arch(env); + int i; =20 if (env) { kernel_version =3D env->os_release; @@ -2346,16 +2343,28 @@ static int vmlinux_path__init(struct perf_env *env) kernel_version =3D uts.release; } =20 - for (i =3D 0; i < ARRAY_SIZE(vmlinux_paths_upd); i++) { - snprintf(bf, sizeof(bf), vmlinux_paths_upd[i], kernel_version); - if (vmlinux_path__add(bf) < 0) + paths->paths =3D malloc(sizeof(char *) * nr_patterns); + if (paths->paths =3D=3D NULL) + return -1; + + for (i =3D 0; i < nr_patterns; i++) { + if (patterns[i].match_type =3D=3D 0) + strlcpy(bf, patterns[i].pattern, sizeof(bf)); + else if (symbol_conf.symfs[0] =3D=3D 0) { + /* only try kernel version if no symfs was given */ + if (patterns[i].match_type =3D=3D 1) + snprintf(bf, sizeof(bf), patterns[i].pattern, kernel_version); + else if (patterns[i].match_type =3D=3D 2) + snprintf(bf, sizeof(bf), patterns[i].pattern, kernel_version, arch); + } + if (dso_filename_path__add(paths, bf) < 0) goto out_fail; } =20 return 0; =20 out_fail: - vmlinux_path__exit(); + dso_filename_path__exit(paths); return -1; } =20 @@ -2551,8 +2560,11 @@ int symbol__init(struct perf_env *env) =20 symbol__elf_init(); =20 - if (symbol_conf.try_vmlinux_path && vmlinux_path__init(env) < 0) + if (symbol_conf.try_vmlinux_path && + dso_filename_path__init(&vmlinux_paths, vmlinux_patterns, + ARRAY_SIZE(vmlinux_patterns), env) < 0) { return -1; + } =20 if (symbol_conf.field_sep && *symbol_conf.field_sep =3D=3D '.') { pr_err("'.' is the only non valid --field-separator argument\n"); @@ -2629,7 +2641,7 @@ void symbol__exit(void) intlist__delete(symbol_conf.tid_list); intlist__delete(symbol_conf.pid_list); intlist__delete(symbol_conf.addr_list); - vmlinux_path__exit(); + dso_filename_path__exit(&vmlinux_paths); symbol_conf.sym_list =3D symbol_conf.dso_list =3D symbol_conf.comm_list = =3D NULL; symbol_conf.bt_stop_list =3D NULL; symbol_conf.initialized =3D false; diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index 3fb5d146d9b1..30056884945b 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -101,8 +101,12 @@ static inline int __symbol__join_symfs(char *bf, size_= t size, const char *path) =20 #define symbol__join_symfs(bf, path) __symbol__join_symfs(bf, sizeof(bf), = path) =20 -extern int vmlinux_path__nr_entries; -extern char **vmlinux_path; +struct dso_filename_paths { + int nr_entries; + char **paths; +}; + +extern struct dso_filename_paths vmlinux_paths; =20 static inline void *symbol__priv(struct symbol *sym) { --=20 2.34.1 From nobody Tue Dec 16 18:33:13 2025 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (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 271EA5A110; Tue, 2 Jul 2024 04:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893947; cv=none; b=t8y3Wl07+8F8BpeId6ZaoI8qe3Po8dRsSB95C8Nel1DmmWdBPb/7XcIakQwS/keZ+paK6fxbdPLQptgfUq33xI9AsK/fs+c8FOwNrF6bGJXh9Wo3vKUwogMVUR7TgekC/cB/LuqHpsnsr2JhxvBc221X4fNiTmOKuOhS0fH9VR0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893947; c=relaxed/simple; bh=rvCkn96ZnyyifOzsm+3uC4OPYarXGdZ24pjiAWVAlzA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nVLjbP9qpzkOQ1bIV9dau1aeVK7e/ssso2lwzo/sAQBoZ9hsv6j4DMmWwl5Jz42AByyJDrm7CJvDJss6bffhKTeT3lw37TAJP+9bWpHYIOVeehV4T1Sd8osbCJQHZ/6kfHOGkHwmMy5mMrj7KLanFpbnrb50cIAACY7btPGdbz0= 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.187 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.48]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4WCqLP1MqKzxTX9; Tue, 2 Jul 2024 12:14:37 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id 477FA180064; Tue, 2 Jul 2024 12:19:03 +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; Tue, 2 Jul 2024 12:19:01 +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 , , , , Hui Wang , Changbin Du Subject: [PATCH v5 6/8] perf: build-id: try to search debugging vdso and add to cache Date: Tue, 2 Jul 2024 12:18:35 +0800 Message-ID: <20240702041837.5306-7-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240702041837.5306-1-changbin.du@huawei.com> References: <20240702041837.5306-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: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" Just like vmlinux, try to search vdso in predefined paths when collecting build-ids. The searched paths usually have debugging info. For example, the vdso can be found in /lib/modules//build/arch/x86/entry/vdso/vdso*.so.dbg for local build on x86. Cc: Adrian Hunter Signed-off-by: Changbin Du --- v2: - Searching the vdso in record stage instead of report. So the debugging vdso will be in build-id cache. This is friendly for cross-machine analysis. --- tools/perf/util/build-id.c | 53 +++++++++++++++++++++++++++++++++----- tools/perf/util/symbol.c | 17 ++++++++++++ tools/perf/util/symbol.h | 1 + 3 files changed, 64 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index 15530af2bad9..f40de2d9843a 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -593,9 +593,8 @@ static int build_id_cache__add_sdt_cache(const char *sb= uild_id, #define build_id_cache__add_sdt_cache(sbuild_id, realname, nsi) (0) #endif =20 -static char *build_id_cache__find_debug(const char *sbuild_id, - struct nsinfo *nsi, - const char *root_dir) +static char *build_id_cache__find_debug_normal(const char *sbuild_id, + struct nsinfo *nsi, const char *root_dir) { const char *dirname =3D "/usr/lib/debug/.build-id/"; char *realname =3D NULL; @@ -646,6 +645,47 @@ static char *build_id_cache__find_debug(const char *sb= uild_id, return realname; } =20 +static char *build_id_cache__find_debug_vdso(const char *sbuild_id) +{ + char sbuild_id_tmp[SBUILD_ID_SIZE]; + struct build_id bid; + int i, ret =3D 0; + + if (!vdso_paths.paths) + return NULL; + + pr_debug("Looking at the vdso_path (%d entries long)\n", + vdso_paths.nr_entries + 1); + + for (i =3D 0; i < vdso_paths.nr_entries; ++i) { + ret =3D filename__read_build_id(vdso_paths.paths[i], &bid); + if (ret < 0) + continue; + + build_id__sprintf(&bid, sbuild_id_tmp); + if (!strcmp(sbuild_id, sbuild_id_tmp)) { + pr_debug("Found debugging vdso %s\n", vdso_paths.paths[i]); + return strdup(vdso_paths.paths[i]); + } + } + + return NULL; +} + +static char *build_id_cache__find_debug(const char *sbuild_id, + struct nsinfo *nsi, + bool is_vdso, + const char *root_dir) +{ + char *name =3D NULL; + + if (is_vdso) + name =3D build_id_cache__find_debug_vdso(sbuild_id); + else + name =3D build_id_cache__find_debug_normal(sbuild_id, nsi, root_dir); + return name; +} + int build_id_cache__add(const char *sbuild_id, const char *name, const char *r= ealname, struct nsinfo *nsi, bool is_kallsyms, bool is_vdso, @@ -701,13 +741,12 @@ build_id_cache__add(const char *sbuild_id, const char= *name, const char *realnam * file itself may not be very useful to users of our tools without a * symtab. */ - if (!is_kallsyms && !is_vdso && - strncmp(".ko", name + strlen(name) - 3, 3)) { - debugfile =3D build_id_cache__find_debug(sbuild_id, nsi, root_dir); + if (!is_kallsyms && strncmp(".ko", name + strlen(name) - 3, 3)) { + debugfile =3D build_id_cache__find_debug(sbuild_id, nsi, is_vdso, root_d= ir); if (debugfile) { zfree(&filename); if (asprintf(&filename, "%s/%s", dir_name, - build_id_cache__basename(false, false, true)) < 0) { + build_id_cache__basename(false, is_vdso, true)) < 0) { filename =3D NULL; goto out_free; } diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 83e5c3807a2c..6ad3a057f727 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -49,6 +49,7 @@ static int dso__load_vdso_sym(struct dso *dso, struct map= *map); static bool symbol__is_idle(const char *name); =20 struct dso_filename_paths vmlinux_paths; +struct dso_filename_paths vdso_paths; =20 struct symbol_conf symbol_conf =3D { .nanosecs =3D false, @@ -2304,6 +2305,16 @@ struct dso_filename_pattern vmlinux_patterns[] =3D { {"/usr/lib/debug/boot/vmlinux-%s.debug", 1}, }; =20 +struct dso_filename_pattern vdso_patterns[] =3D { + {"/lib/modules/%s/vdso/vdso.so", 1}, + {"/lib/modules/%s/vdso/vdso64.so", 1}, + {"/lib/modules/%s/vdso/vdso32.so", 1}, + {"/lib/modules/%s/build/arch/%s/vdso/vdso.so.dbg", 2}, + {"/lib/modules/%s/build/arch/%s/kernel/vdso/vdso.so.dbg", 2}, + {"/lib/modules/%s/build/arch/%s/entry/vdso/vdso32.so.dbg", 2}, + {"/lib/modules/%s/build/arch/%s/entry/vdso/vdso64.so.dbg", 2}, +}; + static int dso_filename_path__add(struct dso_filename_paths *paths, const = char *new_entry) { paths->paths[paths->nr_entries] =3D strdup(new_entry); @@ -2566,6 +2577,11 @@ int symbol__init(struct perf_env *env) return -1; } =20 + if (dso_filename_path__init(&vdso_paths, vdso_patterns, + ARRAY_SIZE(vdso_patterns), env) < 0) { + return -1; + } + if (symbol_conf.field_sep && *symbol_conf.field_sep =3D=3D '.') { pr_err("'.' is the only non valid --field-separator argument\n"); return -1; @@ -2642,6 +2658,7 @@ void symbol__exit(void) intlist__delete(symbol_conf.pid_list); intlist__delete(symbol_conf.addr_list); dso_filename_path__exit(&vmlinux_paths); + dso_filename_path__exit(&vdso_paths); symbol_conf.sym_list =3D symbol_conf.dso_list =3D symbol_conf.comm_list = =3D NULL; symbol_conf.bt_stop_list =3D NULL; symbol_conf.initialized =3D false; diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index 30056884945b..08c339594d4e 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -107,6 +107,7 @@ struct dso_filename_paths { }; =20 extern struct dso_filename_paths vmlinux_paths; +extern struct dso_filename_paths vdso_paths; =20 static inline void *symbol__priv(struct symbol *sym) { --=20 2.34.1 From nobody Tue Dec 16 18:33:13 2025 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (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 B23846F06A; Tue, 2 Jul 2024 04:19:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893948; cv=none; b=o8jxQJiUSgHNDY//ix5ZjOmDiu5Npq1PQuMpq4hH3nNzpxoyqrXzSYZ7NamZ7u9TAmFi1bW/f7HF2QrZHny8nJU33tbQ39zYWNcphR/ZLn2CZUqdX31r6JGysldoJNHmi7hKdK3fQYp6oQ36kWXjleV9oa5Fa7q5lBgQhOT+Pvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893948; c=relaxed/simple; bh=ai9h6Dew9+W3mt2HzltrnE6jkw5lNXSWmYIC+kOQRyg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FBNiLhjkK+KuoLr4PRymJsG6j0FSjRa5zYRYDf0+M4uP6CceMU/d+/FFY9Lu9sM0pTmsV4hJFCv7x6q8UCVAL15SQ94Aeemuq07nXbI7J+MAnFnPPwR7QgAmea9ZQnuea6Td9PzwrLKNY9VPnHx814BeRxqScMFfTESVOn3DdPI= 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.188 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.105]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WCqRF5bd5znVgP; Tue, 2 Jul 2024 12:18:49 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id AFE7614037D; Tue, 2 Jul 2024 12:19:04 +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; Tue, 2 Jul 2024 12:19:03 +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 , , , , Hui Wang , Changbin Du Subject: [PATCH v5 7/8] perf: disasm: prefer debugging files in build-id cache Date: Tue, 2 Jul 2024 12:18:36 +0800 Message-ID: <20240702041837.5306-8-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240702041837.5306-1-changbin.du@huawei.com> References: <20240702041837.5306-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: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" The build-id cache might have both debugging and non-debugging files. Here we prefer the debugging version for annotation. Cc: Adrian Hunter Signed-off-by: Changbin Du --- tools/perf/util/disasm.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index f4e94ff37e50..ecfd6a03713d 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1162,18 +1162,25 @@ static int dso__disassemble_filename(struct dso *ds= o, char *filename, size_t fil !dso__is_kcore(dso)) return SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX; =20 - 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); - free(build_id_filename); - } else { - if (dso__has_build_id(dso)) - return ENOMEM; - return fallback_filename(dso, filename, filename_size); - } + /* Prefer debugging file if exists, otherwise non-debugging one is used. = */ + for (int i =3D 0; i < 2; i++) { + build_id_filename =3D dso__build_id_filename(dso, NULL, 0, !i); + if (build_id_filename) { + __symbol__join_symfs(filename, filename_size, build_id_filename); + free(build_id_filename); + } else { + if (dso__has_build_id(dso)) + return ENOMEM; + return fallback_filename(dso, filename, filename_size); + } =20 - if (access(filename, R_OK)) - return fallback_filename(dso, filename, filename_size); + if (!access(filename, R_OK)) + break; + else if (i !=3D 0) { + /* nor debugging or non-debugging is found */ + return fallback_filename(dso, filename, filename_size); + } + } =20 if (dso__is_kcore(dso) || dso__is_vdso(dso)) goto fallback; --=20 2.34.1 From nobody Tue Dec 16 18:33:13 2025 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (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 19A9F84DE9; Tue, 2 Jul 2024 04:19:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893949; cv=none; b=THS49XmRmFe/wwqWYhtgfd+1eH7O5sQzKuJvR9VNuEtyOl3qY6fNiu0+KM1Inv01Dw7FigtwXl6fiep53ShwBM13DhjI+jHDxZ8C9B00IXMAfuWYqTeyGcMglWlrNiegajg7uliaIfBqqf7WUPXmBgFSYyxLCDp3jHjuFksMlRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719893949; c=relaxed/simple; bh=BnKwtgbDOBy6xNe23GdjLGT6tsNsyI/9xyn0n4di9lQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qgg3j7BW5Is8ljOMs9c2W1m6jsy5sn97NkY/jL1ublAoteiVtoDCNeVEPw7Om1cpuWpWz5nsVLd3JCE2WhCbwW/1jorxydyF3TzNBMGAOaQUcnAd20Yp7miSOGXchI+xhfAV8YDsKUF/WYusY9I8VqOKtnmGkqadWJxlCXcilG8= 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.188 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.252]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4WCqRH1YMkznYnM; Tue, 2 Jul 2024 12:18:51 +0800 (CST) Received: from kwepemd100011.china.huawei.com (unknown [7.221.188.204]) by mail.maildlp.com (Postfix) with ESMTPS id 266FC18007E; Tue, 2 Jul 2024 12:19:06 +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; Tue, 2 Jul 2024 12:19:04 +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 , , , , Hui Wang , Changbin Du Subject: [PATCH v5 8/8] perf buildid-cache: recognize vdso when adding files Date: Tue, 2 Jul 2024 12:18:37 +0800 Message-ID: <20240702041837.5306-9-changbin.du@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240702041837.5306-1-changbin.du@huawei.com> References: <20240702041837.5306-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: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemd100011.china.huawei.com (7.221.188.204) Content-Type: text/plain; charset="utf-8" Identify vdso by file name matching. The vdso objects have name as vdso[32,64].so[.dbg]. $ perf buildid-cache -a /work/linux/arch/x86/entry/vdso/vdso64.so.dbg Without this change, adding vdso using above command actually will never be used. Signed-off-by: Changbin Du --- tools/perf/builtin-buildid-cache.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildi= d-cache.c index b0511d16aeb6..8edea9044a65 100644 --- a/tools/perf/builtin-buildid-cache.c +++ b/tools/perf/builtin-buildid-cache.c @@ -172,6 +172,30 @@ static int build_id_cache__add_kcore(const char *filen= ame, bool force) return 0; } =20 +static bool filename_is_vdso(const char *filename) +{ + char *fname, *bname; + static const char * const vdso_names[] =3D { + "vdso.so", "vdso32.so", "vdso64.so", "vdsox32.so" + }; + + fname =3D strdup(filename); + if (!fname) { + pr_err("no mememory\n"); + return false; + } + + bname =3D basename(fname); + if (!bname) + return false; + + for (unsigned int i =3D 0; i < ARRAY_SIZE(vdso_names); i++) { + if (!strncmp(bname, vdso_names[i], strlen(vdso_names[i]))) + return true; + } + return false; +} + static int build_id_cache__add_file(const char *filename, struct nsinfo *n= si) { char sbuild_id[SBUILD_ID_SIZE]; @@ -189,7 +213,7 @@ static int build_id_cache__add_file(const char *filenam= e, struct nsinfo *nsi) =20 build_id__sprintf(&bid, sbuild_id); err =3D build_id_cache__add_s(sbuild_id, filename, nsi, - false, false); + false, filename_is_vdso(filename)); pr_debug("Adding %s %s: %s\n", sbuild_id, filename, err ? "FAIL" : "Ok"); return err; --=20 2.34.1