On Thu, Nov 9, 2023 at 1:28 AM Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
>
> We need to get offsets for static variables in following changes,
> so making elf_resolve_syms_offsets to take st_type value as argument
> and passing it to elf_sym_iter_new.
>
> Acked-by: Song Liu <song@xxxxxxxxxx>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> ---
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
> tools/lib/bpf/elf.c | 5 +++--
> tools/lib/bpf/libbpf.c | 2 +-
> tools/lib/bpf/libbpf_internal.h | 3 ++-
> tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c | 2 +-
> 4 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/tools/lib/bpf/elf.c b/tools/lib/bpf/elf.c
> index 2a62bf411bb3..b02faec748a5 100644
> --- a/tools/lib/bpf/elf.c
> +++ b/tools/lib/bpf/elf.c
> @@ -407,7 +407,8 @@ static int symbol_cmp(const void *a, const void *b)
> * size, that needs to be released by the caller.
> */
> int elf_resolve_syms_offsets(const char *binary_path, int cnt,
> - const char **syms, unsigned long **poffsets)
> + const char **syms, unsigned long **poffsets,
> + int st_type)
> {
> int sh_types[2] = { SHT_DYNSYM, SHT_SYMTAB };
> int err = 0, i, cnt_done = 0;
> @@ -438,7 +439,7 @@ int elf_resolve_syms_offsets(const char *binary_path, int cnt,
> struct elf_sym_iter iter;
> struct elf_sym *sym;
>
> - err = elf_sym_iter_new(&iter, elf_fd.elf, binary_path, sh_types[i], STT_FUNC);
> + err = elf_sym_iter_new(&iter, elf_fd.elf, binary_path, sh_types[i], st_type);
> if (err == -ENOENT)
> continue;
> if (err)
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index e067be95da3c..ea9b8158c20d 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -11447,7 +11447,7 @@ bpf_program__attach_uprobe_multi(const struct bpf_program *prog,
> return libbpf_err_ptr(err);
> offsets = resolved_offsets;
> } else if (syms) {
> - err = elf_resolve_syms_offsets(path, cnt, syms, &resolved_offsets);
> + err = elf_resolve_syms_offsets(path, cnt, syms, &resolved_offsets, STT_FUNC);
> if (err < 0)
> return libbpf_err_ptr(err);
> offsets = resolved_offsets;
> diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h
> index f0f08635adb0..b5d334754e5d 100644
> --- a/tools/lib/bpf/libbpf_internal.h
> +++ b/tools/lib/bpf/libbpf_internal.h
> @@ -594,7 +594,8 @@ int elf_open(const char *binary_path, struct elf_fd *elf_fd);
> void elf_close(struct elf_fd *elf_fd);
>
> int elf_resolve_syms_offsets(const char *binary_path, int cnt,
> - const char **syms, unsigned long **poffsets);
> + const char **syms, unsigned long **poffsets,
> + int st_type);
> int elf_resolve_pattern_offsets(const char *binary_path, const char *pattern,
> unsigned long **poffsets, size_t *pcnt);
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
> index cd051d3901a9..ece260cf2c0b 100644
> --- a/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
> +++ b/tools/testing/selftests/bpf/prog_tests/uprobe_multi_test.c
> @@ -249,7 +249,7 @@ static void __test_link_api(struct child *child)
> int link_extra_fd = -1;
> int err;
>
> - err = elf_resolve_syms_offsets(path, 3, syms, (unsigned long **) &offsets);
> + err = elf_resolve_syms_offsets(path, 3, syms, (unsigned long **) &offsets, STT_FUNC);
> if (!ASSERT_OK(err, "elf_resolve_syms_offsets"))
> return;
>
> --
> 2.41.0
>
