From: Yonghong Song <yonghong.song@linux.dev>
To: Alan Maguire <alan.maguire@oracle.com>,
Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>,
dwarves@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
bpf@vger.kernel.org, Daniel Borkmann <daniel@iogearbox.net>,
kernel-team@fb.com
Subject: [PATCH dwarves 2/3] dwarf_loader: Refactor function check_dwarf_locations()
Date: Fri, 8 Nov 2024 10:05:19 -0800 [thread overview]
Message-ID: <20241108180519.1198396-1-yonghong.song@linux.dev> (raw)
In-Reply-To: <20241108180508.1196431-1-yonghong.song@linux.dev>
The newly-added function check_dwarf_locations() supports two variants
of implementations: elfutils "version < 157" and "version >= 157".
The "version < 157" supports one single location (dwarf_getlocation())
and "version >= 157" supports location lists (dwarf_getlocations()).
Currently, even for dwarf_getlocations(), only the first location
and its first expression is checked. In the subsequent patch, all
locations and all expressions may be changed. So this patch refactors
the code such that two different implementations (based on elfutils
versions) are clearly separated. This makes subsequent change cleaner.
No functional change.
Signed-off-by: Yonghong Song <yonghong.song@linux.dev>
---
dwarf_loader.c | 40 +++++++++++++++++++++++++++++++++-------
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git a/dwarf_loader.c b/dwarf_loader.c
index 4bb9096..e0b8c11 100644
--- a/dwarf_loader.c
+++ b/dwarf_loader.c
@@ -1160,22 +1160,47 @@ static struct template_parameter_pack *template_parameter_pack__new(Dwarf_Die *d
static bool check_dwarf_locations(Dwarf_Attribute *attr, struct parameter *parm,
struct cu *cu, int param_idx)
{
+ int expected_reg = cu->register_params[param_idx];
Dwarf_Addr base, start, end;
struct location loc;
+ Dwarf_Op *expr;
+ if (!parm->has_loc)
+ return false;
+
+#if _ELFUTILS_PREREQ(0, 157)
/* dwarf_getlocations() handles location lists; here we are
* only interested in the first expr.
*/
- if (parm->has_loc &&
-#if _ELFUTILS_PREREQ(0, 157)
- dwarf_getlocations(attr, 0, &base, &start, &end,
+ if (dwarf_getlocations(attr, 0, &base, &start, &end,
&loc.expr, &loc.exprlen) > 0 &&
+ loc.exprlen != 0) {
+ expr = loc.expr;
+
+ switch (expr->atom) {
+ case DW_OP_reg0 ... DW_OP_reg31:
+ /* mark parameters that use an unexpected
+ * register to hold a parameter; these will
+ * be problematic for users of BTF as they
+ * violate expectations about register
+ * contents.
+ */
+ if (expected_reg >= 0 && expected_reg != expr->atom)
+ parm->unexpected_reg = 1;
+ break;
+ default:
+ parm->optimized = 1;
+ break;
+ }
+
+ return true;
+ }
+
+ return false;
#else
- dwarf_getlocation(attr, &loc.expr, &loc.exprlen) == 0 &&
-#endif
+ if (dwarf_getlocation(attr, &loc.expr, &loc.exprlen) == 0 &&
loc.exprlen != 0) {
- int expected_reg = cu->register_params[param_idx];
- Dwarf_Op *expr = loc.expr;
+ expr = loc.expr;
switch (expr->atom) {
case DW_OP_reg0 ... DW_OP_reg31:
@@ -1197,6 +1222,7 @@ static bool check_dwarf_locations(Dwarf_Attribute *attr, struct parameter *parm,
}
return false;
+#endif
}
static struct parameter *parameter__new(Dwarf_Die *die, struct cu *cu,
--
2.43.5
next prev parent reply other threads:[~2024-11-08 18:05 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-08 18:05 [PATCH dwarves 0/3] Check DW_OP_[GNU_]entry_value for possible parameter matching Yonghong Song
2024-11-08 18:05 ` [PATCH dwarves 1/3] dwarf_loader: Refactor function parameter__new() Yonghong Song
2024-11-11 11:26 ` Alan Maguire
2024-11-08 18:05 ` Yonghong Song [this message]
2024-11-08 18:05 ` [PATCH dwarves 3/3] dwarf_loader: Check DW_OP_[GNU_]entry_value for possible parameter matching Yonghong Song
2024-11-10 11:38 ` Eduard Zingerman
2024-11-11 8:01 ` Eduard Zingerman
2024-11-11 12:36 ` Jiri Olsa
2024-11-11 13:42 ` Arnaldo Carvalho de Melo
2024-11-15 16:26 ` elfutils thread-safety (Was: [PATCH dwarves 3/3] dwarf_loader: Check DW_OP_[GNU_]entry_value for possible parameter matching) Mark Wielaard
2024-11-11 18:51 ` [PATCH dwarves 3/3] dwarf_loader: Check DW_OP_[GNU_]entry_value for possible parameter matching Yonghong Song
2024-11-11 9:54 ` Jiri Olsa
2024-11-11 18:54 ` Yonghong Song
2024-11-11 15:39 ` Alan Maguire
2024-11-12 1:51 ` Yonghong Song
2024-11-12 16:56 ` Alan Maguire
2024-11-12 17:07 ` Yonghong Song
2024-11-12 18:33 ` Alan Maguire
2024-11-12 18:51 ` Yonghong Song
2024-11-12 19:10 ` Arnaldo Carvalho de Melo
2024-11-13 17:33 ` Alan Maguire
2024-11-13 18:27 ` Yonghong Song
2024-11-14 12:16 ` Alan Maguire
2024-11-14 16:29 ` Yonghong Song
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=20241108180519.1198396-1-yonghong.song@linux.dev \
--to=yonghong.song@linux.dev \
--cc=alan.maguire@oracle.com \
--cc=andrii@kernel.org \
--cc=arnaldo.melo@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=dwarves@vger.kernel.org \
--cc=kernel-team@fb.com \
/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