Skip to content

selftests/bpf: filter by pid to avoid cross-test interference #11311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kernel-patches-daemon-bpf wants to merge 2 commits into
base: bpf-next_base
Choose a base branch
from
+37 −5
Open

selftests/bpf: filter by pid to avoid cross-test interference #11311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0586bf
selftests/bpf: filter by pid to avoid cross-test interference
ahjf-07 Mar 6, 2026
5bef919
selftests/bpf: drop serial restriction
ahjf-07 Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions tools/testing/selftests/bpf/prog_tests/probe_user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <test_progs.h>

/* TODO: corrupts other tests uses connect() */
void serial_test_probe_user(void)
void test_probe_user(void)
{
static const char *const prog_names[] = {
"handle_sys_connect",
Expand All @@ -20,6 +19,11 @@ void serial_test_probe_user(void)
struct bpf_program *kprobe_progs[prog_count];
struct bpf_object *obj;
static const int zero = 0;
struct test_pro_bss {
struct sockaddr_in old;
__u32 test_pid;
};
struct test_pro_bss results = {};
size_t i;

obj = bpf_object__open_file(obj_file, &opts);
Expand All @@ -34,6 +38,23 @@ void serial_test_probe_user(void)
goto cleanup;
}

{
struct bpf_map *bss_map;
struct test_pro_bss bss_init = {};

bss_init.test_pid = getpid();
bss_map = bpf_object__find_map_by_name(obj, "test_pro.bss");
if (!ASSERT_OK_PTR(bss_map, "find_bss_map"))
goto cleanup;
if (!ASSERT_EQ(bpf_map__value_size(bss_map), sizeof(bss_init),
"bss_size"))
goto cleanup;
err = bpf_map__set_initial_value(bss_map, &bss_init,
sizeof(bss_init));
if (!ASSERT_OK(err, "set_bss_init"))
goto cleanup;
}

err = bpf_object__load(obj);
if (CHECK(err, "obj_load", "err %d\n", err))
goto cleanup;
Expand Down Expand Up @@ -62,11 +83,13 @@ void serial_test_probe_user(void)
connect(sock_fd, &curr, sizeof(curr));
close(sock_fd);

err = bpf_map_lookup_elem(results_map_fd, &zero, &tmp);
err = bpf_map_lookup_elem(results_map_fd, &zero, &results);
if (CHECK(err, "get_kprobe_res",
"failed to get kprobe res: %d\n", err))
goto cleanup;

memcpy(&tmp, &results.old, sizeof(tmp));

in = (struct sockaddr_in *)&tmp;
if (CHECK(memcmp(&tmp, &orig, sizeof(orig)), "check_kprobe_res",
"wrong kprobe res from probe read: %s:%u\n",
Expand Down
13 changes: 11 additions & 2 deletions tools/testing/selftests/bpf/progs/test_probe_user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,22 @@
#include <bpf/bpf_core_read.h>
#include "bpf_misc.h"

static struct sockaddr_in old;
struct test_pro_bss {
struct sockaddr_in old;
__u32 test_pid;
};

struct test_pro_bss bss;

static int handle_sys_connect_common(struct sockaddr_in *uservaddr)
{
struct sockaddr_in new;
__u32 cur = bpf_get_current_pid_tgid() >> 32;

if (bss.test_pid && cur != bss.test_pid)
return 0;

bpf_probe_read_user(&old, sizeof(old), uservaddr);
bpf_probe_read_user(&bss.old, sizeof(bss.old), uservaddr);
__builtin_memset(&new, 0xab, sizeof(new));
bpf_probe_write_user(uservaddr, &new, sizeof(new));

Expand Down
Loading