From nobody Tue Nov 26 22:40:56 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 544511FDFB3; Wed, 16 Oct 2024 08:42:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729068140; cv=none; b=RcF+pN76kbpT91v/1Glr2BnBKiVu606NDlldzErIsKsK9cqqjYzlNUhCqw5xPvrwdfYcB1vaAxbkUVB2hszlmNAO8ftofuWFhsQ/NUeYiCyWED9nU1IK8mawCd0c/enhBd2TLMHBPIePjACfDPpMM56g7TMdkZ6yesGSbdxDpls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729068140; c=relaxed/simple; bh=wHRUPCInftXktRQjwW5qErEUkBxtnkI+ct5K4x0Kjeg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AGTH+t7OU2BCWq35Tmg7ho1T5xSgeCd5saXmKARMYo6EC3XGuxzlqTag+t+ckEB28TaWjZwUPxFuEUQiWfZLXq2eUxdvaC9YXXUAYT20vgbPIwM6hOFf56TnhecC3MVJXqHspp8DYMTY6hGnmc3CE7tUggoZq/l51tIqVPh0D1o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H8EJI6Qy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H8EJI6Qy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB71BC4CEC5; Wed, 16 Oct 2024 08:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729068139; bh=wHRUPCInftXktRQjwW5qErEUkBxtnkI+ct5K4x0Kjeg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=H8EJI6QyzVq7BVG6U+eK2mXppjc0yF8hGs82w5eyIL7bWyWF/hgzvWOLYFpUOqrLp wzKqDWUwP7zCzEVQ01PujAbM+GZTrnFiX400L583s1i9r51VP/1hixrQJhTGpKLHvY N4D/LSPak1HIeglNS13+GQSqC4I4xX0Hjqrh8lwqeHPIvHg94Z07V9ulAMmx54v/6v QiSxTGlKgqAob9nqQEaVMIErDl985X68bunNUgA4UfJ8jFoo0cpUWS9oGfjTTm5+1W Zx1IDoaqgNq202BkP6dLtuzxzpo9Xrd6SaAb3Mmhg4nUq4D0WImcN0ACc1Xyvgav5A SwXEYUPL4kv8A== From: Puranjay Mohan To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, puranjay12@gmail.com Subject: [PATCH bpf-next v5 2/2] selftests/bpf: Augment send_signal test with remote signaling Date: Wed, 16 Oct 2024 08:41:36 +0000 Message-Id: <20241016084136.10305-3-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20241016084136.10305-1-puranjay@kernel.org> References: <20241016084136.10305-1-puranjay@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add testcases to test bpf_send_signal_task(). In these new test cases, the main process triggers the BPF program and the forked process receives the signals. The target process's signal handler receives a cookie from the bpf program. Signed-off-by: Puranjay Mohan --- .../selftests/bpf/prog_tests/send_signal.c | 133 +++++++++++++----- .../bpf/progs/test_send_signal_kern.c | 35 ++++- 2 files changed, 130 insertions(+), 38 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/send_signal.c b/tools/t= esting/selftests/bpf/prog_tests/send_signal.c index 6cc69900b3106..1aed94ec14efb 100644 --- a/tools/testing/selftests/bpf/prog_tests/send_signal.c +++ b/tools/testing/selftests/bpf/prog_tests/send_signal.c @@ -8,17 +8,25 @@ static int sigusr1_received; =20 static void sigusr1_handler(int signum) { - sigusr1_received =3D 1; + sigusr1_received =3D 8; +} + +static void sigusr1_siginfo_handler(int s, siginfo_t *i, void *v) +{ + sigusr1_received =3D (int)(long long)i->si_value.sival_ptr; } =20 static void test_send_signal_common(struct perf_event_attr *attr, - bool signal_thread) + bool signal_thread, bool remote) { struct test_send_signal_kern *skel; + struct sigaction sa; int pipe_c2p[2], pipe_p2c[2]; int err =3D -1, pmu_fd =3D -1; + volatile int j =3D 0; char buf[256]; pid_t pid; + int old_prio; =20 if (!ASSERT_OK(pipe(pipe_c2p), "pipe_c2p")) return; @@ -39,11 +47,14 @@ static void test_send_signal_common(struct perf_event_a= ttr *attr, } =20 if (pid =3D=3D 0) { - int old_prio; - volatile int j =3D 0; - /* install signal handler and notify parent */ - ASSERT_NEQ(signal(SIGUSR1, sigusr1_handler), SIG_ERR, "signal"); + if (remote) { + sa.sa_sigaction =3D sigusr1_siginfo_handler; + sa.sa_flags =3D SA_RESTART | SA_SIGINFO; + ASSERT_NEQ(sigaction(SIGUSR1, &sa, NULL), -1, "sigaction"); + } else { + ASSERT_NEQ(signal(SIGUSR1, sigusr1_handler), SIG_ERR, "signal"); + } =20 close(pipe_c2p[0]); /* close read */ close(pipe_p2c[1]); /* close write */ @@ -52,10 +63,12 @@ static void test_send_signal_common(struct perf_event_a= ttr *attr, * that if an interrupt happens, the underlying task * is this process. */ - errno =3D 0; - old_prio =3D getpriority(PRIO_PROCESS, 0); - ASSERT_OK(errno, "getpriority"); - ASSERT_OK(setpriority(PRIO_PROCESS, 0, -20), "setpriority"); + if (!remote) { + errno =3D 0; + old_prio =3D getpriority(PRIO_PROCESS, 0); + ASSERT_OK(errno, "getpriority"); + ASSERT_OK(setpriority(PRIO_PROCESS, 0, -20), "setpriority"); + } =20 /* notify parent signal handler is installed */ ASSERT_EQ(write(pipe_c2p[1], buf, 1), 1, "pipe_write"); @@ -66,20 +79,25 @@ static void test_send_signal_common(struct perf_event_a= ttr *attr, /* wait a little for signal handler */ for (int i =3D 0; i < 1000000000 && !sigusr1_received; i++) { j /=3D i + j + 1; - if (!attr) - /* trigger the nanosleep tracepoint program. */ - usleep(1); + if (remote) + sleep(1); + else + if (!attr) + /* trigger the nanosleep tracepoint program. */ + usleep(1); } =20 - buf[0] =3D sigusr1_received ? '2' : '0'; - ASSERT_EQ(sigusr1_received, 1, "sigusr1_received"); + buf[0] =3D sigusr1_received; + + ASSERT_EQ(sigusr1_received, 8, "sigusr1_received"); ASSERT_EQ(write(pipe_c2p[1], buf, 1), 1, "pipe_write"); =20 /* wait for parent notification and exit */ ASSERT_EQ(read(pipe_p2c[0], buf, 1), 1, "pipe_read"); =20 /* restore the old priority */ - ASSERT_OK(setpriority(PRIO_PROCESS, 0, old_prio), "setpriority"); + if (!remote) + ASSERT_OK(setpriority(PRIO_PROCESS, 0, old_prio), "setpriority"); =20 close(pipe_c2p[1]); close(pipe_p2c[0]); @@ -93,6 +111,17 @@ static void test_send_signal_common(struct perf_event_a= ttr *attr, if (!ASSERT_OK_PTR(skel, "skel_open_and_load")) goto skel_open_load_failure; =20 + /* boost with a high priority so we got a higher chance + * that if an interrupt happens, the underlying task + * is this process. + */ + if (remote) { + errno =3D 0; + old_prio =3D getpriority(PRIO_PROCESS, 0); + ASSERT_OK(errno, "getpriority"); + ASSERT_OK(setpriority(PRIO_PROCESS, 0, -20), "setpriority"); + } + if (!attr) { err =3D test_send_signal_kern__attach(skel); if (!ASSERT_OK(err, "skel_attach")) { @@ -100,8 +129,12 @@ static void test_send_signal_common(struct perf_event_= attr *attr, goto destroy_skel; } } else { - pmu_fd =3D syscall(__NR_perf_event_open, attr, pid, -1 /* cpu */, - -1 /* group id */, 0 /* flags */); + if (!remote) + pmu_fd =3D syscall(__NR_perf_event_open, attr, pid, -1 /* cpu */, + -1 /* group id */, 0 /* flags */); + else + pmu_fd =3D syscall(__NR_perf_event_open, attr, getpid(), -1 /* cpu */, + -1 /* group id */, 0 /* flags */); if (!ASSERT_GE(pmu_fd, 0, "perf_event_open")) { err =3D -1; goto destroy_skel; @@ -119,11 +152,30 @@ static void test_send_signal_common(struct perf_event= _attr *attr, /* trigger the bpf send_signal */ skel->bss->signal_thread =3D signal_thread; skel->bss->sig =3D SIGUSR1; - skel->bss->pid =3D pid; + if (!remote) { + skel->bss->target_pid =3D 0; + skel->bss->pid =3D pid; + } else { + skel->bss->target_pid =3D pid; + skel->bss->pid =3D getpid(); + } =20 /* notify child that bpf program can send_signal now */ ASSERT_EQ(write(pipe_p2c[1], buf, 1), 1, "pipe_write"); =20 + /* For the remote test, the BPF program is triggered from this + * process but the other process/thread is signaled. + */ + if (remote) { + if (!attr) { + for (int i =3D 0; i < 10; i++) + usleep(1); + } else { + for (int i =3D 0; i < 100000000; i++) + j /=3D i + 1; + } + } + /* wait for result */ err =3D read(pipe_c2p[0], buf, 1); if (!ASSERT_GE(err, 0, "reading pipe")) @@ -133,7 +185,7 @@ static void test_send_signal_common(struct perf_event_a= ttr *attr, goto disable_pmu; } =20 - ASSERT_EQ(buf[0], '2', "incorrect result"); + ASSERT_EQ(buf[0], 8, "incorrect result"); =20 /* notify child safe to exit */ ASSERT_EQ(write(pipe_p2c[1], buf, 1), 1, "pipe_write"); @@ -142,18 +194,21 @@ static void test_send_signal_common(struct perf_event= _attr *attr, close(pmu_fd); destroy_skel: test_send_signal_kern__destroy(skel); + /* restore the old priority */ + if (remote) + ASSERT_OK(setpriority(PRIO_PROCESS, 0, old_prio), "setpriority"); skel_open_load_failure: close(pipe_c2p[0]); close(pipe_p2c[1]); wait(NULL); } =20 -static void test_send_signal_tracepoint(bool signal_thread) +static void test_send_signal_tracepoint(bool signal_thread, bool remote) { - test_send_signal_common(NULL, signal_thread); + test_send_signal_common(NULL, signal_thread, remote); } =20 -static void test_send_signal_perf(bool signal_thread) +static void test_send_signal_perf(bool signal_thread, bool remote) { struct perf_event_attr attr =3D { .freq =3D 1, @@ -162,10 +217,10 @@ static void test_send_signal_perf(bool signal_thread) .config =3D PERF_COUNT_SW_CPU_CLOCK, }; =20 - test_send_signal_common(&attr, signal_thread); + test_send_signal_common(&attr, signal_thread, remote); } =20 -static void test_send_signal_nmi(bool signal_thread) +static void test_send_signal_nmi(bool signal_thread, bool remote) { struct perf_event_attr attr =3D { .sample_period =3D 1, @@ -191,21 +246,35 @@ static void test_send_signal_nmi(bool signal_thread) close(pmu_fd); } =20 - test_send_signal_common(&attr, signal_thread); + test_send_signal_common(&attr, signal_thread, remote); } =20 void test_send_signal(void) { if (test__start_subtest("send_signal_tracepoint")) - test_send_signal_tracepoint(false); + test_send_signal_tracepoint(false, false); if (test__start_subtest("send_signal_perf")) - test_send_signal_perf(false); + test_send_signal_perf(false, false); if (test__start_subtest("send_signal_nmi")) - test_send_signal_nmi(false); + test_send_signal_nmi(false, false); if (test__start_subtest("send_signal_tracepoint_thread")) - test_send_signal_tracepoint(true); + test_send_signal_tracepoint(true, false); if (test__start_subtest("send_signal_perf_thread")) - test_send_signal_perf(true); + test_send_signal_perf(true, false); if (test__start_subtest("send_signal_nmi_thread")) - test_send_signal_nmi(true); + test_send_signal_nmi(true, false); + + /* Signal remote thread and thread group */ + if (test__start_subtest("send_signal_tracepoint_remote")) + test_send_signal_tracepoint(false, true); + if (test__start_subtest("send_signal_perf_remote")) + test_send_signal_perf(false, true); + if (test__start_subtest("send_signal_nmi_remote")) + test_send_signal_nmi(false, true); + if (test__start_subtest("send_signal_tracepoint_thread_remote")) + test_send_signal_tracepoint(true, true); + if (test__start_subtest("send_signal_perf_thread_remote")) + test_send_signal_perf(true, true); + if (test__start_subtest("send_signal_nmi_thread_remote")) + test_send_signal_nmi(true, true); } diff --git a/tools/testing/selftests/bpf/progs/test_send_signal_kern.c b/to= ols/testing/selftests/bpf/progs/test_send_signal_kern.c index 92354cd720440..176a355e30624 100644 --- a/tools/testing/selftests/bpf/progs/test_send_signal_kern.c +++ b/tools/testing/selftests/bpf/progs/test_send_signal_kern.c @@ -1,27 +1,50 @@ // SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2019 Facebook -#include +#include #include #include =20 -__u32 sig =3D 0, pid =3D 0, status =3D 0, signal_thread =3D 0; +struct task_struct *bpf_task_from_pid(int pid) __ksym; +void bpf_task_release(struct task_struct *p) __ksym; +int bpf_send_signal_task(struct task_struct *task, int sig, enum pid_type = type, u64 value) __ksym; + +__u32 sig =3D 0, pid =3D 0, status =3D 0, signal_thread =3D 0, target_pid = =3D 0; =20 static __always_inline int bpf_send_signal_test(void *ctx) { + struct task_struct *target_task =3D NULL; int ret; + u64 value; =20 if (status !=3D 0 || pid =3D=3D 0) return 0; =20 if ((bpf_get_current_pid_tgid() >> 32) =3D=3D pid) { - if (signal_thread) - ret =3D bpf_send_signal_thread(sig); - else - ret =3D bpf_send_signal(sig); + if (target_pid) { + target_task =3D bpf_task_from_pid(target_pid); + if (!target_task) + return 0; + value =3D 8; + } + + if (signal_thread) { + if (target_pid) + ret =3D bpf_send_signal_task(target_task, sig, PIDTYPE_PID, value); + else + ret =3D bpf_send_signal_thread(sig); + } else { + if (target_pid) + ret =3D bpf_send_signal_task(target_task, sig, PIDTYPE_TGID, value); + else + ret =3D bpf_send_signal(sig); + } if (ret =3D=3D 0) status =3D 1; } =20 + if (target_task) + bpf_task_release(target_task); + return 0; } =20 --=20 2.40.1