From: Kenta Akagi <k@mgml.me>
To: gregkh@linuxfoundation.org, sashal@kernel.org
Cc: stable@vger.kernel.org, linux-perf-users@vger.kernel.org,
linux-kernel@vger.kernel.org, Ian Rogers <irogers@google.com>,
Kenta Akagi <k@mgml.me>
Subject: [PATCH 6.6.y] Revert "perf unwind-libdw: Fix invalid reference counts"
Date: Tue, 21 Apr 2026 01:32:22 +0900 [thread overview]
Message-ID: <20260420163222.23517-1-k@mgml.me> (raw)
This reverts commit eddddf4ed7f69697cb54e714e773f764c8d3b67e.
Upstream commit f815fc0c66e7 ("perf unwind-libdw: Fix invalid reference counts"),
was backported to v6.6.128 as eddddf4ed7f6.
However, this commit depends on map_symbol__exit, which was introduced
in v6.7 as commit 56e144fe9826 ("perf mem_info: Add and use
map_symbol__exit and addr_map_symbol__exit") and is absent in v6.6.y.
This results in a build failure.
This is a revert of a backport, so there is no upstream commit.
Signed-off-by: Kenta Akagi <k@mgml.me>
---
tools/perf/util/unwind-libdw.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c
index bd027fdf6af1..6013335a8dae 100644
--- a/tools/perf/util/unwind-libdw.c
+++ b/tools/perf/util/unwind-libdw.c
@@ -133,8 +133,8 @@ static int entry(u64 ip, struct unwind_info *ui)
}
e->ip = ip;
- e->ms.maps = maps__get(al.maps);
- e->ms.map = map__get(al.map);
+ e->ms.maps = al.maps;
+ e->ms.map = al.map;
e->ms.sym = al.sym;
pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",
@@ -319,9 +319,6 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
if (err)
pr_debug("unwind: failed with '%s'\n", dwfl_errmsg(-1));
- for (i = 0; i < ui->idx; i++)
- map_symbol__exit(&ui->entries[i].ms);
-
dwfl_end(ui->dwfl);
free(ui);
return 0;
--
2.50.1
next reply other threads:[~2026-04-20 17:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-20 16:32 Kenta Akagi [this message]
2026-04-22 3:57 ` [PATCH 6.6.y] Revert "perf unwind-libdw: Fix invalid reference counts" Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260420163222.23517-1-k@mgml.me \
--to=k@mgml.me \
--cc=gregkh@linuxfoundation.org \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox