From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii.nakryiko@gmail.com>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>
Cc: bpf@vger.kernel.org, Ilya Leoshkevich <iii@linux.ibm.com>
Subject: [PATCH bpf-next] libbpf: Support Debian in resolve_full_path()
Date: Mon, 4 Apr 2022 12:29:08 +0200 [thread overview]
Message-ID: <20220404102908.14688-1-iii@linux.ibm.com> (raw)
attach_probe selftest fails on Debian-based distros with `failed to
resolve full path for 'libc.so.6'`. The reason is that these distros
embraced multiarch to the point where even for the "main" architecture
they store libc in /lib/<triple>.
This is configured in /etc/ld.so.conf and in theory it's possible to
replicate the loader's parsing and processing logic in libbpf, however
a much simpler solution is to just enumerate the known library paths.
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
tools/lib/bpf/libbpf.c | 54 ++++++++++++++++++++++++++++++++++++------
1 file changed, 47 insertions(+), 7 deletions(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 6d2be53e4ba9..4f616b11564f 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -10707,21 +10707,61 @@ static long elf_find_func_offset(const char *binary_path, const char *name)
return ret;
}
+static void add_debian_library_paths(const char **search_paths, int *n)
+{
+ /*
+ * Based on https://packages.debian.org/sid/libc6.
+ *
+ * Assume that the traced program is built for the same architecture
+ * as libbpf, which should cover the vast majority of cases.
+ */
+#if defined(__x86_64__)
+ search_paths[(*n)++] = "/lib/x86_64-linux-gnu";
+#elif defined(__i386__)
+ search_paths[(*n)++] = "/lib/i386-linux-gnu";
+#elif defined(__s390x__)
+ search_paths[(*n)++] = "/lib/s390x-linux-gnu";
+#elif defined(__s390__)
+ search_paths[(*n)++] = "/lib/s390-linux-gnu";
+#elif defined(__arm__)
+#if defined(__SOFTFP__)
+ search_paths[(*n)++] = "/lib/arm-linux-gnueabi";
+#else
+ search_paths[(*n)++] = "/lib/arm-linux-gnueabihf";
+#endif /* defined(__SOFTFP__) */
+#elif defined(__aarch64__)
+ search_paths[(*n)++] = "/lib/aarch64-linux-gnu";
+#elif defined(__mips__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+#if _MIPS_SZLONG == 64
+ search_paths[(*n)++] = "/lib/mips64el-linux-gnuabi64";
+#elif _MIPS_SZLONG == 32
+ search_paths[(*n)++] = "/lib/mipsel-linux-gnu";
+#endif
+#elif defined(__powerpc__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+ search_paths[(*n)++] = "/lib/powerpc64le-linux-gnu";
+#elif defined(__sparc__)
+ search_paths[(*n)++] = "/lib/sparc64-linux-gnu";
+#elif defined(__riscv) && __riscv_xlen == 64
+ search_paths[(*n)++] = "/lib/riscv64-linux-gnu";
+#endif
+}
+
/* Get full path to program/shared library. */
static int resolve_full_path(const char *file, char *result, size_t result_sz)
{
- const char *search_paths[2];
- int i;
+ const char *search_paths[3];
+ int i, n = 0;
if (strstr(file, ".so")) {
- search_paths[0] = getenv("LD_LIBRARY_PATH");
- search_paths[1] = "/usr/lib64:/usr/lib";
+ search_paths[n++] = getenv("LD_LIBRARY_PATH");
+ search_paths[n++] = "/usr/lib64:/usr/lib";
+ add_debian_library_paths(search_paths, &n);
} else {
- search_paths[0] = getenv("PATH");
- search_paths[1] = "/usr/bin:/usr/sbin";
+ search_paths[n++] = getenv("PATH");
+ search_paths[n++] = "/usr/bin:/usr/sbin";
}
- for (i = 0; i < ARRAY_SIZE(search_paths); i++) {
+ for (i = 0; i < n; i++) {
const char *s;
if (!search_paths[i])
--
2.35.1
next reply other threads:[~2022-04-04 10:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 10:29 Ilya Leoshkevich [this message]
2022-04-04 21:40 ` [PATCH bpf-next] libbpf: Support Debian in resolve_full_path() Andrii Nakryiko
2022-04-04 21:58 ` Andrii Nakryiko
2022-04-04 22:22 ` Ilya Leoshkevich
2022-04-04 22:59 ` Andrii Nakryiko
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=20220404102908.14688-1-iii@linux.ibm.com \
--to=iii@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=borntraeger@linux.ibm.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.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;
as well as URLs for NNTP newsgroup(s).