Add tls parameter and flag:CLONE_SETTLS cover for clone and clone3 syscall
PATCH v11 1/1 Add tls parameter and flag:CLONE_SETTLS cover for clone and clone3 syscall
tls parameter and related flag:CLONE_SETTLS are missed in the testing, so add them into existed test case
---
Changes in v11:
- Put the tls init/alloc/free functions into a common header in lapi/tls.h
- Use TST_CHECKPOINT_* for parent/child synchronization
Changes in v10:
- Fix fedora42 failure by adding tcb
- Add missing usleep(1000) in free_tls
Changes in v9:
- allow small delay by using usleep before call free_tls
- validate ./clone10 -i 10 on aarch64 and x86_64, both pass
Changes in v8:
- call free_tls() in touch_tls_in_child instead of cleanup
- remove CFLAGS += -fsanitize=address in Makefile to fix memory double free issue
Changes in v7:
- remove unnecessary in verify_tls()
- add CFLAGS += -fsanitize=address in Makefile to fix memory double free issue
Changes in v6:
- update flag to effective combination
- combine x86_64 with other arches
- rename child function
- remove inproper exit
- remove unused code lines
- remove sleep statement
Changes in v5:
- wrap duplicate code into one single methold
- remove duplicately malloc
Changes in v4:
- remove riscv and loongarch definition
Changes in v3:
- fix missing head file for x86
Changes in v2:
- create separate files for clone and clone3
--- include/lapi/tls.h | 102 ++++++++++++++++++ runtest/syscalls | 2 + testcases/kernel/syscalls/clone/.gitignore | 1 + testcases/kernel/syscalls/clone/clone10.c | 98 ++++++++++++++++++ testcases/kernel/syscalls/clone3/.gitignore | 1 + testcases/kernel/syscalls/clone3/clone304.c | 108 ++++++++++++++++++++ 6 files changed, 312 insertions(+) create mode 100644 include/lapi/tls.h create mode 100644 testcases/kernel/syscalls/clone/clone10.c create mode 100644 testcases/kernel/syscalls/clone3/clone304.c
include/lapi/tls.h new file +102 -0
@@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025 Red Hat Inc. All Rights Reserved. +* Author: Chunfu Wen <[email protected]> +*/ + +/*\ +* tls init/alloc/free common functions +*/ + +#ifndef _LAPI_TLS_H +#define _LAPI_TLS_H + +#include <stdlib.h> +#include <string.h> +#include <stdint.h> +#include <stdio.h> +#include <unistd.h> + +#if defined(__i386__) +#include <asm/ldt.h> +#endif + +#include "tst_test.h" + +#define TLS_SIZE 4096 +#define TLS_ALIGN 16 + +#if defined(__x86_64__) +// Structure mimicking glibc's TCB to be simplified for x86_64 +typedef struct { +void *tcb; +void *dtv; +void *self; +int multiple_threads; +char padding[64 ]; +}tcb_t ; +#endif + +// Global pointers for TLS management +extern void *tls_ptr; +extern struct user_desc *tls_desc; + +static inline void *allocate_tls_area (void ) +{ +void *tls_area =aligned_alloc (TLS_ALIGN ,TLS_SIZE ); +if (!tls_area) +tst_brk (TBROK |TERRNO ,"aligned_alloc failed" ); +memset (tls_area,0 ,TLS_SIZE ); + +#if defined(__x86_64__) +// Set up a minimal TCB for x86_64 +tcb_t *tcb = (tcb_t *)tls_area; + tcb->tcb = tls_area; + tcb->self = tls_area; + tcb->multiple_threads =1 ; +#endif +return tls_area; +} + +static inline void init_tls (void ) +{ +#if defined(__x86_64__) || defined(__aarch64__) || defined(__s390x__) + tls_ptr =allocate_tls_area (); + +#elif defined(__i386__) + tls_ptr =allocate_tls_area (); + tls_desc =SAFE_MALLOC (sizeof (*tls_desc)); +memset (tls_desc,0 ,sizeof (*tls_desc)); + tls_desc->entry_number =-1 ; + tls_desc->base_addr = (unsigned long )tls_ptr; + tls_desc->limit =TLS_SIZE ; + tls_desc->seg_32bit =1 ; + tls_desc->contents =0 ; + tls_desc->read_exec_only =0 ; + tls_desc->limit_in_pages =0 ; + tls_desc->seg_not_present =0 ; + tls_desc->useable =1 ; + +#else +tst_brk (TCONF ,"Unsupported architecture for TLS" ); +#endif +} + +static inline void free_tls (void ) +{ +usleep (1000 ); +#if defined(__x86_64__) || defined(__aarch64__) || defined(__s390x__) +if (tls_ptr) { +free (tls_ptr); + tls_ptr =NULL ; + } +#elif defined(__i386__) +if (tls_desc) { +free ((void *)(uintptr_t )tls_desc->base_addr); +free (tls_desc); + tls_desc =NULL ; + } +#endif +} + +#endif // _LAPI_TLS_H
runtest/syscalls +2 -0
@@ -122,10 +122,12 @@ clone06 clone06 clone07 clone07 clone08 clone08 clone09 clone09 +clone10 clone10 clone301 clone301 clone302 clone302 clone303 clone303 +clone304 clone304 close01 close01 close02 close02
testcases/kernel/syscalls/clone/.gitignore +1 -0
@@ -7,3 +7,4 @@ /clone07 /clone08 /clone09 +/clone10
testcases/kernel/syscalls/clone/clone10.c new file +98 -0
98 lines not on this page · raw message
testcases/kernel/syscalls/clone3/.gitignore +1 -0
@@ -1,3 +1,4 @@ clone301 clone302 clone303 +clone304
testcases/kernel/syscalls/clone3/clone304.c new file +108 -0
108 lines not on this page · raw message
Signature · 5 lines
2.43.5 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Quoted 6 lines
include/lapi/tls.h | 102 ++++++++++++++++++ runtest/syscalls | 2 + testcases/kernel/syscalls/clone/.gitignore | 1 + testcases/kernel/syscalls/clone/clone10.c | 98 ++++++++++++++++++ testcases/kernel/syscalls/clone3/.gitignore | 1 + testcases/kernel/syscalls/clone3/clone304.c | 108 ++++++++++++++++++++
There a few couple of things to fix. Please run make check in the directories this patch adds files (include/lapi/ syscalls/clone/ and syscalls/clone3/) and fix the errors and warnings reported for the newly added files.
Quoted 88 lines
6 files changed, 312 insertions(+) create mode 100644 include/lapi/tls.h create mode 100644 testcases/kernel/syscalls/clone/clone10.c create mode 100644 testcases/kernel/syscalls/clone3/clone304.cinclude/lapi/tls.h new file +77
-0@@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025 Red Hat Inc. All Rights Reserved. +* Author: Chunfu Wen <[email protected]> +*/ + +/*\ +* tls init/alloc/free common functions +*/ + +#ifndef _LAPI_TLS_H +#define _LAPI_TLS_H + +#include <stdlib.h> +#include <string.h> +#include <stdint.h> +#include <stdio.h> +#include <unistd.h> + +#if defined(__i386__) +#include <asm/ldt.h> +#endif + +#include "tst_test.h" + +#define TLS_SIZE 4096 +#define TLS_ALIGN 16 + +#if defined(__x86_64__) +// Structure mimicking glibc's TCB to be simplified for x86_64 +typedef struct { +void *tcb; +void *dtv; +void *self; +int multiple_threads; +char padding[64 ]; +}tcb_t ; +#endif + +// Global pointers for TLS management +extern void *tls_ptr; +extern struct user_desc *tls_desc; + +static inline void *allocate_tls_area (void ) +{ +void *tls_area =aligned_alloc (TLS_ALIGN ,TLS_SIZE ); +if (!tls_area) +tst_brk (TBROK |TERRNO ,"aligned_alloc failed" ); +memset (tls_area,0 ,TLS_SIZE ); + +#if defined(__x86_64__) +// Set up a minimal TCB for x86_64 +tcb_t *tcb = (tcb_t *)tls_area; + tcb->tcb = tls_area; + tcb->self = tls_area; + tcb->multiple_threads =1 ; +#endif +return tls_area; +} + +static inline void init_tls (void ) +{ +#if defined(__x86_64__) || defined(__aarch64__) || defined(__s390x__) + tls_ptr =allocate_tls_area (); + +#elif defined(__i386__) + tls_ptr =allocate_tls_area (); + tls_desc =SAFE_MALLOC (sizeof (*tls_desc)); +memset (tls_desc,0 ,sizeof (*tls_desc)); + tls_desc->entry_number =-1 ; + tls_desc->base_addr = (unsigned long )tls_ptr; + tls_desc->limit =TLS_SIZE ; + tls_desc->seg_32bit =1 ; + tls_desc->contents =0 ; + tls_desc->read_exec_only =0 ; + tls_desc->limit_in_pages =0 ; + tls_desc->seg_not_present =0 ;
include/lapi/tls.h line 87
Quoted 10 lines
include/lapi/tls.h new file +10
-0+ tls_desc->useable =1 ; + +#else +tst_brk (TCONF ,"Unsupported architecture for TLS" ); +#endif +} + +static inline void free_tls (void ) +{ +usleep (1000 );
Why is this sleep needed here?
Quoted 47 lines
include/lapi/tls.h new file +15
-0+#if defined(__x86_64__) || defined(__aarch64__) || defined(__s390x__) +if (tls_ptr) { +free (tls_ptr); + tls_ptr =NULL ; + } +#elif defined(__i386__) +if (tls_desc) { +free ((void *)(uintptr_t )tls_desc->base_addr); +free (tls_desc); + tls_desc =NULL ; + } +#endif +} + +#endif // _LAPI_TLS_H runtest/syscalls +2
-0@@ -122,10 +122,12 @@ clone06 clone06 clone07 clone07 clone08 clone08 clone09 clone09 +clone10 clone10 clone301 clone301 clone302 clone302 clone303 clone303 +clone304 clone304 close01 close01 close02 close02testcases/kernel/syscalls/clone/.gitignore +1
-0@@ -7,3 +7,4 @@ /clone07 /clone08 /clone09 +/clone10testcases/kernel/syscalls/clone/clone10.c new file +0
-0
testcases/kernel/syscalls/clone/clone10.c line 8
Quoted 8 lines
testcases/kernel/syscalls/clone/clone10.c new file +8
-0@@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025 Red Hat Inc. All Rights Reserved. +* Author: Chunfu Wen <[email protected]> +*/ + +/*\ +* Add tls parameter and flag:CLONE_SETTLS cover for clone
This should explain what the test is doing better. As far as I can tell we do:
Test that in a thread started by clone() that runs in the same address space (CLONE_VM) but with a different TLS (CLONE_SETTLS) writtes to a thread local variables are not propagated back from the cloned thread.
Quoted 32 lines
testcases/kernel/syscalls/clone/clone10.c new file +32
-0+*/ + +#define _GNU_SOURCE +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <sched.h> +#include <sys/wait.h> + +#if defined(__i386__) +#include <asm/ldt.h> +#endif + +#include "tst_test.h" +#include "clone_platform.h" +#include "lapi/syscalls.h" +#include "lapi/tls.h" + +#define TLS_EXP 100 + +#ifndef ARCH_SET_FS +#define ARCH_SET_FS 0x1002 +#endif + +// Global pointers for TLS management +void *tls_ptr =NULL ; +struct user_desc *tls_desc =NULL ; + +static __threadint tls_var =0 ; + +static char *child_stack; +static volatile int child_done =0 ;
testcases/kernel/syscalls/clone/clone10.c line 50
Quoted 10 lines
testcases/kernel/syscalls/clone/clone10.c new file +10
-0+ +static int flags =CLONE_THREAD |CLONE_VM |CLONE_FS |CLONE_FILES |CLONE_SIGHAND |CLONE_SETTLS ; + +static int touch_tls_in_child(void *arg LTP_ATTRIBUTE_UNUSED) +{ +#if defined(__x86_64__) +// Set the %fs register to point to the TCB +if (syscall (SYS_arch_prctl,ARCH_SET_FS , tls_ptr) ==-1 ) { +exit (EXIT_FAILURE ); + }
So this is stil needed despite the tst_ptr passed to the kernel in the clone() call?
Can we move this to a function in the lapi header as well? Something as "child_init_tls()" and call it here?
testcases/kernel/syscalls/clone/clone10.c line 57
Quoted 7 lines
testcases/kernel/syscalls/clone/clone10.c new file +7
-0+#endif + tls_var =TLS_EXP +1 ; +tst_res (TINFO ,"Child (PID: %d, TID: %d): TLS value set to: %d" ,getpid (),gettid (), tls_var); + +TST_CHECKPOINT_WAKE (0 ); +free_tls (); +return 0 ;
Shouldn't we call the __NR_exit here as well?
Quoted 56 lines
testcases/kernel/syscalls/clone/clone10.c new file +41
-0+} + +static void verify_tls (void ) +{ + tls_var =TLS_EXP ; + +TEST (ltp_clone7 (flags, touch_tls_in_child,NULL ,CHILD_STACK_SIZE , child_stack,NULL , tls_ptr,NULL )); + +if (TST_RET ==-1 ) +tst_brk (TBROK |TTERRNO ,"clone() failed" ); + +TST_CHECKPOINT_WAIT (0 ); + +if (TLS_EXP == tls_var) { +tst_res (TPASS , +"Parent (PID: %d, TID: %d): TLS value correct: %d" , +getpid (),gettid (), tls_var); + }else { +tst_res (TFAIL , +"Parent (PID: %d, TID: %d): TLS value mismatch: got %d, expected %d" , +getpid (),gettid (), tls_var,TLS_EXP ); + } +} + +static void setup (void ) +{ + child_stack =SAFE_MALLOC (CHILD_STACK_SIZE ); +init_tls (); +} + +static void cleanup (void ) +{ +free (child_stack); +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .needs_checkpoints =1 , + .test_all = verify_tls, +};testcases/kernel/syscalls/clone3/.gitignore +1
-0@@ -1,3 +1,4 @@ clone301 clone302 clone303 +clone304testcases/kernel/syscalls/clone3/clone304.c new file +0
-0
testcases/kernel/syscalls/clone3/clone304.c line 8
Quoted 8 lines
testcases/kernel/syscalls/clone3/clone304.c new file +8
-0@@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025 Red Hat Inc. All Rights Reserved. +* Author: Chunfu Wen <[email protected]> +*/ + +/*\ +* Add tls parameter and flag:CLONE_SETTLS cover for clone3
The description here should be the same as in the previous one but it should say clone3 instead of clone
Quoted 106 lines
testcases/kernel/syscalls/clone3/clone304.c new file +100
-0+*/ + +#define _GNU_SOURCE + +#include <stdlib.h> +#include <sys/wait.h> + +#if defined(__i386__) +#include <asm/ldt.h> +#endif + +#include "tst_test.h" +#include "lapi/sched.h" +#include "lapi/pidfd.h" +#include "lapi/tls.h" + +#define TLS_EXP 100 + +#define CHILD_STACK_SIZE (1024*1024) + +// Global pointers for TLS management +void *tls_ptr =NULL ; +struct user_desc *tls_desc =NULL ; + +static int pidfd, child_tid, parent_tid; +static struct clone_args *args; +static void *child_stack; + +/* TLS variable to validate in child */ +static __threadint tls_var =0 ; + +static int test_flags =CLONE_THREAD |CLONE_VM |CLONE_FS |CLONE_FILES |CLONE_SIGHAND |CLONE_SETTLS ; + +static int check_tls_in_child (void ) +{ + tls_var =TLS_EXP +1 ; +tst_res (TINFO ,"Child (PID: %d, TID: %d): TLS value set to: %d" ,getpid (),gettid (), tls_var); + +TST_CHECKPOINT_WAKE (0 ); +tst_syscall (__NR_exit,0 ); +return 0 ; +} + +static void run (void ) +{ +pid_t pid; + tls_var =TLS_EXP ; + + args->flags = test_flags; + args->pidfd = (uint64_t )(&pidfd); + args->child_tid = (uint64_t )(&child_tid); + args->parent_tid = (uint64_t )(&parent_tid); + args->stack = (uint64_t )(child_stack); + args->stack_size =CHILD_STACK_SIZE ; + args->tls = (uint64_t )tls_ptr; + +TEST (pid =clone3 (args,sizeof (*args))); + +if (TST_RET ==-1 ) +tst_brk (TBROK |TTERRNO ,"clone() failed" ); + +if (!pid) +check_tls_in_child (); + +TST_CHECKPOINT_WAIT (0 ); + +if (TLS_EXP == tls_var) { +tst_res (TPASS , +"Parent (PID: %d, TID: %d): TLS value correct: %d" , +getpid (),gettid (), tls_var); + }else { +tst_res (TFAIL , +"Parent (PID: %d, TID: %d): TLS value mismatch: got %d, expected %d" , +getpid (),gettid (), tls_var,TLS_EXP ); + } +} + +static void setup (void ) +{ +clone3_supported_by_kernel (); + child_stack =SAFE_MALLOC (CHILD_STACK_SIZE ); +init_tls (); +} + +static void cleanup (void ) +{ +free (child_stack); +free_tls (); +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .needs_checkpoints =1 , + .test_all = run, + .bufs = (struct tst_buffers []) { + {&args, .size =sizeof (*args)}, + {}, + } +};Signature · 5 lines
2.43.5 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hello,
Thank you for your review.
See inline comments for my reply.
Also updated patch v12 was sent out as well
Chunfu Wen
Quoted 229 lines · Cyril Hrubis
Hi!
Quoted 6 lines
include/lapi/tls.h | 102 ++++++++++++++++++ runtest/syscalls | 2 + testcases/kernel/syscalls/clone/.gitignore | 1 + testcases/kernel/syscalls/clone/clone10.c | 98 ++++++++++++++++++ testcases/kernel/syscalls/clone3/.gitignore | 1 + testcases/kernel/syscalls/clone3/clone304.c | 108 ++++++++++++++++++++There a few couple of things to fix. Please run make check in the directories this patch adds files (
include/lapi/syscalls/clone/ and syscalls/clone3/) and fix the errors and warnings reported for the newly added files.
[chunfu] Updated as comment.Quoted 88 lines
6 files changed, 312 insertions(+) create mode 100644 include/lapi/tls.h create mode 100644 testcases/kernel/syscalls/clone/clone10.c create mode 100644 testcases/kernel/syscalls/clone3/clone304.cinclude/lapi/tls.h new file +77
-0@@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025 Red Hat Inc. All Rights Reserved. +* Author: Chunfu Wen <[email protected]> +*/ + +/*\ +* tls init/alloc/free common functions +*/ + +#ifndef _LAPI_TLS_H +#define _LAPI_TLS_H + +#include <stdlib.h> +#include <string.h> +#include <stdint.h> +#include <stdio.h> +#include <unistd.h> + +#if defined(__i386__) +#include <asm/ldt.h> +#endif + +#include "tst_test.h" + +#define TLS_SIZE 4096 +#define TLS_ALIGN 16 + +#if defined(__x86_64__) +// Structure mimicking glibc's TCB to be simplified for x86_64 +typedef struct { +void *tcb; +void *dtv; +void *self; +int multiple_threads; +char padding[64 ]; +}tcb_t ; +#endif + +// Global pointers for TLS management +extern void *tls_ptr; +extern struct user_desc *tls_desc; + +static inline void *allocate_tls_area (void ) +{ +void *tls_area =aligned_alloc (TLS_ALIGN ,TLS_SIZE ); +if (!tls_area) +tst_brk (TBROK |TERRNO ,"aligned_alloc failed" ); +memset (tls_area,0 ,TLS_SIZE ); + +#if defined(__x86_64__) +// Set up a minimal TCB for x86_64 +tcb_t *tcb = (tcb_t *)tls_area; + tcb->tcb = tls_area; + tcb->self = tls_area; + tcb->multiple_threads =1 ; +#endif +return tls_area; +} + +static inline void init_tls (void ) +{ +#if defined(__x86_64__) || defined(__aarch64__) || defined(__s390x__) + tls_ptr =allocate_tls_area (); + +#elif defined(__i386__) + tls_ptr =allocate_tls_area (); + tls_desc =SAFE_MALLOC (sizeof (*tls_desc)); +memset (tls_desc,0 ,sizeof (*tls_desc)); + tls_desc->entry_number =-1 ; + tls_desc->base_addr = (unsigned long )tls_ptr; + tls_desc->limit =TLS_SIZE ; + tls_desc->seg_32bit =1 ; + tls_desc->contents =0 ; + tls_desc->read_exec_only =0 ; + tls_desc->limit_in_pages =0 ; + tls_desc->seg_not_present =0 ;include/lapi/tls.h line 87
Quoted 10 lines
include/lapi/tls.h new file +10
-0+ tls_desc->useable =1 ; + +#else +tst_brk (TCONF ,"Unsupported architecture for TLS" ); +#endif +} + +static inline void free_tls (void ) +{ +usleep (1000 );Why is this sleep needed here?
[chunfu] This is neccessary. If remove this, the test will fail on some linux distributions, such as limited computing resources, with error:TBROK:
Test killed by SIGSEGV+#if
defined(__x86_64__)||defined(__aarch64__)||defined(__s390x__)Review
Quoted 32 lines
include/lapi/tls.h new file +14
-0+if (tls_ptr) { +free (tls_ptr); + tls_ptr =NULL ; + } +#elif defined(__i386__) +if (tls_desc) { +free ((void *)(uintptr_t )tls_desc->base_addr); +free (tls_desc); + tls_desc =NULL ; + } +#endif +} + +#endif // _LAPI_TLS_H runtest/syscalls +2
-0@@ -122,10 +122,12 @@ clone06 clone06 clone07 clone07 clone08 clone08 clone09 clone09 +clone10 clone10 clone301 clone301 clone302 clone302 clone303 clone303 +clone304 clone304 close01 close01 close02 close02(quoted diff) +0
-0b/testcases/kernel/syscalls/clone/.gitignore
Review
Quoted 9 lines
index
900cac19c..adfb8257d100644testcases/kernel/syscalls/clone/.gitignore +1
-0@@ -7,3 +7,4 @@ /clone07 /clone08 /clone09 +/clone10(quoted diff) +0
-0
b/testcases/kernel/syscalls/clone/clone10.ctestcases/kernel/syscalls/clone/clone10.c line 8
Quoted 13 lines
new file mode 100644
index 000000000..b0899a6b8testcases/kernel/syscalls/clone/clone10.c new file +8
-0@@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025 Red Hat Inc. All Rights Reserved. +* Author: Chunfu Wen <[email protected]> +*/ + +/*\ +* Add tls parameter and flag:CLONE_SETTLS cover for clone This should explain what the test is doing better. As far as I can tell we do:
Test that in a thread started by
clone()that runs in the same address space (CLONE_VM) but with a different TLS (CLONE_SETTLS) writtes to a thread local variables are not propagated back from the cloned thread.[chunfu] Updated as comment
Quoted 24 lines
testcases/kernel/syscalls/clone/clone10.c new file +24
-0+*/ + +#define _GNU_SOURCE +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <sched.h> +#include <sys/wait.h> + +#if defined(__i386__) +#include <asm/ldt.h> +#endif + +#include "tst_test.h" +#include "clone_platform.h" +#include "lapi/syscalls.h" +#include "lapi/tls.h" + +#define TLS_EXP 100 + +#ifndef ARCH_SET_FS +#define ARCH_SET_FS 0x1002 +#endif +testcases/kernel/syscalls/clone/clone10.c
Quoted 10 lines
testcases/kernel/syscalls/clone/clone10.c new file +10
-0+// Global pointers for TLS management +void *tls_ptr =NULL ; +struct user_desc *tls_desc =NULL ; + +static __threadint tls_var =0 ; + +static char *child_stack; +static volatile int child_done =0 ; + +static int flags = CLONE_THREAD | CLONE_VM | CLONE_FS | CLONE_FILES |
CLONE_SIGHAND|CLONE_SETTLS;
Quoted 12 lines
testcases/kernel/syscalls/clone/clone10.c line 50
Quoted 8 lines
testcases/kernel/syscalls/clone/clone10.c new file +8
-0+ +static int touch_tls_in_child(void *arg LTP_ATTRIBUTE_UNUSED) +{ +#if defined(__x86_64__) +// Set the %fs register to point to the TCB +if (syscall (SYS_arch_prctl,ARCH_SET_FS , tls_ptr) ==-1 ) { +exit (EXIT_FAILURE ); + }So this is stil needed despite the
tst_ptrpassed to the kernel in theclone()call?
[chunfu] On some linux distributions, the test will fail if without it.
Quoted 86 lines
Can we move this to a function in the lapi header as well? Something as "
child_init_tls()" and call it here?
[chunfu] It looks like it is not proper to move into lapi. While the TLS setup and teardown are general, the actual testing of the TLS variable within the child context often involves test-specific variables and logic. Since this method consumetls_var, makingtls_var(a__threadvariable) global and extern across different files, especially when its purpose is specific to how a child process interacts with TLS in a test, can lead to complexity and potential issues with thread-local storage behavior across different executables or shared librariestestcases/kernel/syscalls/clone/clone10.c
Quoted 3 lines
testcases/kernel/syscalls/clone/clone10.c new file +3
-0+#endif + tls_var =TLS_EXP +1 ; + tst_res(TINFO, "Child (PID: %d, TID: %d): TLS value set to: %d",
getpid(),gettid(),tls_var);testcases/kernel/syscalls/clone/clone10.c line 57
Quoted 4 lines
testcases/kernel/syscalls/clone/clone10.c new file +4
-0+ +TST_CHECKPOINT_WAKE (0 ); +free_tls (); +return 0 ;Shouldn't we call the
__NR_exithere as well?
[chunfu] Added as commenttestcases/kernel/syscalls/clone/clone10.c
Quoted 7 lines
testcases/kernel/syscalls/clone/clone10.c new file +7
-0+} + +static void verify_tls (void ) +{ + tls_var =TLS_EXP ; + + TEST(ltp_clone7(flags, touch_tls_in_child, NULL, CHILD_STACK_SIZE,
child_stack, NULL,tls_ptr, NULL));testcases/kernel/syscalls/clone/clone10.c
Quoted 13 lines
testcases/kernel/syscalls/clone/clone10.c new file +13
-0+ +if (TST_RET ==-1 ) +tst_brk (TBROK |TTERRNO ,"clone() failed" ); + +TST_CHECKPOINT_WAIT (0 ); + +if (TLS_EXP == tls_var) { +tst_res (TPASS , +"Parent (PID: %d, TID: %d): TLS value correct: %d" , +getpid (),gettid (), tls_var); + }else { + tst_res(TFAIL, + "Parent (PID: %d, TID: %d): TLS value mismatch:got %d, expected %d",
Review
Quoted 22 lines
testcases/kernel/syscalls/clone/clone10.c new file +21
-0+ getpid(), gettid(), tls_var, TLS_EXP); + } +} + +static void setup (void ) +{ + child_stack =SAFE_MALLOC (CHILD_STACK_SIZE ); +init_tls (); +} + +static void cleanup (void ) +{ +free (child_stack); +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .needs_checkpoints =1 , + .test_all = verify_tls, +};(quoted diff) +0
-0b/testcases/kernel/syscalls/clone3/.gitignore
Review
Quoted 9 lines
index
10369954b..e9b5312f4100644testcases/kernel/syscalls/clone3/.gitignore +1
-0@@ -1,3 +1,4 @@ clone301 clone302 clone303 +clone304(quoted diff) +0
-0
b/testcases/kernel/syscalls/clone3/clone304.cQuoted 9 lines
new file mode 100644
index 000000000..d45ac2395testcases/kernel/syscalls/clone3/clone304.c new file +4
-0@@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2025 Red Hat Inc. All Rights Reserved. +* Author: Chunfu Wen <[email protected]>
Quoted 9 lines
testcases/kernel/syscalls/clone3/clone304.c line 8
Quoted 4 lines
testcases/kernel/syscalls/clone3/clone304.c new file +4
-0+*/ + +/*\ +* Add tls parameter and flag:CLONE_SETTLS cover for clone3 The description here should be the same as in the previous one but it should say clone3 instead of clone
[chunfu] Updated as comment.
[chunfu] One more comment related to Parent/Child Sync with TST_CHECKPOINT_,
in clone304.c
it doesn't work as expected with the below error: TBROK: Test killed by
SIGSEGV!
So I keep the previous solution using single volatile int child_done.
Quoted 115 lines
Quoted 22 lines
testcases/kernel/syscalls/clone3/clone304.c new file +22
-0+*/ + +#define _GNU_SOURCE + +#include <stdlib.h> +#include <sys/wait.h> + +#if defined(__i386__) +#include <asm/ldt.h> +#endif + +#include "tst_test.h" +#include "lapi/sched.h" +#include "lapi/pidfd.h" +#include "lapi/tls.h" + +#define TLS_EXP 100 + +#define CHILD_STACK_SIZE (1024*1024) + +// Global pointers for TLS management +void *tls_ptr =NULL ;testcases/kernel/syscalls/clone3/clone304.c
Quoted 10 lines
testcases/kernel/syscalls/clone3/clone304.c new file +10
-0+struct user_desc *tls_desc =NULL ; + +static int pidfd, child_tid, parent_tid; +static struct clone_args *args; +static void *child_stack; + +/* TLS variable to validate in child */ +static __threadint tls_var =0 ; + +static int test_flags = CLONE_THREAD | CLONE_VM | CLONE_FS |
CLONE_FILES|CLONE_SIGHAND|CLONE_SETTLS;testcases/kernel/syscalls/clone3/clone304.c
Quoted 5 lines
testcases/kernel/syscalls/clone3/clone304.c new file +5
-0+ +static int check_tls_in_child (void ) +{ + tls_var =TLS_EXP +1 ; + tst_res(TINFO, "Child (PID: %d, TID: %d): TLS value set to: %d",
getpid(),gettid(),tls_var);Quoted 26 lines
testcases/kernel/syscalls/clone3/clone304.c new file +26
-0+ +TST_CHECKPOINT_WAKE (0 ); +tst_syscall (__NR_exit,0 ); +return 0 ; +} + +static void run (void ) +{ +pid_t pid; + tls_var =TLS_EXP ; + + args->flags = test_flags; + args->pidfd = (uint64_t )(&pidfd); + args->child_tid = (uint64_t )(&child_tid); + args->parent_tid = (uint64_t )(&parent_tid); + args->stack = (uint64_t )(child_stack); + args->stack_size =CHILD_STACK_SIZE ; + args->tls = (uint64_t )tls_ptr; + +TEST (pid =clone3 (args,sizeof (*args))); + +if (TST_RET ==-1 ) +tst_brk (TBROK |TTERRNO ,"clone() failed" ); + +if (!pid) +check_tls_in_child ();testcases/kernel/syscalls/clone3/clone304.c
Quoted 10 lines
testcases/kernel/syscalls/clone3/clone304.c new file +10
-0+ +TST_CHECKPOINT_WAIT (0 ); + +if (TLS_EXP == tls_var) { +tst_res (TPASS , +"Parent (PID: %d, TID: %d): TLS value correct: %d" , +getpid (),gettid (), tls_var); + }else { + tst_res(TFAIL, + "Parent (PID: %d, TID: %d): TLS value mismatch:got %d, expected %d",
Quoted 31 lines
testcases/kernel/syscalls/clone3/clone304.c new file +27
-1+ getpid(), gettid(), tls_var, TLS_EXP); + } +} + +static void setup (void ) +{ +clone3_supported_by_kernel (); + child_stack =SAFE_MALLOC (CHILD_STACK_SIZE ); +init_tls (); +} + +static void cleanup (void ) +{ +free (child_stack); +free_tls (); +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .needs_checkpoints =1 , + .test_all = run, + .bufs = (struct tst_buffers []) { + {&args, .size =sizeof (*args)}, + {}, + } +}; --2.43.5
Quoted 2 lines
--
Mailing list info: https://lists.linux.it/listinfo/ltp--
Cyril Hrubis
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp