syscalls/ioctl_ns0[156]: align stack and wait for child
PATCH v2 1/1 syscalls/ioctl_ns0[156]: align stack and wait for child
Test crashes (SIGBUS) when using child stack have been observed for ioctl_ns01. Align stack to 64 bytes for all testcases using clone, which should work for any arch.
Add SIGCHLD to clone flags, so that LTP library can reap all children and check their return code. Also check ltp_clone() return value.
Suppress warning for unused *arg in child().
--- testcases/kernel/syscalls/ioctl/ioctl_ns01.c | 9 +++++---- testcases/kernel/syscalls/ioctl/ioctl_ns05.c | 8 +++++--- testcases/kernel/syscalls/ioctl/ioctl_ns06.c | 11 +++++++---- 3 files changed, 17 insertions(+), 11 deletions(-)
testcases/kernel/syscalls/ioctl/ioctl_ns01.c +5 -4
@@ -23,7 +23,7 @@#define STACK_SIZE (1024 * 1024) -static char child_stack[STACK_SIZE ]; +static char child_stack[STACK_SIZE] __attribute__((aligned(64)));static void setup (void ) {
@@ -53,7 +53,7 @@ static void test_ns_get_parent(void) } } -static int child (void *arg) +static int child(void *arg LTP_ATTRIBUTE_UNUSED) {test_ns_get_parent ();return 0 ;
@@ -63,8 +63,9 @@ static void run(void) {test_ns_get_parent (); -ltp_clone (CLONE_NEWPID , &child,0 , -STACK_SIZE , child_stack); +if (ltp_clone (CLONE_NEWPID |SIGCHLD , &child,0 , +STACK_SIZE , child_stack) ==-1 ) +tst_brk (TBROK |TERRNO ,"ltp_clone failed" ); }static struct tst_test test = {
testcases/kernel/syscalls/ioctl/ioctl_ns05.c +5 -3
@@ -22,7 +22,7 @@#define STACK_SIZE (1024 * 1024) -static char child_stack[STACK_SIZE ]; +static char child_stack[STACK_SIZE] __attribute__((aligned(64)));static void setup (void ) {
@@ -32,7 +32,7 @@ static void setup(void)tst_res (TCONF ,"namespace not available" ); } -static int child (void *arg) +static int child(void *arg LTP_ATTRIBUTE_UNUSED) {if (getpid () !=1 )tst_res (TFAIL ,"child should think its pid is 1" );
@@ -44,8 +44,10 @@ static int child(void *arg)static void run (void ) { -pid_t pid =ltp_clone (CLONE_NEWPID , &child,0 , +pid_t pid =ltp_clone (CLONE_NEWPID |SIGCHLD , &child,0 ,STACK_SIZE , child_stack); +if (pid ==-1 ) +tst_brk (TBROK |TERRNO ,"ltp_clone failed" );char child_namespace[20 ];int my_fd, child_fd, parent_fd;
testcases/kernel/syscalls/ioctl/ioctl_ns06.c +7 -4
@@ -23,7 +23,7 @@#define STACK_SIZE (1024 * 1024) -static char child_stack[STACK_SIZE ]; +static char child_stack[STACK_SIZE] __attribute__((aligned(64)));static void setup (void ) {
@@ -33,7 +33,7 @@ static void setup(void)tst_res (TCONF ,"namespace not available" ); } -static int child (void *arg) +static int child(void *arg LTP_ATTRIBUTE_UNUSED) {TST_CHECKPOINT_WAIT (0 );return 0 ;
@@ -41,10 +41,13 @@ static int child(void *arg)static void run (void ) { -pid_t pid =ltp_clone (CLONE_NEWUSER , &child,0 , -STACK_SIZE , child_stack);char child_namespace[20 ]; +pid_t pid =ltp_clone (CLONE_NEWUSER |SIGCHLD , &child,0 , +STACK_SIZE , child_stack); +if (pid ==-1 ) +tst_brk (TBROK |TERRNO ,"ltp_clone failed" ); +sprintf (child_namespace,"/proc/%i/ns/user" , pid);int my_fd, child_fd, parent_fd;
Signature · 1 line
1.8.3.1
PATCH v2 1/1 syscalls/ioctl_ns0[156]: align stack and wait for child
Quoted 5 lines · Jan Stancek
Test crashes (SIGBUS) when using child stack have been observed for
ioctl_ns01. Align stack to 64 bytes for all testcases using clone, which should work for any arch.
Quoted 7 lines
Add SIGCHLD to clone flags, so that LTP library can reap all children and check their return code. Also check
ltp_clone()return value.Suppress warning for unused *arg in
child().Signed-off-by Jan Stancek <[email protected]>
---
Quoted 118 lines
testcases/kernel/syscalls/ioctl/ioctl_ns01.c | 9 +++++---- testcases/kernel/syscalls/ioctl/ioctl_ns05.c | 8 +++++--- testcases/kernel/syscalls/ioctl/ioctl_ns06.c | 11 +++++++---- 3 files changed, 17 insertions(+), 11 deletions(-)testcases/kernel/syscalls/ioctl/ioctl_ns01.c +5
-4@@ -23,7 +23,7 @@#define STACK_SIZE (1024 * 1024) -static char child_stack[STACK_SIZE ]; +static char child_stack[STACK_SIZE] __attribute__((aligned(64)));static void setup (void ) {@@ -53,7 +53,7 @@ static void test_ns_get_parent(void) } } -static int child (void *arg) +static int child(void *arg LTP_ATTRIBUTE_UNUSED) {test_ns_get_parent ();return 0 ;@@ -63,8 +63,9 @@ static void run(void) {test_ns_get_parent (); -ltp_clone (CLONE_NEWPID , &child,0 , -STACK_SIZE , child_stack); +if (ltp_clone (CLONE_NEWPID |SIGCHLD , &child,0 , +STACK_SIZE , child_stack) ==-1 ) +tst_brk (TBROK |TERRNO ,"ltp_clone failed" ); }static struct tst_test test = {testcases/kernel/syscalls/ioctl/ioctl_ns05.c +5
-3@@ -22,7 +22,7 @@#define STACK_SIZE (1024 * 1024) -static char child_stack[STACK_SIZE ]; +static char child_stack[STACK_SIZE] __attribute__((aligned(64)));static void setup (void ) {@@ -32,7 +32,7 @@ static void setup(void)tst_res (TCONF ,"namespace not available" ); } -static int child (void *arg) +static int child(void *arg LTP_ATTRIBUTE_UNUSED) {if (getpid () !=1 )tst_res (TFAIL ,"child should think its pid is 1" );@@ -44,8 +44,10 @@ static int child(void *arg)static void run (void ) { -pid_t pid =ltp_clone (CLONE_NEWPID , &child,0 , +pid_t pid =ltp_clone (CLONE_NEWPID |SIGCHLD , &child,0 ,STACK_SIZE , child_stack); +if (pid ==-1 ) +tst_brk (TBROK |TERRNO ,"ltp_clone failed" );char child_namespace[20 ];int my_fd, child_fd, parent_fd;testcases/kernel/syscalls/ioctl/ioctl_ns06.c +7
-5@@ -23,7 +23,7 @@#define STACK_SIZE (1024 * 1024) -static char child_stack[STACK_SIZE ]; +static char child_stack[STACK_SIZE] __attribute__((aligned(64)));static void setup (void ) {@@ -33,7 +33,7 @@ static void setup(void)tst_res (TCONF ,"namespace not available" ); } -static int child (void *arg) +static int child(void *arg LTP_ATTRIBUTE_UNUSED) {TST_CHECKPOINT_WAIT (0 );return 0 ;@@ -41,10 +41,13 @@ static int child(void *arg)static void run (void ) { -pid_t pid =ltp_clone (CLONE_NEWUSER , &child,0 , -STACK_SIZE , child_stack);char child_namespace[20 ]; +pid_t pid =ltp_clone (CLONE_NEWUSER |SIGCHLD , &child,0 , +STACK_SIZE , child_stack); +if (pid ==-1 ) +tst_brk (TBROK |TERRNO ,"ltp_clone failed" ); +sprintf (child_namespace,"/proc/%i/ns/user" , pid);int my_fd, child_fd, parent_fd; --1.8.3.1
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20190612/6b85d54d/attachment.html>
PATCH v2 1/1 syscalls/ioctl_ns0[156]: align stack and wait for child
In reply to Jan StancekHi!
Quoted 3 lines
Test crashes (SIGBUS) when using child stack have been observed for
ioctl_ns01. Align stack to 64 bytes for all testcases using clone, which should work for any arch.
Looking at the rest of the test it seems that all of them use malloc() to allocate the child stack and depends on the libc to align the buffers, maybe it would be easier to change these tests to use malloc() as well.
Quoted 4 lines
Add SIGCHLD to clone flags, so that LTP library can reap all children and check their return code. Also check
ltp_clone()return value.Suppress warning for unused *arg in
child().
The rest is OK.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/1 syscalls/ioctl_ns0[156]: align stack and wait for child
----- Original Message -----
Quoted 9 lines
Hi!
Quoted 3 lines
Test crashes (SIGBUS) when using child stack have been observed for
ioctl_ns01. Align stack to 64 bytes for all testcases using clone, which should work for any arch.Looking at the rest of the test it seems that all of them use
malloc()to allocate the child stack and depends on the libc to align the buffers, maybe it would be easier to change these tests to usemalloc()as well.
Default alignment is not enough:
Alignment: 2 * sizeof(size_t) (default)
(i.e., 8 byte alignment with 4byte size_t). This suffices for nearly all current machines and C compilers. However, you can define MALLOC_ALIGNMENT to be wider than this if necessary.
I'm guessing most of tests cross M_MMAP_THRESHOLD, and get page alignment from mmap. But should we rely on that?
How about posix_memalign()?
Quoted 12 lines
Quoted 5 lines
Add SIGCHLD to clone flags, so that LTP library can reap all children and check their return code. Also check
ltp_clone()return value.Suppress warning for unused *arg in
child().The rest is OK.
--
Cyril Hrubis
[email protected]
PATCH v2 1/1 syscalls/ioctl_ns0[156]: align stack and wait for child
Hi!
Quoted 10 lines
Default alignment is not enough:
Alignment: 2 *sizeof(size_t)(default)
(i.e., 8 byte alignment with 4bytesize_t). This suffices for nearly all current machines and C compilers. However, you can defineMALLOC_ALIGNMENTto be wider than this if necessary.I'm guessing most of tests cross
M_MMAP_THRESHOLD, and get page alignment from mmap. But should we rely on that?How about
posix_memalign()?
I guess that we need to fix the ltp_clone_malloc() function as well, we should probably add a helper to allocate memory to the clone library which would make use of the posix_memalign() and make use of it internally as well...
Signature · 2 lines
Cyril Hrubis [email protected]