* [LTP] [PATCH V3 2/2] syscalls/clone3: New tests
2020-03-20 4:24 [LTP] [PATCH V3 0/2] syscalls/clone3: New tests Viresh Kumar
2020-03-20 4:24 ` [LTP] [PATCH V3 1/2] syscalls/pidfd_send_signal: Move pidfd_send_signal.h to include/lapi/ Viresh Kumar
@ 2020-03-20 4:24 ` Viresh Kumar
2020-03-20 16:04 ` Cyril Hrubis
1 sibling, 1 reply; 4+ messages in thread
From: Viresh Kumar @ 2020-03-20 4:24 UTC (permalink / raw)
To: ltp
Add tests to check working of clone3() syscall.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
configure.ac | 1 +
include/lapi/clone.h | 49 +++++++
runtest/syscalls | 3 +
testcases/kernel/syscalls/clone3/.gitignore | 2 +
testcases/kernel/syscalls/clone3/Makefile | 7 +
testcases/kernel/syscalls/clone3/clone301.c | 150 ++++++++++++++++++++
testcases/kernel/syscalls/clone3/clone302.c | 102 +++++++++++++
7 files changed, 314 insertions(+)
create mode 100644 include/lapi/clone.h
create mode 100644 testcases/kernel/syscalls/clone3/.gitignore
create mode 100644 testcases/kernel/syscalls/clone3/Makefile
create mode 100644 testcases/kernel/syscalls/clone3/clone301.c
create mode 100644 testcases/kernel/syscalls/clone3/clone302.c
diff --git a/configure.ac b/configure.ac
index 238d1cde85f2..cf89bd8c351e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,7 @@ AC_CHECK_HEADERS(fts.h, [have_fts=1])
AC_SUBST(HAVE_FTS_H, $have_fts)
AC_CHECK_FUNCS([ \
+ clone3 \
copy_file_range \
epoll_pwait \
execveat \
diff --git a/include/lapi/clone.h b/include/lapi/clone.h
new file mode 100644
index 000000000000..2b8cbdbe08e0
--- /dev/null
+++ b/include/lapi/clone.h
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Linaro Limited. All rights reserved.
+ * Author: Viresh Kumar <viresh.kumar@linaro.org>
+ */
+
+#ifndef LAPI_CLONE_H__
+#define LAPI_CLONE_H__
+
+#include <sys/syscall.h>
+#include <linux/types.h>
+#include <sched.h>
+
+#include "config.h"
+#include "lapi/syscalls.h"
+
+#ifndef HAVE_CLONE3
+struct clone_args {
+ uint64_t __attribute__((aligned(8))) flags;
+ uint64_t __attribute__((aligned(8))) pidfd;
+ uint64_t __attribute__((aligned(8))) child_tid;
+ uint64_t __attribute__((aligned(8))) parent_tid;
+ uint64_t __attribute__((aligned(8))) exit_signal;
+ uint64_t __attribute__((aligned(8))) stack;
+ uint64_t __attribute__((aligned(8))) stack_size;
+ uint64_t __attribute__((aligned(8))) tls;
+};
+
+int clone3(struct clone_args *args, size_t size)
+{
+ return tst_syscall(__NR_clone3, args, size);
+}
+#endif
+
+#ifndef CLONE_PIDFD
+#define CLONE_PIDFD 0x00001000 /* set if a pidfd should be placed in parent */
+#endif
+
+void clone3_supported_by_kernel(void)
+{
+ if ((tst_kvercmp(5, 3, 0)) < 0) {
+ /* Check if the syscall is backported on an older kernel */
+ TEST(syscall(__NR_clone3, NULL, 0));
+ if (TST_RET == -1 && TST_ERR == ENOSYS)
+ tst_brk(TCONF, "Test not supported on kernel version < v5.3");
+ }
+}
+
+#endif /* LAPI_CLONE_H__ */
diff --git a/runtest/syscalls b/runtest/syscalls
index 6f2dcd82acf6..65ef53f33e0b 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -105,6 +105,9 @@ clone07 clone07
clone08 clone08
clone09 clone09
+clone301 clone301
+clone302 clone302
+
close01 close01
close02 close02
close08 close08
diff --git a/testcases/kernel/syscalls/clone3/.gitignore b/testcases/kernel/syscalls/clone3/.gitignore
new file mode 100644
index 000000000000..604cb903e33d
--- /dev/null
+++ b/testcases/kernel/syscalls/clone3/.gitignore
@@ -0,0 +1,2 @@
+clone301
+clone302
diff --git a/testcases/kernel/syscalls/clone3/Makefile b/testcases/kernel/syscalls/clone3/Makefile
new file mode 100644
index 000000000000..18896b6f28c0
--- /dev/null
+++ b/testcases/kernel/syscalls/clone3/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+top_srcdir ?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/clone3/clone301.c b/testcases/kernel/syscalls/clone3/clone301.c
new file mode 100644
index 000000000000..08f58f4ae2f2
--- /dev/null
+++ b/testcases/kernel/syscalls/clone3/clone301.c
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Viresh Kumar <viresh.kumar@linaro.org>
+ *
+ * Basic clone3() test.
+ */
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+
+#include "tst_test.h"
+#include "lapi/clone.h"
+#include "lapi/pidfd_send_signal.h"
+
+#define CHILD_SIGNAL SIGUSR1
+#define DATA 777
+
+static void parent_rx_signal(int sig, siginfo_t *info, void *ucontext);
+static void child_rx_signal(int sig, siginfo_t *info, void *ucontext);
+
+static struct sigaction psig_action = {
+ .sa_sigaction = parent_rx_signal,
+ .sa_flags = SA_SIGINFO,
+};
+
+static struct sigaction csig_action = {
+ .sa_sigaction = child_rx_signal,
+ .sa_flags = SA_SIGINFO,
+};
+
+static siginfo_t uinfo = {
+ .si_signo = CHILD_SIGNAL,
+ .si_code = SI_QUEUE,
+ .si_value.sival_int = DATA,
+};
+
+static int pidfd, child_tid, parent_tid, parent_received_signal;
+static volatile int child_received_signal;
+static struct clone_args *args;
+
+static struct tcase {
+ uint64_t flags;
+ int exit_signal;
+} tcases[] = {
+ {0, SIGCHLD},
+ {0, SIGUSR2},
+ {CLONE_FS, SIGCHLD},
+ {CLONE_NEWPID, SIGCHLD},
+ {CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_PIDFD, SIGCHLD},
+};
+
+static void parent_rx_signal(int sig, siginfo_t *info, void *ucontext)
+{
+ parent_received_signal = sig;
+}
+
+static void child_rx_signal(int sig, siginfo_t *info, void *ucontext)
+{
+ if (sig == CHILD_SIGNAL && info && info->si_value.sival_int == DATA)
+ child_received_signal = 1;
+}
+
+static void do_child(int clone_pidfd, int n)
+{
+ int count = 1000;
+
+ if (clone_pidfd) {
+ child_received_signal = 0;
+ SAFE_SIGACTION(CHILD_SIGNAL, &csig_action, NULL);
+
+ TST_CHECKPOINT_WAKE(0);
+
+ while(!child_received_signal && --count)
+ usleep(100);
+
+ if (child_received_signal)
+ tst_res(TPASS, "clone3() passed: Child received correct signal (index %d)", n);
+ else
+ tst_res(TFAIL, "clone3() failed: Child received incorrect signal (index %d)", n);
+ }
+
+ exit(0);
+}
+
+static void run(unsigned int n)
+{
+ struct tcase *tc = &tcases[n];
+ int status, clone_pidfd = tc->flags & CLONE_PIDFD;
+ pid_t pid;
+
+ args->flags = tc->flags;
+ args->pidfd = (uint64_t)(&pidfd);
+ args->child_tid = (uint64_t)(&child_tid);
+ args->parent_tid = (uint64_t)(&parent_tid);
+ args->exit_signal = tc->exit_signal;
+ args->stack = 0;
+ args->stack_size = 0;
+ args->tls = 0;
+
+ TEST(pid = clone3(args, sizeof(*args)));
+ if (pid < 0) {
+ tst_res(TFAIL | TTERRNO, "clone3() failed (%d)", n);
+ return;
+ }
+
+ if (!pid)
+ do_child(clone_pidfd, n);
+
+ parent_received_signal = 0;
+ SAFE_SIGACTION(tc->exit_signal, &psig_action, NULL);
+
+ /* Need to send signal to child process */
+ if (clone_pidfd) {
+ TST_CHECKPOINT_WAIT(0);
+
+ TEST(pidfd_send_signal(pidfd, CHILD_SIGNAL, &uinfo, 0));
+ if (TST_RET != 0) {
+ tst_res(TFAIL | TTERRNO, "pidfd_send_signal() failed");
+ return;
+ }
+ }
+
+ SAFE_WAITPID(pid, &status, __WALL);
+
+ if (parent_received_signal == tc->exit_signal)
+ tst_res(TPASS, "clone3() passed: Parent received correct signal (index %d)", n);
+ else
+ tst_res(TFAIL, "clone3() failed: Parent received incorrect signal (index %d)", n);
+}
+
+static void setup(void)
+{
+ clone3_supported_by_kernel();
+
+ uinfo.si_pid = getpid();
+ uinfo.si_uid = getuid();
+}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+ .needs_root = 1,
+ .needs_tmpdir = 1,
+ .needs_checkpoints = 1,
+ .bufs = (struct tst_buffers []) {
+ {&args, .size = sizeof(*args)},
+ {},
+ }
+};
diff --git a/testcases/kernel/syscalls/clone3/clone302.c b/testcases/kernel/syscalls/clone3/clone302.c
new file mode 100644
index 000000000000..2f99e15d2cc4
--- /dev/null
+++ b/testcases/kernel/syscalls/clone3/clone302.c
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Viresh Kumar <viresh.kumar@linaro.org>
+ *
+ * Basic clone3() test to check various failures.
+ */
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+
+#include "tst_test.h"
+#include "lapi/clone.h"
+
+static struct clone_args *valid_args, *invalid_args;
+unsigned long stack;
+static int *invalid_address;
+
+static struct tcase {
+ const char *name;
+ struct clone_args **args;
+ size_t size;
+ uint64_t flags;
+ int **pidfd;
+ int **child_tid;
+ int **parent_tid;
+ int exit_signal;
+ unsigned long stack;
+ unsigned long stack_size;
+ unsigned long tls;
+ int exp_errno;
+} tcases[] = {
+ {"invalid args", &invalid_args, sizeof(*valid_args), 0, NULL, NULL, NULL, SIGCHLD, 0, 0, 0, EFAULT},
+ {"zero size", &valid_args, 0, 0, NULL, NULL, NULL, SIGCHLD, 0, 0, 0, EINVAL},
+ {"short size", &valid_args, sizeof(*valid_args) - 1, 0, NULL, NULL, NULL, SIGCHLD, 0, 0, 0, EINVAL},
+ {"extra size", &valid_args, sizeof(*valid_args) + 1, 0, NULL, NULL, NULL, SIGCHLD, 0, 0, 0, EFAULT},
+ {"sighand-no-VM", &valid_args, sizeof(*valid_args), CLONE_SIGHAND, NULL, NULL, NULL, SIGCHLD, 0, 0, 0, EINVAL},
+ {"thread-no-sighand", &valid_args, sizeof(*valid_args), CLONE_THREAD, NULL, NULL, NULL, SIGCHLD, 0, 0, 0, EINVAL},
+ {"fs-newns", &valid_args, sizeof(*valid_args), CLONE_FS | CLONE_NEWNS, NULL, NULL, NULL, SIGCHLD, 0, 0, 0, EINVAL},
+ {"invalid pidfd", &valid_args, sizeof(*valid_args), CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_PIDFD, &invalid_address, NULL, NULL, SIGCHLD, 0, 0, 0, EFAULT},
+ {"invalid childtid", &valid_args, sizeof(*valid_args), CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_PIDFD, NULL, &invalid_address, NULL, SIGCHLD, 0, 0, 0, EFAULT},
+ {"invalid parenttid", &valid_args, sizeof(*valid_args), CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_PIDFD, NULL, NULL, &invalid_address, SIGCHLD, 0, 0, 0, EFAULT},
+ {"invalid signal", &valid_args, sizeof(*valid_args), 0, NULL, NULL, NULL, CSIGNAL + 1, 0, 0, 0, EINVAL},
+ {"zero-stack-size", &valid_args, sizeof(*valid_args), 0, NULL, NULL, NULL, SIGCHLD, (unsigned long)&stack, 0, 0, EINVAL},
+ {"invalid-stack", &valid_args, sizeof(*valid_args), 0, NULL, NULL, NULL, SIGCHLD, 0, 4, 0, EINVAL},
+};
+
+static void setup(void)
+{
+ clone3_supported_by_kernel();
+
+ invalid_address = tst_get_bad_addr(NULL);
+ invalid_args = tst_get_bad_addr(NULL);
+}
+
+static void run(unsigned int n)
+{
+ struct tcase *tc = &tcases[n];
+ struct clone_args *args = *tc->args;
+
+ if (args == valid_args) {
+ args->flags = tc->flags;
+ if (tc->pidfd)
+ args->pidfd = (uint64_t)(*tc->pidfd);
+ if (tc->child_tid)
+ args->child_tid = (uint64_t)(*tc->child_tid);
+ if (tc->parent_tid)
+ args->parent_tid = (uint64_t)(*tc->parent_tid);
+ args->exit_signal = tc->exit_signal;
+ args->stack = tc->stack;
+ args->stack_size = tc->stack_size;
+ args->tls = tc->tls;
+ }
+
+ TEST(clone3(args, tc->size));
+
+ if (!TST_RET)
+ exit(EXIT_SUCCESS);
+
+ if (TST_RET >= 0) {
+ tst_res(TFAIL, "%s: clone3() passed unexpectedly", tc->name);
+ return;
+ }
+
+ if (tc->exp_errno != TST_ERR) {
+ tst_res(TFAIL | TTERRNO, "%s: clone3() should fail with %s",
+ tc->name, tst_strerrno(tc->exp_errno));
+ return;
+ }
+
+ tst_res(TPASS | TTERRNO, "%s: clone3() failed as expected", tc->name);
+}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcases),
+ .test = run,
+ .setup = setup,
+ .needs_tmpdir = 1,
+ .bufs = (struct tst_buffers []) {
+ {&valid_args, .size = sizeof(*valid_args)},
+ {},
+ }
+};
--
2.21.0.rc0.269.g1a574e7a288b
^ permalink raw reply related [flat|nested] 4+ messages in thread