From nobody Fri Apr 3 01:28:27 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 1506B3C944C; Wed, 25 Mar 2026 12:06:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774440415; cv=none; b=UOeHmBqAm4UIfBjXuyOh0BWjNFs77KeKQsYxAHmVMvnJ7x4rctMHFXbcaoFK2DGsCT3kfICr9NxuN3YQ37wWV3i1lxBPKbWhVK5LBfMOwe/OPqwhBqeFSYzCOrjj80ysKsdPsdwBSUqE2e/wuealq6NEU/Q0lP6LR5VKS9BXaRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774440415; c=relaxed/simple; bh=7G673gvrnCkBucJkZ+AgnwfPwFJ7qRPw8SyuefKJLGA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wnrbs/aD7HI1oAvccPJy8O6IPjbN41dC9gTuK50fx4EDpXQXLB6ln+nSz6tDPri/hMRlAbETajHWUDNmdESdRv711hAaJAd/fR1Z/+vJHdBplv0dkRYciPYn+xP9RrWzvwnPlhWxwDwE9o32TM+b/LTecMukJvK30suBUKW/qIs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=WX8njnnA; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="WX8njnnA" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62P89OH93835046; Wed, 25 Mar 2026 12:06:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=K+uc1bQoTq9Ct0S+q XOJktDCFQw04O5y684XrXzE2ME=; b=WX8njnnA3Vll52czsZ7SmtLNdkRqZfoG3 uyAsP1FdtXcZUHryIvit9hd3kX5O5FT9Y3w6w6QiHRf0GAJ2oF6xwlfU0csqsSyX 2lGUrSSzBPe4o5cIxqts+NxSjNQ2weUtmo/rQO57NWg27/BWBvRDeNKaFq66kByF HNNQcH5tWPp9ERzmXnFTVAzy0TF7JbfBycSwMf5kU0LsI2We/m7PY413EKc0/F5S R5ksequ8scp5agwAkZwOcFlJST23rSXBgrPOzr/Aa2nFd5FqijSS/m7HDg587gks wC5lVZNZOmwhWWKwRukUSzQcKWs2Hg++5AEHY0sfn0vpWdd4sVVjw== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d1ktuyf8f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Mar 2026 12:06:50 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 62PAxdkS008722; Wed, 25 Mar 2026 12:06:49 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4d26nnped0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Mar 2026 12:06:49 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 62PC6j0u30016234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Mar 2026 12:06:45 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 699ED20043; Wed, 25 Mar 2026 12:06:45 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3BDE420040; Wed, 25 Mar 2026 12:06:45 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 25 Mar 2026 12:06:45 +0000 (GMT) From: Thomas Richter To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-perf-users@vger.kernel.org, acme@kernel.org, namhyung@kernel.org, irogers@google.com Cc: agordeev@linux.ibm.com, gor@linux.ibm.com, sumanthk@linux.ibm.com, hca@linux.ibm.com, japo@linux.ibm.com, Thomas Richter Subject: [PATCH 1/3] perf config: Rename symbol_conf::disable_add2line_warn Date: Wed, 25 Mar 2026 13:06:24 +0100 Message-ID: <20260325120627.1841175-2-tmricht@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260325120627.1841175-1-tmricht@linux.ibm.com> References: <20260325120627.1841175-1-tmricht@linux.ibm.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-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: -xj3dfvRl7nC-Z-Nu_6nGrr6kUhWzxMm X-Authority-Analysis: v=2.4 cv=aMr9aL9m c=1 sm=1 tr=0 ts=69c3cfda cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=1XWaLZrsAAAA:8 a=VnNF1IyMAAAA:8 a=tHZ0q4X19njI_Qsa1HsA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI1MDA4NCBTYWx0ZWRfX8Oae9f1jK31W syaUgvzlpMcNKeD6QjC4nX5HgfbG0q4rsl+P8z6hASZZ4pkj+XcVuc5DhdnVNHktyH6hUptCi3s yEm2q2f/MvIj3UkQhQltiU8yjt3AX+R5LgzTkAKdTm8XctT0V1nzK1VE+uyrpPbZMLAd8aNmBRG 3k28uiLghkPH+3RP/GjD7+HT5lW4+tivbfHYyQVrlm2ke5cMkc7c2fYHvl4idbKmnikfEEPWz6j eOb7/zciUrjejbITbR8/HuJTDFUPE6T/NAsQ+ILat5sLvj74ZuB1QNdcbNfu+Vf00phQXcRuCYw ZebdE9ZHrscWPG0/C0XWKWjvTyY7wS3jsYksmItiYYNq2dB7k9ay0wP2qe0Gbf9/yFgnvJJ1cgu BDbNAH6A0Yg4gEmFnrcxYcpgSrqvzTcjwVBu/th4/0x/9TzMVF85a6ce5nuERfdCMZtQL+oQjVz LR6ceDYgupq+xBRbmtA== X-Proofpoint-GUID: DE5LVUslW7D9u3_Pu99ksTl8yAnD_DVs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-25_04,2026-03-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 adultscore=0 impostorscore=0 malwarescore=0 suspectscore=0 phishscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603250084 Content-Type: text/plain; charset="utf-8" Rename member symbol_conf::disable_add2line_warn to symbol_conf::addr2line_disable_warn to make it consistent with other addr2line_xxx constants. No functional change. Fixes: 257046a36750a ("perf srcline: Fallback between addr2line implementat= ions") Cc: Ian Rogers Signed-off-by: Thomas Richter Reviewed-by: Ian Rogers --- tools/perf/builtin-diff.c | 4 ++-- tools/perf/util/addr2line.c | 12 ++++++------ tools/perf/util/block-info.c | 2 +- tools/perf/util/libbfd.c | 2 +- tools/perf/util/symbol_conf.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 59bf1f72d12e..8a93e56f4a7e 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -1353,7 +1353,7 @@ static int cycles_printf(struct hist_entry *he, struc= t hist_entry *pair, /* * Avoid printing the warning "addr2line_init failed for ..." */ - symbol_conf.disable_add2line_warn =3D true; + symbol_conf.addr2line_disable_warn =3D true; =20 bi =3D block_he->block_info; =20 @@ -1987,7 +1987,7 @@ int cmd_diff(int argc, const char **argv) =20 if (compute =3D=3D COMPUTE_STREAM) { symbol_conf.show_branchflag_count =3D true; - symbol_conf.disable_add2line_warn =3D true; + symbol_conf.addr2line_disable_warn =3D true; callchain_param.mode =3D CHAIN_FLAT; callchain_param.key =3D CCKEY_SRCLINE; callchain_param.branch_callstack =3D 1; diff --git a/tools/perf/util/addr2line.c b/tools/perf/util/addr2line.c index 31c0391fffa3..e9f084db0802 100644 --- a/tools/perf/util/addr2line.c +++ b/tools/perf/util/addr2line.c @@ -123,7 +123,7 @@ static enum cmd_a2l_style cmd_addr2line_configure(struc= t child_process *a2l, con lines =3D 3; pr_debug3("Detected binutils addr2line style\n"); } else { - if (!symbol_conf.disable_add2line_warn) { + if (!symbol_conf.addr2line_disable_warn) { char *output =3D NULL; size_t output_len; =20 @@ -310,7 +310,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, } =20 if (a2l =3D=3D NULL) { - if (!symbol_conf.disable_add2line_warn) + if (!symbol_conf.addr2line_disable_warn) pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_n= ame); goto out; } @@ -330,7 +330,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, len =3D snprintf(buf, sizeof(buf), "%016"PRIx64"\n,\n", addr); written =3D len > 0 ? write(a2l->in, buf, len) : -1; if (written !=3D len) { - if (!symbol_conf.disable_add2line_warn) + if (!symbol_conf.addr2line_disable_warn) pr_warning("%s %s: could not send request\n", __func__, dso_name); goto out; } @@ -339,7 +339,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, switch (read_addr2line_record(&io, cmd_a2l_style, dso_name, addr, /*first= =3D*/true, &record_function, &record_filename, &record_line_nr)) { case -1: - if (!symbol_conf.disable_add2line_warn) + if (!symbol_conf.addr2line_disable_warn) pr_warning("%s %s: could not read first record\n", __func__, dso_name); goto out; case 0: @@ -355,7 +355,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, /*addr=3D*/1, /*first=3D*/true, NULL, NULL, NULL)) { case -1: - if (!symbol_conf.disable_add2line_warn) + if (!symbol_conf.addr2line_disable_warn) pr_warning("%s %s: could not read sentinel record\n", __func__, dso_name); break; @@ -363,7 +363,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, /* The sentinel as expected. */ break; default: - if (!symbol_conf.disable_add2line_warn) + if (!symbol_conf.addr2line_disable_warn) pr_warning("%s %s: unexpected record instead of sentinel", __func__, dso_name); break; diff --git a/tools/perf/util/block-info.c b/tools/perf/util/block-info.c index 649392bee7ed..8d3a9a661f26 100644 --- a/tools/perf/util/block-info.c +++ b/tools/perf/util/block-info.c @@ -303,7 +303,7 @@ static int block_range_entry(struct perf_hpp_fmt *fmt, = struct perf_hpp *hpp, char buf[128]; char *start_line, *end_line; =20 - symbol_conf.disable_add2line_warn =3D true; + symbol_conf.addr2line_disable_warn =3D true; =20 start_line =3D map__srcline(he->ms.map, bi->sym->start + bi->start, he->ms.sym); diff --git a/tools/perf/util/libbfd.c b/tools/perf/util/libbfd.c index 63ea3fb53e77..c1c12308cc12 100644 --- a/tools/perf/util/libbfd.c +++ b/tools/perf/util/libbfd.c @@ -233,7 +233,7 @@ int libbfd__addr2line(const char *dso_name, u64 addr, } =20 if (a2l =3D=3D NULL) { - if (!symbol_conf.disable_add2line_warn) + if (!symbol_conf.addr2line_disable_warn) pr_warning("addr2line_init failed for %s\n", dso_name); return 0; } diff --git a/tools/perf/util/symbol_conf.h b/tools/perf/util/symbol_conf.h index 71bb17372a6c..ff229942fbb1 100644 --- a/tools/perf/util/symbol_conf.h +++ b/tools/perf/util/symbol_conf.h @@ -51,7 +51,7 @@ struct symbol_conf { report_block, report_individual_block, inline_name, - disable_add2line_warn, + addr2line_disable_warn, no_buildid_mmap2, guest_code, lazy_load_kernel_maps, --=20 2.53.0 From nobody Fri Apr 3 01:28:27 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 3E3CE3CCFCE; Wed, 25 Mar 2026 12:06:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774440416; cv=none; b=LcR61YMMhdbjDD4qauv/jdZnjRRlyJ54i4Hsqcyg5stRGST066B2wTUyPdihSCFCQakXz3/Oaju1QLc5dQBhsHHjXRY22dq19rCtjPCl8ybk/Z7vTyCUswlZlo8jJYQvR4GfhDKf/Xhl1OvVU+6YJiOcmktxP8gIc229s8OwSsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774440416; c=relaxed/simple; bh=ENe4jRY9XdZW/UJB3vKfleIhctZYdKdLZe4zxRMCRGY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cw/GzXojMjtHimm9rf90exOoumzmkri9nXsBXkI3G12ix6pr2pkotzIZzq0eGYpw+E1DIDOBBfTYM3OXXDnZr2/u2pN83jIviiZVSj9PKWZRKyQnj3pdt8a9LrDBDegCEZMZ6rfx2OiWR1fyi/zke7RMmXeTPLx5H0rfbyavx7U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=HyBjI2zK; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="HyBjI2zK" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62ONHsv43011996; Wed, 25 Mar 2026 12:06:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=UorgpPrCMoiI5Xxam G8J+7lkf0D6rvJdsrLn0LheoeU=; b=HyBjI2zKbrXwPGkHmwNoIblLc+tAnYZfF cdn1DiqxKoWYROYqtR9bRukw4W7g0gR2ntFfOxZUie7DNRyzc1gONNOtYP19l6r8 uFTlGPA5Lb2d+vfboEYX5xUsLshrYKI66uVvRt7D150tga4vuZPDyjTHFIvM7nwf NCy0w1eIEUpEUfbmMI6e8Q2zm2C3fYlVK4/qX6gzZxcYf6xogQzYeTMnPQahDkqn Ikkl3l9DMRW674V0Xw/bKAasdG5hfkI8SQqScYmegLuca7nUqfldpS71/puSpc8y CAR5Fq0BM1ZAmVfUT1NxIQRROJDCi3GIZQSvHmOluNupn/SE5FW+A== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d1kxqg9m7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Mar 2026 12:06:52 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 62PAMtk0005964; Wed, 25 Mar 2026 12:06:51 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4d261ypgxd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Mar 2026 12:06:51 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 62PC6lRu30409184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Mar 2026 12:06:47 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 96CB520043; Wed, 25 Mar 2026 12:06:47 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 595FA20040; Wed, 25 Mar 2026 12:06:47 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 25 Mar 2026 12:06:47 +0000 (GMT) From: Thomas Richter To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-perf-users@vger.kernel.org, acme@kernel.org, namhyung@kernel.org, irogers@google.com Cc: agordeev@linux.ibm.com, gor@linux.ibm.com, sumanthk@linux.ibm.com, hca@linux.ibm.com, japo@linux.ibm.com, Thomas Richter Subject: [PATCH 2/3] perf config: Make symbol_conf::addr2line_disable_warn configurable Date: Wed, 25 Mar 2026 13:06:25 +0100 Message-ID: <20260325120627.1841175-3-tmricht@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260325120627.1841175-1-tmricht@linux.ibm.com> References: <20260325120627.1841175-1-tmricht@linux.ibm.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-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: ZBvCw5AAOOP-xLvwTjB4q5K9FtTUxhKF X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI1MDA4NCBTYWx0ZWRfX00OwpvzVyWuo XicWquzbYT0iBG4yez79TfCi9hY+Zu0ICK73sZmdoJN+pDVfsrnHflTOeJrsCbNmhclBNEPxl1x oS3n/AvFNguZJKYZsl5eMvNsbH7bNL28uMKrurqUc0GShgYFEni0mWzgAiPVFRutNsteukzD3r9 SckOdbC07Q6KqMoWleSF55J2aI/GqmqjUKQqb0QWPZAp514bVX3+UE8rbly+tCnZVJaRR/Yu+dd MzV9ks7eBjkAvUHPK/BwpzYIEhBcEePkNDpd0Pfp8y/DV8V2dsQYcKnvgi73HLnnTITSyWX5kCc 98hO3tv/kW3JQ+S/lk/0w4e2eqDx+NSSoxFCg4sMO2NnGSCu5/Q+HFFmz0emSn0NhoCUoEKwA8A c6DB7cd0PLL+kmlJj24aKP5bR9lB+bskxiElPySoB0Z2ymvZQcc7b5R7hgDptIYEphatOU95xYu dQP6mEXcEHOVoUXCX/w== X-Authority-Analysis: v=2.4 cv=bLEb4f+Z c=1 sm=1 tr=0 ts=69c3cfdd cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=1XWaLZrsAAAA:8 a=UHmJGMnm0ijQcDfTD5IA:9 X-Proofpoint-GUID: n7PT7D3qYQBmBMwiie44QoNJ1OAdm6PX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-25_04,2026-03-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 phishscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603250084 Content-Type: text/plain; charset="utf-8" Make symbol_conf::addr2line_disable_warn configurable by reading the perfconfig file. Use section core and addr2line-disable-warn =3D value. Example: # perf config -l core.addr2line-timeout=3D500 core.addr2line-disable-warn=3D1 # Signed-off-by: Thomas Richter Cc: Ian Rogers Reviewed-by: Ian Rogers --- tools/perf/util/config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 0452fbc6c085..31541e03aab7 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -461,6 +461,9 @@ static int perf_default_core_config(const char *var, co= nst char *value) if (!strcmp(var, "core.addr2line-timeout")) addr2line_timeout_ms =3D strtoul(value, NULL, 10); =20 + if (!strcmp(var, "core.addr2line-disable-warn")) + symbol_conf.addr2line_disable_warn =3D strtoul(value, NULL, 10); + /* Add other config variables here. */ return 0; } --=20 2.53.0 From nobody Fri Apr 3 01:28:27 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 25B2C3D301F; Wed, 25 Mar 2026 12:06:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774440417; cv=none; b=N98houVKPIWYtmd1Kf7afavOKmQuwV+M1hl7PbggDx4kY4sjO/QB+xEtnPz2IeF7ni8OaYxsQEBKQnvA5mDCH2lFqFpGwikN8BacUaMA/OxcI5ojr/4eyNngHFLm7J7APHVuX+LYp3o0QXHiLFc4/0Vrm001v2qZymB7wKe0TIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774440417; c=relaxed/simple; bh=yXqkdyGFZw6XsRBLqLhVEEYJHoIk+d3yDjj/kNFNpCI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NmerTdG/gT61H+2ZiABsOSam2wAzXOvrgTFh1kdXgd/GR0FpAFh6vNt0KX0W3+7L1wdGVSkk5yC4TzfzTOZiaUbttFIE08ouhKQe5ukLtg2RtuEy3D5L/HsmWZZC59cT7W0ZSw1iTFjQlvy4AeOcy7r6nge6AMS1jLZUX9JfNFM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=Zd122p14; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Zd122p14" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62PAGM7l4120967; Wed, 25 Mar 2026 12:06:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=5BX5PVB1oQqHI2XRF /nwSkJALE0pgIZmjNIl/1C9GZA=; b=Zd122p14oulTogMgGTCtz8WmhZ3UMTojf aeEsEaYTaBX/nAhHwHaryIi2ZMoM8E2jv9F+o638GSmGv2GhociY3DtHoN2BTnI6 NldI471C0E33M72ApaAk7oYDJvudIeaIytbKdn42oAo/4FMi3ik49D0VHlpkMSKa 6USNOQiot3z4qMaKELmWMc5skLIzzY39kHGvgjh2cqxTRIpUfwDd6EmPitf8VD3Q SEgsGs302vjvD5wi5QP1XEFSVS6ZxCEh8WH1LIwBPWWZEiDg9PLtM9BOQ5h9LrbH rDZRSeij2B1ghVrtcfwF0KJT3VAiiMN4XHRN90pp4v7y0WW9kqoLA== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d1kwa08u6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Mar 2026 12:06:53 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 62P82oRg004398; Wed, 25 Mar 2026 12:06:52 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4d28c2659a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Mar 2026 12:06:52 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 62PC6nV341287952 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Mar 2026 12:06:49 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E142B20043; Wed, 25 Mar 2026 12:06:48 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B4EA820040; Wed, 25 Mar 2026 12:06:48 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.87.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 25 Mar 2026 12:06:48 +0000 (GMT) From: Thomas Richter To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-perf-users@vger.kernel.org, acme@kernel.org, namhyung@kernel.org, irogers@google.com Cc: agordeev@linux.ibm.com, gor@linux.ibm.com, sumanthk@linux.ibm.com, hca@linux.ibm.com, japo@linux.ibm.com, Thomas Richter Subject: [PATCH 3/3] perf addr2line: Remove global variable addr2line_timeout_ms Date: Wed, 25 Mar 2026 13:06:26 +0100 Message-ID: <20260325120627.1841175-4-tmricht@linux.ibm.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260325120627.1841175-1-tmricht@linux.ibm.com> References: <20260325120627.1841175-1-tmricht@linux.ibm.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-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: qF4w0VcAO4pLWGCk_cXdmEjtzp_JYVWT X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI1MDA4NCBTYWx0ZWRfX9r3jx1Z64FbJ L2bKn6DJs95WwXHcwcEPTvRB0NL87aNcflcAqvoamjo1m7pksWFvFUI4QDWuJWdtXAeNaiNeGf/ bYpGBatI60DKbfSCOZt/AsuetiL+KyEPVUeDTfhCalF1WqHPIwcoX9/vnISmCgM5obrOOepxRk1 h54Ngs4VStAzbxG4DEFkHawzSIodE6feNkbHxMngA2atAFTg6AK5yOOnIUJUNKgdsBjNA6fSpfv 7JLcYKeHphcQvNQMIcgPgr1/9+FEjYLb0aFsHZxTMJe/haR5u2Wwnanoz7+7YSkP6fKRnG7f0Sm 8ElL6mtytsz3X2AongWsUKBUtVhNdezIqwgWUlOksiZ97G8o4gFbqyMuwU7T3cUjqJwzB2BRkL7 mIBSryqE50JpNz82L8XD6UQeBNFrt1iQhv9JFjqSN0dpRokQL5CGfx+dn1FMMU3Rqi12SK2BaRA xNb0hRicdP6i0QBNQMg== X-Proofpoint-GUID: tmavdWqHwesXy0s1ibSM6YdCo86H0Ais X-Authority-Analysis: v=2.4 cv=OsZCCi/t c=1 sm=1 tr=0 ts=69c3cfdd cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=Yq5XynenixoA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=1XWaLZrsAAAA:8 a=VnNF1IyMAAAA:8 a=vccHvMIWUqexOWb6-fgA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-25_04,2026-03-24_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 clxscore=1015 phishscore=0 suspectscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 spamscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603250084 Content-Type: text/plain; charset="utf-8" Remove global variable addr2line_timeout_ms and add is as member to symbol_conf structure. No functional change. Fixes: 257046a36750a ("perf srcline: Fallback between addr2line implementat= ions") Cc: Ian Rogers Signed-off-by: Thomas Richter Reviewed-by: Ian Rogers --- tools/perf/util/addr2line.c | 8 ++++---- tools/perf/util/addr2line.h | 2 -- tools/perf/util/config.c | 3 +-- tools/perf/util/symbol_conf.h | 1 + 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/addr2line.c b/tools/perf/util/addr2line.c index e9f084db0802..1b7f66ece570 100644 --- a/tools/perf/util/addr2line.c +++ b/tools/perf/util/addr2line.c @@ -18,9 +18,6 @@ =20 #define MAX_INLINE_NEST 1024 =20 -/* If addr2line doesn't return data for 5 seconds then timeout. */ -int addr2line_timeout_ms =3D 5 * 1000; - static int filename_split(char *filename, unsigned int *line_nr) { char *sep; @@ -87,6 +84,9 @@ static struct child_process *addr2line_subprocess_init(co= nst char *addr2line_pat return NULL; } =20 + if (!symbol_conf.addr2line_timeout_ms) + symbol_conf.addr2line_timeout_ms =3D 5 * 1000; + return a2l; } =20 @@ -335,7 +335,7 @@ int cmd__addr2line(const char *dso_name, u64 addr, goto out; } io__init(&io, a2l->out, buf, sizeof(buf)); - io.timeout_ms =3D addr2line_timeout_ms; + io.timeout_ms =3D symbol_conf.addr2line_timeout_ms; switch (read_addr2line_record(&io, cmd_a2l_style, dso_name, addr, /*first= =3D*/true, &record_function, &record_filename, &record_line_nr)) { case -1: diff --git a/tools/perf/util/addr2line.h b/tools/perf/util/addr2line.h index d35a47ba8dab..75989a92f16b 100644 --- a/tools/perf/util/addr2line.h +++ b/tools/perf/util/addr2line.h @@ -8,8 +8,6 @@ struct dso; struct inline_node; struct symbol; =20 -extern int addr2line_timeout_ms; - int cmd__addr2line(const char *dso_name, u64 addr, char **file, unsigned int *line_nr, struct dso *dso, diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 31541e03aab7..573b3a3f5999 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -19,7 +19,6 @@ #include "util/hist.h" /* perf_hist_config */ #include "util/stat.h" /* perf_stat__set_big_num */ #include "util/evsel.h" /* evsel__hw_names, evsel__use_bpf_counters */ -#include "util/addr2line.h" /* addr2line_timeout_ms */ #include "srcline.h" #include "build-id.h" #include "debug.h" @@ -459,7 +458,7 @@ static int perf_default_core_config(const char *var, co= nst char *value) proc_map_timeout =3D strtoul(value, NULL, 10); =20 if (!strcmp(var, "core.addr2line-timeout")) - addr2line_timeout_ms =3D strtoul(value, NULL, 10); + symbol_conf.addr2line_timeout_ms =3D strtoul(value, NULL, 10); =20 if (!strcmp(var, "core.addr2line-disable-warn")) symbol_conf.addr2line_disable_warn =3D strtoul(value, NULL, 10); diff --git a/tools/perf/util/symbol_conf.h b/tools/perf/util/symbol_conf.h index ff229942fbb1..c86f4c0ca46b 100644 --- a/tools/perf/util/symbol_conf.h +++ b/tools/perf/util/symbol_conf.h @@ -80,6 +80,7 @@ struct symbol_conf { *bt_stop_list_str; const char *addr2line_path; enum a2l_style addr2line_style[MAX_A2L_STYLE]; + int addr2line_timeout_ms; unsigned long time_quantum; struct strlist *dso_list, *comm_list, --=20 2.53.0