From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>, Hao Luo <haoluo@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Matthew Wilcox <willy@infradead.org>
Cc: bpf@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-perf-users@vger.kernel.org, Martin KaFai Lau <kafai@fb.com>,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
Stanislav Fomichev <sdf@google.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Namhyung Kim <namhyung@gmail.com>
Subject: [PATCH RFC v2 bpf-next 4/9] libbpf: Allow to resolve binary path in current directory
Date: Tue, 28 Feb 2023 10:32:01 +0100 [thread overview]
Message-ID: <20230228093206.821563-5-jolsa@kernel.org> (raw)
In-Reply-To: <20230228093206.821563-1-jolsa@kernel.org>
Try to resolve uprobe/usdt binary path also in current directory,
it's used in the test code in following changes.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/lib/bpf/libbpf.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 05c4db355f28..f72115e8b7f9 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -10727,17 +10727,19 @@ static const char *arch_specific_lib_paths(void)
/* 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[3] = {};
+ const char *search_paths[4] = {};
int i, perm;
if (str_has_sfx(file, ".so") || strstr(file, ".so.")) {
search_paths[0] = getenv("LD_LIBRARY_PATH");
search_paths[1] = "/usr/lib64:/usr/lib";
search_paths[2] = arch_specific_lib_paths();
+ search_paths[3] = ".";
perm = R_OK;
} else {
search_paths[0] = getenv("PATH");
search_paths[1] = "/usr/bin:/usr/sbin";
+ search_paths[2] = ".";
perm = R_OK | X_OK;
}
--
2.39.2
next prev parent reply other threads:[~2023-02-28 9:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 9:31 [RFC v2 bpf-next 0/9] mm/bpf/perf: Store build id in inode object Jiri Olsa
2023-02-28 9:31 ` [PATCH RFC v2 bpf-next 1/9] mm: " Jiri Olsa
2023-02-28 19:13 ` Andrew Morton
2023-03-01 8:16 ` Jiri Olsa
2023-02-28 9:31 ` [PATCH RFC v2 bpf-next 2/9] bpf: Use file's inode object build id in stackmap Jiri Olsa
2023-02-28 9:32 ` [PATCH RFC v2 bpf-next 3/9] perf: Use file object build id in perf_event_mmap_event Jiri Olsa
2023-02-28 9:32 ` Jiri Olsa [this message]
2023-03-08 1:19 ` [PATCH RFC v2 bpf-next 4/9] libbpf: Allow to resolve binary path in current directory Andrii Nakryiko
2023-03-08 13:48 ` Jiri Olsa
2023-02-28 9:32 ` [PATCH RFC v2 bpf-next 5/9] selftests/bpf: Add read_buildid function Jiri Olsa
2023-03-08 1:22 ` Andrii Nakryiko
2023-03-08 13:49 ` Jiri Olsa
2023-02-28 9:32 ` [PATCH RFC v2 bpf-next 6/9] selftests/bpf: Add err.h header Jiri Olsa
2023-02-28 9:32 ` [PATCH RFC v2 bpf-next 7/9] selftests/bpf: Replace extract_build_id with read_build_id Jiri Olsa
2023-03-08 1:26 ` Andrii Nakryiko
2023-03-08 13:51 ` Jiri Olsa
2023-02-28 9:32 ` [PATCH RFC v2 bpf-next 8/9] selftests/bpf: Add inode_build_id test Jiri Olsa
2023-02-28 9:32 ` [PATCH RFC v2 bpf-next 9/9] selftests/bpf: Add iter_task_vma_buildid test Jiri Olsa
2023-03-08 1:32 ` Andrii Nakryiko
2023-03-08 14:00 ` Jiri Olsa
2023-02-28 22:07 ` [RFC v2 bpf-next 0/9] mm/bpf/perf: Store build id in inode object Dave Chinner
2023-03-01 15:41 ` Arnaldo Carvalho de Melo
2023-03-02 8:41 ` Jiri Olsa
2023-03-02 8:35 ` Jiri Olsa
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=20230228093206.821563-5-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=acme@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@gmail.com \
--cc=peterz@infradead.org \
--cc=sdf@google.com \
--cc=songliubraving@fb.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=yhs@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