syscalls/clone3: New tests
PATCH 1/1 syscalls/clone3: New tests
Add tests to check working of clone3() syscall.
--- 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 | 67 ++++++++++++++++ testcases/kernel/syscalls/clone3/clone302.c | 86 +++++++++++++++++++++ 7 files changed, 215 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
configure.ac +1 -0
@@ -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 \
include/lapi/clone.h new file +49 -0
49 lines not on this page · raw message
runtest/syscalls +3 -0
@@ -105,6 +105,9 @@ clone07 clone07 clone08 clone08 clone09 clone09 +clone301 clone301 +clone302 clone302 + close01 close01 close02 close02 close08 close08
testcases/kernel/syscalls/clone3/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +clone301 +clone302
testcases/kernel/syscalls/clone3/Makefile new file +7 -0
@@ -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
testcases/kernel/syscalls/clone3/clone301.c new file +67 -0
67 lines not on this page · raw message
testcases/kernel/syscalls/clone3/clone302.c new file +86 -0
86 lines not on this page · raw message
Signature · 1 line
2.21.0.rc0.269.g1a574e7a288b
PATCH 1/1 syscalls/clone3: New tests
Hi!
Quoted 181 lines
Signed-off-by Viresh Kumar <[email protected]>--- 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 | 67 ++++++++++++++++ testcases/kernel/syscalls/clone3/clone302.c | 86 +++++++++++++++++++++ 7 files changed, 215 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.cconfigure.ac +1
-0@@ -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 \include/lapi/clone.h new file +49
-0@@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2020 Linaro Limited. All rights reserved. +* Author: Viresh Kumar <[email protected]> +*/ + +#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__ */ runtest/syscalls +3
-0@@ -105,6 +105,9 @@ clone07 clone07 clone08 clone08 clone09 clone09 +clone301 clone301 +clone302 clone302 + close01 close01 close02 close02 close08 close08testcases/kernel/syscalls/clone3/.gitignore new file +2
-0@@ -0,0 +1,2 @@ +clone301 +clone302testcases/kernel/syscalls/clone3/Makefile new file +7
-0@@ -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.mktestcases/kernel/syscalls/clone3/clone301.c new file +57
-0@@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2020 Viresh Kumar <[email protected]> +* +* Basic clone3() test. +*/ +#define _GNU_SOURCE + +#include <stdlib.h> + +#include "tst_test.h" +#include "lapi/clone.h" + +static struct clone_args *args; +static int pidfd, child_tid, parent_tid; + +static struct tcase { +uint64_t flags; +int exit_signal; +} tcases[] = { + {0 ,SIGCHLD }, + {CLONE_FS ,SIGCHLD }, + {CLONE_NEWPID ,SIGCHLD }, + {CLONE_PARENT_SETTID |CLONE_CHILD_SETTID |CLONE_PIDFD ,SIGCHLD }, +}; + +static void run (unsigned int n) +{ +struct tcase *tc = &tcases[n]; +pid_t pid; +int status; + + 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) +exit (EXIT_SUCCESS ); + +SAFE_WAIT (&status); + +tst_res (TPASS ,"clone3() passed with status:%d, pidfd:%d, ctid:%d, ptid:%d (index %d)" , +WEXITSTATUS (status), pidfd, child_tid, parent_tid, n); +} +
testcases/kernel/syscalls/clone3/clone301.c line 67
Quoted 10 lines
testcases/kernel/syscalls/clone3/clone301.c new file +10
-0+static struct tst_test test = { + .tcnt =ARRAY_SIZE (tcases), + .test = run, + .setup = clone3_supported_by_kernel, + .needs_tmpdir =1 , + .bufs = (struct tst_buffers []) { + {&args, .size =sizeof (*args)}, + {}, + } +};
We need root for the CLONE_NEWPID, so I guess that we need .needs_root=1 added here. I can add that before applying the rest looks good to me.
Also I guess that we should add test that would check that the pidfd is valid, i.e. that it could be used to send a signal to the child process, but that could be added later in a subsequent patch.
And the same for the exit signal, we should add a test that the child send requested signal to the parent on exit.
Quoted 35 lines
testcases/kernel/syscalls/clone3/clone302.c new file +29
-0@@ -0,0 +1,86 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2020 Viresh Kumar <[email protected]> +* +* 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 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;
testcases/kernel/syscalls/clone3/clone302.c line 39
Quoted 10 lines
testcases/kernel/syscalls/clone3/clone302.c new file +10
-0+} 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}, + {"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},
What about invalid exit signal? I guess that signal is 32bit so anything that has non-zero bits in upper 32bits of the exit_signal should yield EINVAL as well.
Also all pidfd, child_tid, and parent_tid should be tested with invalid pointers right?
Quoted 50 lines
testcases/kernel/syscalls/clone3/clone302.c new file +47
-0+}; + +static void run (unsigned int n) +{ +struct tcase *tc = &tcases[n]; +struct clone_args *args = *tc->args; + +if (args) { + args->flags = tc->flags; + args->pidfd = (uint64_t )(tc->pidfd); + args->child_tid = (uint64_t )(tc->child_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 = clone3_supported_by_kernel, + .needs_tmpdir =1 , + .bufs = (struct tst_buffers []) { + {&valid_args, .size =sizeof (*valid_args)}, + {}, + } +};Signature · 1 line
2.21.0.rc0.269.g1a574e7a288b
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 syscalls/clone3: New tests
Quoted 2 lines · Cyril Hrubis
Also all pidfd,
child_tid, andparent_tidshould be tested with invalid pointers right?
I tried this but here is the problem ..
- pidfd: Kernel doesn't check this pointer and we get EFAULT.
- child_tid: Kernel checks for valid pointer and doesn't use the variable if NULL, so test passes unexpectedly.
- parent_tid: Kernel doesn't verify the pointer, but doesn't return the error code properly and so test passes unexpectedly.
And so I wasn't sure on what we should be doing really.
Signature · 1 line
viresh
PATCH 1/1 syscalls/clone3: New tests
Hi!
Quoted 5 lines
I tried this but here is the problem ..
- pidfd: Kernel doesn't check this pointer and we get EFAULT.
-child_tid: Kernel checks for valid pointer and doesn't use the variable if NULL, so test passes unexpectedly.
We do have tst_get_bad_addr() that produces PROT_NONE mapped page that should get you EFAULT in both cases here.
Quoted 2 lines
-
parent_tid: Kernel doesn't verify the pointer, but doesn't return the error code properly and so test passes unexpectedly.
Huh? That sounds like a bug. Or does it skip only NULL silently? In that case tst_get_bad_addr() should fix this case as well.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 syscalls/clone3: New tests
Hi,
Quoted 6 lines
Quoted 3 lines
- pidfd: Kernel doesn't check this pointer and we get EFAULT.
-child_tid: Kernel checks for valid pointer and doesn't use the variable if NULL, so test passes unexpectedly.We do have
tst_get_bad_addr()that producesPROT_NONEmapped page that should get you EFAULT in both cases here.
I was thinking about it, then didn't write it.
+ we should add tst_get_bad_addr() to doc/test-writing-guidelines.txt. I'll try to remember to send patch on Monday.
Kind regards,
Petr