From: Jiri Olsa <olsajiri@gmail.com>
To: Andrii Nakryiko <andrii@kernel.org>
Cc: bpf@vger.kernel.org, linux-mm@kvack.org,
akpm@linux-foundation.org, adobriyan@gmail.com,
shakeel.butt@linux.dev, hannes@cmpxchg.org, ak@linux.intel.com,
osandov@osandov.com, song@kernel.org
Subject: Re: [PATCH v2 bpf-next 10/10] selftests/bpf: add build ID tests
Date: Thu, 25 Jul 2024 14:12:27 +0200 [thread overview]
Message-ID: <ZqJBK4loBv030jj_@krava> (raw)
In-Reply-To: <20240724225210.545423-11-andrii@kernel.org>
On Wed, Jul 24, 2024 at 03:52:10PM -0700, Andrii Nakryiko wrote:
> Add a new set of tests validating behavior of capturing stack traces
> with build ID. We extend uprobe_multi target binary with ability to
> trigger uprobe (so that we can capture stack traces from it), but also
> we allow to force build ID data to be either resident or non-resident in
> memory (see also a comment about quirks of MADV_PAGEOUT).
>
> That way we can validate that in non-sleepable context we won't get
> build ID (as expected), but with sleepable uprobes we will get that
> build ID regardless of it being physically present in memory.
>
> Also, we add a small add-on linker script which reorders
> .note.gnu.build-id section and puts it after (big) .text section,
> putting build ID data outside of the very first page of ELF file. This
> will test all the relaxations we did in build ID parsing logic in kernel
> thanks to freader abstraction.
>
> Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
one of my bpf selftests runs showed:
test_build_id:PASS:parse_build_id 0 nsec
subtest_nofault:PASS:skel_open 0 nsec
subtest_nofault:PASS:link 0 nsec
subtest_nofault:PASS:trigger_uprobe 0 nsec
subtest_nofault:PASS:res 0 nsec
subtest_nofault:FAIL:build_id_status unexpected build_id_status: actual 1 != expected 2
#42/1 build_id/nofault-paged-out:FAIL
#42/2 build_id/nofault-paged-in:OK
#42/3 build_id/sleepable:OK
#42 build_id:FAIL
I could never reproduce again.. but I wonder the the page could sneak
in before the bpf program is hit and the buildid will get parsed?
or maybe likely madvise might just ignore that:
MADV_PAGEOUT (since Linux 5.4)
Reclaim a given range of pages. This is done to free up memory occupied by these pages. If a page is anonymous, it will be swapped out. If
a page is file-backed and dirty, it will be written back to the backing storage. The advice might be ignored for some pages in the range
when it is not applicable.
jirka
> ---
> tools/testing/selftests/bpf/Makefile | 5 +-
> .../selftests/bpf/prog_tests/build_id.c | 118 ++++++++++++++++++
> .../selftests/bpf/progs/test_build_id.c | 31 +++++
> tools/testing/selftests/bpf/uprobe_multi.c | 41 ++++++
> tools/testing/selftests/bpf/uprobe_multi.ld | 11 ++
> 5 files changed, 204 insertions(+), 2 deletions(-)
> create mode 100644 tools/testing/selftests/bpf/prog_tests/build_id.c
> create mode 100644 tools/testing/selftests/bpf/progs/test_build_id.c
> create mode 100644 tools/testing/selftests/bpf/uprobe_multi.ld
>
> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
> index 888ba68e6592..fe4bca113c78 100644
> --- a/tools/testing/selftests/bpf/Makefile
> +++ b/tools/testing/selftests/bpf/Makefile
> @@ -790,9 +790,10 @@ $(OUTPUT)/veristat: $(OUTPUT)/veristat.o
>
> # Linking uprobe_multi can fail due to relocation overflows on mips.
> $(OUTPUT)/uprobe_multi: CFLAGS += $(if $(filter mips, $(ARCH)),-mxgot)
> -$(OUTPUT)/uprobe_multi: uprobe_multi.c
> +$(OUTPUT)/uprobe_multi: uprobe_multi.c uprobe_multi.ld
> $(call msg,BINARY,,$@)
> - $(Q)$(CC) $(CFLAGS) -O0 $(LDFLAGS) $^ $(LDLIBS) -o $@
> + $(Q)$(CC) $(CFLAGS) -Wl,-T,uprobe_multi.ld -O0 $(LDFLAGS) \
> + $(filter-out %.ld,$^) $(LDLIBS) -o $@
>
> EXTRA_CLEAN := $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \
> prog_tests/tests.h map_tests/tests.h verifier/tests.h \
> diff --git a/tools/testing/selftests/bpf/prog_tests/build_id.c b/tools/testing/selftests/bpf/prog_tests/build_id.c
> new file mode 100644
> index 000000000000..8e6d3603be61
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/prog_tests/build_id.c
> @@ -0,0 +1,118 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
> +#include <test_progs.h>
> +
> +#include "test_build_id.skel.h"
> +
> +static char build_id[BPF_BUILD_ID_SIZE];
> +static int build_id_sz;
> +
> +static void print_stack(struct bpf_stack_build_id *stack, int frame_cnt)
> +{
> + int i, j;
> +
> + for (i = 0; i < frame_cnt; i++) {
> + printf("FRAME #%02d: ", i);
> + switch (stack[i].status) {
> + case BPF_STACK_BUILD_ID_EMPTY:
> + printf("<EMPTY>\n");
> + break;
> + case BPF_STACK_BUILD_ID_VALID:
> + printf("BUILD ID = ");
> + for (j = 0; j < BPF_BUILD_ID_SIZE; j++)
> + printf("%02hhx", (unsigned)stack[i].build_id[j]);
> + printf(" OFFSET = %llx", (unsigned long long)stack[i].offset);
> + break;
> + case BPF_STACK_BUILD_ID_IP:
> + printf("IP = %llx", (unsigned long long)stack[i].ip);
> + break;
> + default:
> + printf("UNEXPECTED STATUS %d ", stack[i].status);
> + break;
> + }
> + printf("\n");
> + }
> +}
> +
> +static void subtest_nofault(bool build_id_resident)
> +{
> + struct test_build_id *skel;
> + struct bpf_stack_build_id *stack;
> + int frame_cnt;
> +
> + skel = test_build_id__open_and_load();
> + if (!ASSERT_OK_PTR(skel, "skel_open"))
> + return;
> +
> + skel->links.uprobe_nofault = bpf_program__attach(skel->progs.uprobe_nofault);
> + if (!ASSERT_OK_PTR(skel->links.uprobe_nofault, "link"))
> + goto cleanup;
> +
> + if (build_id_resident)
> + ASSERT_OK(system("./uprobe_multi uprobe-paged-in"), "trigger_uprobe");
> + else
> + ASSERT_OK(system("./uprobe_multi uprobe-paged-out"), "trigger_uprobe");
> +
> + if (!ASSERT_GT(skel->bss->res_nofault, 0, "res"))
> + goto cleanup;
> +
> + stack = skel->bss->stack_nofault;
> + frame_cnt = skel->bss->res_nofault / sizeof(struct bpf_stack_build_id);
> + if (env.verbosity >= VERBOSE_NORMAL)
> + print_stack(stack, frame_cnt);
> +
> + if (build_id_resident) {
> + ASSERT_EQ(stack[0].status, BPF_STACK_BUILD_ID_VALID, "build_id_status");
> + ASSERT_EQ(memcmp(stack[0].build_id, build_id, build_id_sz), 0, "build_id_match");
> + } else {
> + ASSERT_EQ(stack[0].status, BPF_STACK_BUILD_ID_IP, "build_id_status");
> + }
> +
> +cleanup:
> + test_build_id__destroy(skel);
> +}
> +
> +static void subtest_sleepable(void)
> +{
> + struct test_build_id *skel;
> + struct bpf_stack_build_id *stack;
> + int frame_cnt;
> +
> + skel = test_build_id__open_and_load();
> + if (!ASSERT_OK_PTR(skel, "skel_open"))
> + return;
> +
> + skel->links.uprobe_sleepable = bpf_program__attach(skel->progs.uprobe_sleepable);
> + if (!ASSERT_OK_PTR(skel->links.uprobe_sleepable, "link"))
> + goto cleanup;
> +
> + /* force build ID to not be paged in */
> + ASSERT_OK(system("./uprobe_multi uprobe-paged-out"), "trigger_uprobe");
> +
> + if (!ASSERT_GT(skel->bss->res_sleepable, 0, "res"))
> + goto cleanup;
> +
> + stack = skel->bss->stack_sleepable;
> + frame_cnt = skel->bss->res_sleepable / sizeof(struct bpf_stack_build_id);
> + if (env.verbosity >= VERBOSE_NORMAL)
> + print_stack(stack, frame_cnt);
> +
> + ASSERT_EQ(stack[0].status, BPF_STACK_BUILD_ID_VALID, "build_id_status");
> + ASSERT_EQ(memcmp(stack[0].build_id, build_id, build_id_sz), 0, "build_id_match");
> +
> +cleanup:
> + test_build_id__destroy(skel);
> +}
> +
> +void test_build_id(void)
> +{
> + build_id_sz = read_build_id("uprobe_multi", build_id, sizeof(build_id));
> + ASSERT_EQ(build_id_sz, BPF_BUILD_ID_SIZE, "parse_build_id");
> +
> + if (test__start_subtest("nofault-paged-out"))
> + subtest_nofault(false /* not resident */);
> + if (test__start_subtest("nofault-paged-in"))
> + subtest_nofault(true /* resident */);
> + if (test__start_subtest("sleepable"))
> + subtest_sleepable();
> +}
> diff --git a/tools/testing/selftests/bpf/progs/test_build_id.c b/tools/testing/selftests/bpf/progs/test_build_id.c
> new file mode 100644
> index 000000000000..32ce59f9aa27
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/progs/test_build_id.c
> @@ -0,0 +1,31 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (c) 2024 Meta Platforms, Inc. and affiliates. */
> +
> +#include "vmlinux.h"
> +#include <bpf/bpf_helpers.h>
> +
> +struct bpf_stack_build_id stack_sleepable[128];
> +int res_sleepable;
> +
> +struct bpf_stack_build_id stack_nofault[128];
> +int res_nofault;
> +
> +SEC("uprobe.multi/./uprobe_multi:uprobe")
> +int uprobe_nofault(struct pt_regs *ctx)
> +{
> + res_nofault = bpf_get_stack(ctx, stack_nofault, sizeof(stack_nofault),
> + BPF_F_USER_STACK | BPF_F_USER_BUILD_ID);
> +
> + return 0;
> +}
> +
> +SEC("uprobe.multi.s/./uprobe_multi:uprobe")
> +int uprobe_sleepable(struct pt_regs *ctx)
> +{
> + res_sleepable = bpf_get_stack(ctx, stack_sleepable, sizeof(stack_sleepable),
> + BPF_F_USER_STACK | BPF_F_USER_BUILD_ID);
> +
> + return 0;
> +}
> +
> +char _license[] SEC("license") = "GPL";
> diff --git a/tools/testing/selftests/bpf/uprobe_multi.c b/tools/testing/selftests/bpf/uprobe_multi.c
> index 7ffa563ffeba..c7828b13e5ff 100644
> --- a/tools/testing/selftests/bpf/uprobe_multi.c
> +++ b/tools/testing/selftests/bpf/uprobe_multi.c
> @@ -2,8 +2,21 @@
>
> #include <stdio.h>
> #include <string.h>
> +#include <stdbool.h>
> +#include <stdint.h>
> +#include <sys/mman.h>
> +#include <unistd.h>
> #include <sdt.h>
>
> +#ifndef MADV_POPULATE_READ
> +#define MADV_POPULATE_READ 22
> +#endif
> +
> +int __attribute__((weak)) uprobe(void)
> +{
> + return 0;
> +}
> +
> #define __PASTE(a, b) a##b
> #define PASTE(a, b) __PASTE(a, b)
>
> @@ -75,6 +88,30 @@ static int usdt(void)
> return 0;
> }
>
> +extern char build_id_start[];
> +extern char build_id_end[];
> +
> +int __attribute__((weak)) trigger_uprobe(bool build_id_resident)
> +{
> + int page_sz = sysconf(_SC_PAGESIZE);
> + void *addr;
> +
> + /* page-align build ID start */
> + addr = (void *)((uintptr_t)&build_id_start & ~(page_sz - 1));
> +
> + /* to guarantee MADV_PAGEOUT work reliably, we need to ensure that
> + * memory range is mapped into current process, so we unconditionally
> + * do MADV_POPULATE_READ, and then MADV_PAGEOUT, if necessary
> + */
> + madvise(addr, page_sz, MADV_POPULATE_READ);
> + if (!build_id_resident)
> + madvise(addr, page_sz, MADV_PAGEOUT);
> +
> + (void)uprobe();
> +
> + return 0;
> +}
> +
> int main(int argc, char **argv)
> {
> if (argc != 2)
> @@ -84,6 +121,10 @@ int main(int argc, char **argv)
> return bench();
> if (!strcmp("usdt", argv[1]))
> return usdt();
> + if (!strcmp("uprobe-paged-out", argv[1]))
> + return trigger_uprobe(false /* page-out build ID */);
> + if (!strcmp("uprobe-paged-in", argv[1]))
> + return trigger_uprobe(true /* page-in build ID */);
>
> error:
> fprintf(stderr, "usage: %s <bench|usdt>\n", argv[0]);
> diff --git a/tools/testing/selftests/bpf/uprobe_multi.ld b/tools/testing/selftests/bpf/uprobe_multi.ld
> new file mode 100644
> index 000000000000..a2e94828bc8c
> --- /dev/null
> +++ b/tools/testing/selftests/bpf/uprobe_multi.ld
> @@ -0,0 +1,11 @@
> +SECTIONS
> +{
> + . = ALIGN(4096);
> + .note.gnu.build-id : { *(.note.gnu.build-id) }
> + . = ALIGN(4096);
> +}
> +INSERT AFTER .text;
> +
> +build_id_start = ADDR(.note.gnu.build-id);
> +build_id_end = ADDR(.note.gnu.build-id) + SIZEOF(.note.gnu.build-id);
> +
> --
> 2.43.0
>
>
next prev parent reply other threads:[~2024-07-25 12:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-24 22:52 [PATCH v2 bpf-next 00/10] Harden and extend ELF build ID parsing logic Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 01/10] lib/buildid: add single page-based file reader abstraction Andrii Nakryiko
2024-07-25 12:03 ` Jiri Olsa
2024-07-25 19:58 ` Andrii Nakryiko
2024-07-26 12:31 ` Jiri Olsa
2024-07-25 22:43 ` Andi Kleen
2024-07-27 0:26 ` Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 02/10] lib/buildid: take into account e_phoff when fetching program headers Andrii Nakryiko
2024-07-25 12:03 ` Jiri Olsa
2024-07-25 19:59 ` Andrii Nakryiko
2024-07-25 22:45 ` Andi Kleen
2024-07-27 0:30 ` Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 03/10] lib/buildid: remove single-page limit for PHDR search Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 04/10] lib/buildid: rename build_id_parse() into build_id_parse_nofault() Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 05/10] lib/buildid: implement sleepable build_id_parse() API Andrii Nakryiko
2024-07-25 22:46 ` Andi Kleen
2024-07-27 0:36 ` Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 06/10] lib/buildid: don't limit .note.gnu.build-id to the first page in ELF Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 07/10] lib/buildid: harden build ID parsing logic some more Andrii Nakryiko
2024-07-29 16:15 ` Jann Horn
2024-07-29 16:57 ` Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 08/10] bpf: decouple stack_map_get_build_id_offset() from perf_callchain_entry Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 09/10] bpf: wire up sleepable bpf_get_stack() and bpf_get_task_stack() helpers Andrii Nakryiko
2024-07-24 22:52 ` [PATCH v2 bpf-next 10/10] selftests/bpf: add build ID tests Andrii Nakryiko
2024-07-25 12:04 ` Jiri Olsa
2024-07-25 20:01 ` Andrii Nakryiko
2024-07-25 12:12 ` Jiri Olsa [this message]
2024-07-25 20:03 ` Andrii Nakryiko
2024-07-26 12:27 ` Jiri Olsa
2024-07-27 0:37 ` Andrii Nakryiko
2024-07-28 19:38 ` Jiri Olsa
2024-07-30 20:03 ` Andrii Nakryiko
2024-07-30 20:18 ` Jiri Olsa
2025-09-10 6:09 ` Saket Kumar Bhaskar
2025-09-10 14:18 ` 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=ZqJBK4loBv030jj_@krava \
--to=olsajiri@gmail.com \
--cc=adobriyan@gmail.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=linux-mm@kvack.org \
--cc=osandov@osandov.com \
--cc=shakeel.butt@linux.dev \
--cc=song@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