From nobody Sun Feb 8 07:44:10 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 337AF748D for ; Tue, 24 Sep 2024 00:37:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727138251; cv=none; b=OeurB9kO8UCI3hR7tyTSH9PtuoQPIvn7ibesi3uzH361a3I7jSNujP0gW9hDP9lqIVDXb6Z+P0ZJobRoioERh0pNOkWpfKDRZgGkVdE2966J09rF7ZRcf9C9WZjfpZEA1ZGi01IoPQQwwKQWcPcU1I/bi7tbKo100Uq3hDjpiCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727138251; c=relaxed/simple; bh=4azRAuwmB0rPiG2Eq8WyPuVU2nFDci92qBLH5jRtUi0=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=uISpJi9lAIq71JYFnsrEBY6eYUBqDDKLC2ne55n3dJ4mSG1Z3r1lCG66Lkt9pMEotJ5gOGiMJwJaD9b7HyP9/s2lsLNh/DttB6WBhIapnBeP/TTUOpGK2Oh0MxPXpPW9frwGZcdY5SWr9T4UPKlnbKdAW+atXh0B8RBeTFWLgcU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Zih4yzE+; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Zih4yzE+" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6e20937a68bso9059997b3.3 for ; Mon, 23 Sep 2024 17:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1727138249; x=1727743049; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=tysacR2PzZ+y/dOuNBaM8ZYnLrC6mEbjzCE4C8dIypk=; b=Zih4yzE+0ySPuQ8eJqYL0eXbpAIx8msxbgqr7FDcV0FGSO03XLI0zdvU63wC0YGQOS 1n0+9Ks1j85vdVVXw7JXqnIiUwU8+NGj80B4azKYaEH5ThWj92z/cxgnZOtUkgcK8QWG fwTc1B1PAFK6+oG7i+YRtztaHnaZXbfg9k0DWIsl6HyYvtOa7f6sXyffc4hSCGo2COPC UrDfo17DZVcth0rAsgscRUrBFhDd6agYFuTLzWYQDKEIFryb3EnwWV/Zb89S2uaCrRXo yR24wihU7HdCx9rPUen8AYrIq6eUCQXbAMYJXnWibXTE1XO1p+wgvAXjKG+J0IgK72sT y/CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727138249; x=1727743049; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tysacR2PzZ+y/dOuNBaM8ZYnLrC6mEbjzCE4C8dIypk=; b=AC1UNnnEOPcxcRCsWmYUGz5vr3/twjO9tatYpp6WV+tyWJ7/ZstzBP5geES5cUFYzB pSyZK+KexBclN8vpBWxaFJVln/CrjoFLMbqxTv7ugDmorFa/gTTJWxuc7ytysSWPOwEJ 20jrhNizUxoTgiCILAaUp/7gR9tksq4P08lMmw3Zg5f7FC0ugherz+4z0FLvmuKGNXkr 2XK6rh2gcjMg7gHiW6NP5KefrmiB55iJQgofLWuk/eRm2gOHuVmyx3f1j6wQJJck6YVH G3PeuF0rRBXXPZblfkvbal0jUA6hDW1ftZwsD7j+UrlZXwS++EiBEf9Uz3qed3sAJ49B WguA== X-Forwarded-Encrypted: i=1; AJvYcCWbzZsM16gS2O9NahjV1QWLeKIKqdmtEmk1ExCa79BMYM5vVzRu6MYYukVDzf0LbmArcKFZzA+sGZQZTy0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz07nYebHqK3oQeueAzK+wdyiatatGB6fg7cttNTOcEgjZLf4Bs vkVY0J3YVxZw9u+4mMsq0Il0na9zHwHlLlDiriA8Sh7tfn4H9cTQs06FpUjQy71gPgljTb28jie 4tfC6Lg== X-Google-Smtp-Source: AGHT+IE3TSKvX/vlq7xOs1KZRaFw7wQq9Ko2snhuTZLWa8LaLPIThJ5oQQFe9KsKufF98qDvPQ3tLeCFfrUl X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:61a6:b27c:a1cd:e6a0]) (user=irogers job=sendgmr) by 2002:a25:8045:0:b0:e20:2b5b:c6e6 with SMTP id 3f1490d57ef6-e2250cc2238mr27165276.9.1727138248505; Mon, 23 Sep 2024 17:37:28 -0700 (PDT) Date: Mon, 23 Sep 2024 17:37:18 -0700 In-Reply-To: <20240924003720.617258-1-irogers@google.com> Message-Id: <20240924003720.617258-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240924003720.617258-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Subject: [PATCH v1 1/3] perf disasm: Fix capstone memory leak From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Kajol Jain , Athira Rajeev , "Steinar H. Gunderson" , Masami Hiramatsu , "David S. Miller" , Przemek Kitszel , Alexander Lobakin , Hemant Kumar , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Jihong , leo.yan@arm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The insn argument passed to cs_disasm needs freeing. To support accurately having count, add an additional free_count variable. Fixes: c5d60de1813a ("perf annotate: Add support to use libcapstone in powe= rpc") Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/util/disasm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index f05ba7739c1e..2c8063660f2e 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1627,12 +1627,12 @@ static int symbol__disassemble_capstone(char *filen= ame, struct symbol *sym, u64 start =3D map__rip_2objdump(map, sym->start); u64 len; u64 offset; - int i, count; + int i, count, free_count; bool is_64bit =3D false; bool needs_cs_close =3D false; u8 *buf =3D NULL; csh handle; - cs_insn *insn; + cs_insn *insn =3D NULL; char disasm_buf[512]; struct disasm_line *dl; =20 @@ -1664,7 +1664,7 @@ static int symbol__disassemble_capstone(char *filenam= e, struct symbol *sym, =20 needs_cs_close =3D true; =20 - count =3D cs_disasm(handle, buf, len, start, len, &insn); + free_count =3D count =3D cs_disasm(handle, buf, len, start, len, &insn); for (i =3D 0, offset =3D 0; i < count; i++) { int printed; =20 @@ -1702,8 +1702,11 @@ static int symbol__disassemble_capstone(char *filena= me, struct symbol *sym, } =20 out: - if (needs_cs_close) + if (needs_cs_close) { cs_close(&handle); + if (free_count > 0) + cs_free(insn, free_count); + } free(buf); return count < 0 ? count : 0; =20 --=20 2.46.0.792.g87dc391469-goog From nobody Sun Feb 8 07:44:10 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F550BA4A for ; Tue, 24 Sep 2024 00:37:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727138253; cv=none; b=Os5SAbeutyVta/s2uvbE4f7jY5ayViXIXDfwYGZ/Cdm/Uuy3G/7PtgoPjycAZ7A4WPjIS6397KgiSxS+dC4fQTPESNS3Vp0trINp9dISRMRgCL44MzZ7NlGKNFolQNXiNIHS0cvhIPWYLmS5ifBRQ+NHtanG0K1c+iZurdYyYHU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727138253; c=relaxed/simple; bh=Qo1Qps6/oRTPke3sLUp94xRSSuy8lIc7nno8/awTXfI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=BC0j9/Q5kuCzjcPsO+lDznuBdRunKSoVn4XPllngHjGg3vmvd7cST+QBAb42aRQE2cd8qEU6jdTdIXF8Pj9r/E808DwCCKVJybXzmI0liCu+0FJ1jN1Jb/rj2kKvP1qcXtd9WEhLvpVqUuewhZNnXrlUacAxgCGYDn4ruJM2eyg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=UlE81wgz; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="UlE81wgz" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e225c289c90so5648961276.3 for ; Mon, 23 Sep 2024 17:37:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1727138251; x=1727743051; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=T/x8P3+kVeCiLfvUzo1Nwxxj4w2s36O0oobO+3bH8RI=; b=UlE81wgz363HFPR2YEmwLxjoEsHOCGEdAwTakQeW6SRURnM6WmDuE9v9kRdLShBo/g JrWXhVndNWqvjeEDQ1jReP0W9nxNBqwtnP2Vuf417yNp3fbjhBIhEjPZUdOw/nC5s/pL f/Ww7VuxWUgQoov/lzYaGZOlIIsT0MZz1pPkiwnnE4KrBo1g32PARgLBi/DSe/dh6waW RIRHuQZ/d3NYJAKsWdc8RMaVw2FY23W5MpYL4BnzTcKFaD+4Wb9voDM+Sr9FbPIwW4b6 uWnJuf4YkaGNRENu40ZFoqFSJew85kFztZll25Gm6933NsIS1h9W1MPar5rdVzTigexb vuzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727138251; x=1727743051; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=T/x8P3+kVeCiLfvUzo1Nwxxj4w2s36O0oobO+3bH8RI=; b=ciE/yzqmugRwZWAvE87FXPX4XkPdUqNAfY8igijchIvg+FOB1u9bo6zG6HYZVgcPpm m3zFq+p4g2VNoorA7PcXAlPSrbhDEYCP5T8qa7oDq9FVpIE6FLdW6Ygz9aRkRkw2wnX9 b5fY0kQTAzLBEVqQZoLr3QonY36pU/9jFCXNLWrg835q8RZ+/nGzM3GDmeMs61GHxIS3 /19G3FJbkng0Xlqt5RIpJbePhF+k9I6m4Ed2/igereJoPnLi9biSYWjVUMmDOeF74rsP ouUAIQPNZArX0DobKAfV3ls9M5BrCl6EkUlwi4/b3cGPTTGOQ4oTPduC78TyDTXR46Yx 2Dpw== X-Forwarded-Encrypted: i=1; AJvYcCUk0AzBvoSGi4ACSAEESHOLM/nXLT+UCGowxDPdUFhOG+AW7ZJWcsx1ljNP/t9yx8dtbeyOE1w8Vi7Jc0Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4sEknJnxoGpe50riaL+LiOHduSM96Lv9i4gsLmf2j1A20wVr0 iHXZ7jeQe3wwitGh8fZPRaD/0/6RjLskKCrX3JcOBN6ot/StmkLc3cWBWKySLgzxau1JvrHJxmg Azm+yRQ== X-Google-Smtp-Source: AGHT+IH/rgjYbdOMDt4KrSS3kKCFiGWPaYMRdvdlvzOkH+OY0cQ7tzxBAPYC6JadwO1FlEe3HgelNh9m6Ab7 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:61a6:b27c:a1cd:e6a0]) (user=irogers job=sendgmr) by 2002:a25:83cd:0:b0:e1a:7693:a8ac with SMTP id 3f1490d57ef6-e2252fb2d4dmr33250276.8.1727138251223; Mon, 23 Sep 2024 17:37:31 -0700 (PDT) Date: Mon, 23 Sep 2024 17:37:19 -0700 In-Reply-To: <20240924003720.617258-1-irogers@google.com> Message-Id: <20240924003720.617258-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240924003720.617258-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Subject: [PATCH v1 2/3] perf probe: Fix libdw memory leak From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Kajol Jain , Athira Rajeev , "Steinar H. Gunderson" , Masami Hiramatsu , "David S. Miller" , Przemek Kitszel , Alexander Lobakin , Hemant Kumar , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Jihong , leo.yan@arm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add missing dwarf_cfi_end to free memory associated with probe_finder cfi_eh or cfi_dbg. This addresses leak sanitizer issues seen in: tools/perf/tests/shell/test_uprobe_from_different_cu.sh Fixes: 270bde1e76f4 ("perf probe: Search both .eh_frame and .debug_frame se= ctions for probe location") Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/util/probe-finder.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 630e16c54ed5..78f34fa0c391 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -1379,6 +1379,11 @@ int debuginfo__find_trace_events(struct debuginfo *d= bg, if (ret >=3D 0 && tf.pf.skip_empty_arg) ret =3D fill_empty_trace_arg(pev, tf.tevs, tf.ntevs); =20 +#if _ELFUTILS_PREREQ(0, 142) + dwarf_cfi_end(tf.pf.cfi_eh); + dwarf_cfi_end(tf.pf.cfi_dbg); +#endif + if (ret < 0 || tf.ntevs =3D=3D 0) { for (i =3D 0; i < tf.ntevs; i++) clear_probe_trace_event(&tf.tevs[i]); --=20 2.46.0.792.g87dc391469-goog From nobody Sun Feb 8 07:44:10 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9416D12E7E for ; Tue, 24 Sep 2024 00:37:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727138257; cv=none; b=Ow2knpjwBc05ZKPUr3KZWFta1jawz621lAdklnAC/7TKgXLopQst4w6cLrHD2XSzvqbETEALC0ctD1dtfp6s08cmOq8nzRS3TJC2OQik2XQYIGvmEamfSbo98OT9YdzAuUsuJRuew8mWqLwl0Y/mS+32rj/gUxlVDJhcivXndhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727138257; c=relaxed/simple; bh=doNQHCLr3DHVKlHSPOr/SFJZMwwugvotkFRUhq87sZE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=uVGcG7Z5w8QprZdjPx0n1bxCpeAvo4UDBBWK6U88UpXPBCfe8+NCjvB7N46rhXPsQIcXQYwjh1f71iczlK0j0iw/DDOdqetnkQz4GdYrp6A4yoDDme/Z9yTcbjhebYkA64cHq6q+XOaPCplnPKIs6VzGSmCFijBpIL9Uuyg9ngI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XS17+XRf; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XS17+XRf" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6e20937a68bso9060977b3.3 for ; Mon, 23 Sep 2024 17:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1727138254; x=1727743054; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=Sp6sXAla2GY+SvoZ3Iq1EGisUuOQIFS1R5Cs1D9l3B4=; b=XS17+XRfeo5+fWCNMmqdyrnuZS7CjGKGGTjsd6jS2xjBoFk+OgaSRyfQlCnfp9MQy5 WiSsfzd7wD03zoXIkPDG31dycccvbv9Ye2+NGmKVTNIipib0TUSl1XxKAbCps0fg50Se GrK4azqA90k3XY9qSZSMuHEvlKUCFhBXszsoOUezzjxtqPU+6+hSk21DOol0cT+b0wGC tGZSsuMCW//m5CCUS4sqJLahdOV3+F1EN03HBfNACXhlcOq0rYoNF+0cJbSFZhC4ywMm jj0br7dcmGUPIhMqZ02hmWOQp/2B12onWiSasUMNc/6NtQACCA9U3C2SN0W+q0bDKyfg 0rww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727138254; x=1727743054; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Sp6sXAla2GY+SvoZ3Iq1EGisUuOQIFS1R5Cs1D9l3B4=; b=qT/Q0v2ZGIx9Mxp6EaP9P97zdwuzyOuQUK/46F7cJuwJYSujah+seQgWn+HIxEVsXS R+1DgDLMPmBrw3um3dU1d1PsjKD+xYY2+e4n4l9sDhgpiWc3ccU0pVoNx7gbP/rP1YRL wiWiHvubRq5CCYJmpgDWybI4BPzfk+Hlxe1CkfqlJ99Li2/Fpm3qkGD+bYGcEQFhqEXM Ws9JICN0f5A+YUvjYQNScC+NBlZLj/VPG/B0/VAtabsq8DceLb6AhnhFwq6scIwOJ5V8 OwOiv0/q+YclJnewzjAH4dN+0tKtc2PoAvUc7YnR2HJqwgxnwz0YNaspmJ1PeagZbQ/+ kw5g== X-Forwarded-Encrypted: i=1; AJvYcCX3N/TGEQvCcOvKoQbeuDTUXdTIwe7gtiRYnPMGd58dAAAToKDCc1DVK6xPcLB3wiy0IeXfNKUs5Tgv16M=@vger.kernel.org X-Gm-Message-State: AOJu0YzOaf5jYjG/aispNdf1mCK4TRpMNMpgS3eMLBxASMiguofdMdQN Z+aPYISDP4eo/PzyHV7s2BwKaE1b3SUAl67jdmns7k0XOmwoX5ZkMJd0vb6nP6zquz9nPuJDwYz b4ZiAEg== X-Google-Smtp-Source: AGHT+IHIlOB5DfOGX/DAeRX3x66qG2gS9/yfEV3xex2xyR9vwzEtaBMU+fNEY7mUC8w+NH0cHkWubm9y9fxl X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:61a6:b27c:a1cd:e6a0]) (user=irogers job=sendgmr) by 2002:a05:690c:450c:b0:6b2:6cd4:7f9a with SMTP id 00721157ae682-6dfef143839mr2392867b3.8.1727138254662; Mon, 23 Sep 2024 17:37:34 -0700 (PDT) Date: Mon, 23 Sep 2024 17:37:20 -0700 In-Reply-To: <20240924003720.617258-1-irogers@google.com> Message-Id: <20240924003720.617258-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240924003720.617258-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Subject: [PATCH v1 3/3] perf build: Fix !HAVE_DWARF_GETLOCATIONS_SUPPORT From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Kajol Jain , Athira Rajeev , "Steinar H. Gunderson" , Masami Hiramatsu , "David S. Miller" , Przemek Kitszel , Alexander Lobakin , Hemant Kumar , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Jihong , leo.yan@arm.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Testing with a LIBDW_DIR showed some issues. In dwarf-aux.h if HAVE_DWARF_GETLOCATIONS_SUPPORT isn't defined then the code uses an undefined errno value, so add errno.h. In Makefile.config the dwarf feature tests need the LIBDW_DIR setting in the CFLAGS/LDFLAGS. Signed-off-by: Ian Rogers Reviewed-by: James Clark --- tools/perf/Makefile.config | 6 ++++++ tools/perf/util/dwarf-aux.h | 1 + 2 files changed, 7 insertions(+) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 4dcf7a0fd235..5e26d3a91b36 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -159,8 +159,14 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) DWARFLIBS +=3D -lebl endif endif +FEATURE_CHECK_CFLAGS-dwarf :=3D $(LIBDW_CFLAGS) +FEATURE_CHECK_LDFLAGS-dwarf :=3D $(LIBDW_LDFLAGS) $(DWARFLIBS) FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind :=3D $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind :=3D $(LIBDW_LDFLAGS) $(DWARFLIBS) +FEATURE_CHECK_CFLAGS-dwarf_getlocations :=3D $(LIBDW_CFLAGS) +FEATURE_CHECK_LDFLAGS-dwarf_getlocations :=3D $(LIBDW_LDFLAGS) $(DWARFLIBS) +FEATURE_CHECK_CFLAGS-dwarf_getcfi :=3D $(LIBDW_CFLAGS) +FEATURE_CHECK_LDFLAGS-dwarf_getcfi :=3D $(LIBDW_LDFLAGS) $(DWARFLIBS) =20 # for linking with debug library, run like: # make DEBUG=3D1 LIBBABELTRACE_DIR=3D/opt/libbabeltrace/ diff --git a/tools/perf/util/dwarf-aux.h b/tools/perf/util/dwarf-aux.h index 336a3a183a78..925a9bb9fb15 100644 --- a/tools/perf/util/dwarf-aux.h +++ b/tools/perf/util/dwarf-aux.h @@ -177,6 +177,7 @@ void die_collect_vars(Dwarf_Die *sc_die, struct die_var= _type **var_types); void die_collect_global_vars(Dwarf_Die *cu_die, struct die_var_type **var_= types); =20 #else /* HAVE_DWARF_GETLOCATIONS_SUPPORT */ +#include =20 static inline int die_get_var_range(Dwarf_Die *sp_die __maybe_unused, Dwarf_Die *vr_die __maybe_unused, --=20 2.46.0.792.g87dc391469-goog