From: Andrei Vagin <avagin@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>
Cc: linux-kernel@vger.kernel.org, Kees Cook <keescook@chromium.org>,
Christian Brauner <brauner@kernel.org>,
Andrei Vagin <avagin@gmail.com>,
Andy Lutomirski <luto@amacapital.net>,
Juri Lelli <juri.lelli@redhat.com>,
Peter Oskolkov <posk@google.com>,
Tycho Andersen <tycho@tycho.pizza>,
Will Drewry <wad@chromium.org>
Subject: [PATCH 5/5] selftest/seccomp: add a new test for the sync mode of seccomp_user_notify
Date: Tue, 10 Jan 2023 13:30:10 -0800 [thread overview]
Message-ID: <20230110213010.2683185-6-avagin@google.com> (raw)
In-Reply-To: <20230110213010.2683185-1-avagin@google.com>
From: Andrei Vagin <avagin@gmail.com>
Test output:
RUN global.user_notification_sync ...
seccomp_bpf.c:4279:user_notification_sync:basic: 8655 nsec/syscall
seccomp_bpf.c:4279:user_notification_sync:sync: 2919 nsec/syscall
OK global.user_notification_sync
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
tools/testing/selftests/seccomp/seccomp_bpf.c | 88 +++++++++++++++++++
1 file changed, 88 insertions(+)
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 9c2f448bb3a9..e4207cddd668 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -4243,6 +4243,94 @@ TEST(user_notification_addfd_rlimit)
close(memfd);
}
+/* USER_NOTIF_BENCH_TIMEOUT is 100 miliseconds. */
+#define USER_NOTIF_BENCH_TIMEOUT 100000000ULL
+#define NSECS_PER_SEC 1000000000ULL
+
+#ifndef SECCOMP_USER_NOTIF_FD_SYNC_WAKE_UP
+#define SECCOMP_USER_NOTIF_FD_SYNC_WAKE_UP (1UL << 0)
+#define SECCOMP_IOCTL_NOTIF_SET_FLAGS SECCOMP_IOW(4, __u64)
+#endif
+
+static uint64_t user_notification_sync_loop(struct __test_metadata *_metadata,
+ char *test_name, int listener)
+{
+ struct timespec ts;
+ uint64_t start, end, nr;
+ struct seccomp_notif req = {};
+ struct seccomp_notif_resp resp = {};
+
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ start = ts.tv_nsec + ts.tv_sec * NSECS_PER_SEC;
+ for (end = start, nr = 0; end - start < USER_NOTIF_BENCH_TIMEOUT; nr++) {
+ memset(&req, 0, sizeof(req));
+ req.pid = 0;
+ ASSERT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_RECV, &req), 0);
+
+ ASSERT_EQ(req.data.nr, __NR_getppid);
+
+ resp.id = req.id;
+ resp.error = 0;
+ resp.val = USER_NOTIF_MAGIC;
+ resp.flags = 0;
+ ASSERT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_SEND, &resp), 0);
+
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ end = ts.tv_nsec + ts.tv_sec * NSECS_PER_SEC;
+ }
+ TH_LOG("%s:\t%lld nsec/syscall", test_name, USER_NOTIF_BENCH_TIMEOUT / nr);
+ return nr;
+}
+
+TEST(user_notification_sync)
+{
+ pid_t pid;
+ long ret;
+ int status, listener;
+ unsigned long calls, sync_calls;
+
+ ret = prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0);
+ ASSERT_EQ(0, ret) {
+ TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!");
+ }
+
+ listener = user_notif_syscall(__NR_getppid,
+ SECCOMP_FILTER_FLAG_NEW_LISTENER);
+ ASSERT_GE(listener, 0);
+
+ pid = fork();
+ ASSERT_GE(pid, 0);
+
+ if (pid == 0) {
+ while (1) {
+ ret = syscall(__NR_getppid);
+ if (ret == USER_NOTIF_MAGIC)
+ continue;
+ break;
+ }
+ _exit(1);
+ }
+
+ calls = user_notification_sync_loop(_metadata, "basic", listener);
+
+ /* Try to set invalid flags. */
+ EXPECT_SYSCALL_RETURN(-EINVAL,
+ ioctl(listener, SECCOMP_IOCTL_NOTIF_SET_FLAGS, 0xffffffff, 0));
+
+ ASSERT_EQ(ioctl(listener, SECCOMP_IOCTL_NOTIF_SET_FLAGS,
+ SECCOMP_USER_NOTIF_FD_SYNC_WAKE_UP, 0), 0);
+
+ sync_calls = user_notification_sync_loop(_metadata, "sync", listener);
+
+ EXPECT_GT(sync_calls, calls);
+
+ kill(pid, SIGKILL);
+ ASSERT_EQ(waitpid(pid, &status, 0), pid);
+ ASSERT_EQ(true, WIFSIGNALED(status));
+ ASSERT_EQ(SIGKILL, WTERMSIG(status));
+}
+
+
/* Make sure PTRACE_O_SUSPEND_SECCOMP requires CAP_SYS_ADMIN. */
FIXTURE(O_SUSPEND_SECCOMP) {
pid_t pid;
--
2.39.0.314.g84b9a713c41-goog
next prev parent reply other threads:[~2023-01-10 21:32 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 21:30 [PATCH 0/5 v3 RESEND] seccomp: add the synchronous mode for seccomp_unotify Andrei Vagin
2023-01-10 21:30 ` [PATCH 1/5] seccomp: don't use semaphore and wait_queue together Andrei Vagin
2023-01-12 14:58 ` Tycho Andersen
2023-01-13 21:51 ` Andrei Vagin
2023-01-16 9:48 ` Peter Zijlstra
2023-01-10 21:30 ` [PATCH 2/5] sched: add WF_CURRENT_CPU and externise ttwu Andrei Vagin
2023-01-12 7:35 ` Chen Yu
2023-01-13 21:39 ` Andrei Vagin
2023-01-14 15:59 ` Chen Yu
2023-01-18 6:10 ` Andrei Vagin
2023-01-10 21:30 ` [PATCH 3/5] sched: add a few helpers to wake up tasks on the current cpu Andrei Vagin
2023-01-16 9:59 ` Peter Zijlstra
2023-01-19 6:45 ` Andrei Vagin
2023-01-19 10:09 ` Peter Zijlstra
2023-01-10 21:30 ` [PATCH 4/5] seccomp: add the synchronous mode for seccomp_unotify Andrei Vagin
2023-01-12 15:00 ` Tycho Andersen
2023-01-14 1:16 ` Andrei Vagin
2023-01-10 21:30 ` Andrei Vagin [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-11 7:31 [PATCH 0/5 v3] " Andrei Vagin
2022-11-11 7:31 ` [PATCH 5/5] selftest/seccomp: add a new test for the sync mode of seccomp_user_notify Andrei Vagin
2022-10-20 1:10 [PATCH 0/5 v2] seccomp: add the synchronous mode for seccomp_unotify Andrei Vagin
2022-10-20 1:10 ` [PATCH 5/5] selftest/seccomp: add a new test for the sync mode of seccomp_user_notify Andrei Vagin
2022-10-20 5:04 ` Kees Cook
2022-10-21 0:53 ` Andrei Vagin
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=20230110213010.2683185-6-avagin@google.com \
--to=avagin@google.com \
--cc=avagin@gmail.com \
--cc=brauner@kernel.org \
--cc=dietmar.eggemann@arm.com \
--cc=juri.lelli@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=posk@google.com \
--cc=tycho@tycho.pizza \
--cc=vincent.guittot@linaro.org \
--cc=wad@chromium.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;
as well as URLs for NNTP newsgroup(s).