* [LTP] [PATCH v4 0/2] Rewrite exit_group01 test @ 2023-11-21 17:26 Andrea Cervesato 2023-11-21 17:26 ` [LTP] [PATCH v4 1/2] Add tst_gettid wrapper around gettid syscall Andrea Cervesato 2023-11-21 17:26 ` [LTP] [PATCH v4 2/2] Refactor exit_group01 using new API Andrea Cervesato 0 siblings, 2 replies; 4+ messages in thread From: Andrea Cervesato @ 2023-11-21 17:26 UTC (permalink / raw) To: ltp From: Andrea Cervesato <andrea.cervesato@suse.com> exit_group01 test has been completely rewritten and tst_gettid() has been added to support missing gettid() syscall from GLIBC Andrea Cervesato (2): Add tst_gettid wrapper around gettid syscall Refactor exit_group01 using new API include/tst_pid.h | 8 + lib/tst_pid.c | 5 + testcases/kernel/syscalls/exit_group/Makefile | 2 + .../kernel/syscalls/exit_group/exit_group01.c | 144 +++++++++++------- 4 files changed, 108 insertions(+), 51 deletions(-) -- 2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp ^ permalink raw reply [flat|nested] 4+ messages in thread
* [LTP] [PATCH v4 1/2] Add tst_gettid wrapper around gettid syscall 2023-11-21 17:26 [LTP] [PATCH v4 0/2] Rewrite exit_group01 test Andrea Cervesato @ 2023-11-21 17:26 ` Andrea Cervesato 2023-11-21 17:26 ` [LTP] [PATCH v4 2/2] Refactor exit_group01 using new API Andrea Cervesato 1 sibling, 0 replies; 4+ messages in thread From: Andrea Cervesato @ 2023-11-21 17:26 UTC (permalink / raw) To: ltp From: Andrea Cervesato <andrea.cervesato@suse.com> Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com> --- include/tst_pid.h | 8 ++++++++ lib/tst_pid.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/include/tst_pid.h b/include/tst_pid.h index 774c845ce..951138abc 100644 --- a/include/tst_pid.h +++ b/include/tst_pid.h @@ -50,4 +50,12 @@ static inline int tst_get_free_pids(void (*cleanup_fn)(void)) */ pid_t tst_getpid(void); +/* + * Direct gettid() syscall. Some glibc versions cache gettid() return value + * which can cause confusing issues for example in processes created by + * direct clone() syscall (without using the glibc wrapper). Use this function + * whenever the current process may be a thread of the main test process. + */ +pid_t tst_gettid(void); + #endif /* TST_PID_H__ */ diff --git a/lib/tst_pid.c b/lib/tst_pid.c index cfaa5db36..4e9dc7a52 100644 --- a/lib/tst_pid.c +++ b/lib/tst_pid.c @@ -166,3 +166,8 @@ pid_t tst_getpid(void) { return syscall(SYS_getpid); } + +pid_t tst_gettid(void) +{ + return syscall(SYS_gettid); +} -- 2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [LTP] [PATCH v4 2/2] Refactor exit_group01 using new API 2023-11-21 17:26 [LTP] [PATCH v4 0/2] Rewrite exit_group01 test Andrea Cervesato 2023-11-21 17:26 ` [LTP] [PATCH v4 1/2] Add tst_gettid wrapper around gettid syscall Andrea Cervesato @ 2023-11-21 17:26 ` Andrea Cervesato 2023-11-22 9:31 ` Richard Palethorpe 1 sibling, 1 reply; 4+ messages in thread From: Andrea Cervesato @ 2023-11-21 17:26 UTC (permalink / raw) To: ltp From: Andrea Cervesato <andrea.cervesato@suse.com> We provided a different approach to exit_group() testing, spawning multiple threads inside the child and checking if they get killed with the parent process. Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com> --- testcases/kernel/syscalls/exit_group/Makefile | 2 + .../kernel/syscalls/exit_group/exit_group01.c | 144 +++++++++++------- 2 files changed, 95 insertions(+), 51 deletions(-) diff --git a/testcases/kernel/syscalls/exit_group/Makefile b/testcases/kernel/syscalls/exit_group/Makefile index 1273a4e9c..adbac3c51 100644 --- a/testcases/kernel/syscalls/exit_group/Makefile +++ b/testcases/kernel/syscalls/exit_group/Makefile @@ -3,6 +3,8 @@ top_srcdir ?= ../../../.. +exit_group01: CFLAGS+=-pthread + include $(top_srcdir)/include/mk/testcases.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/exit_group/exit_group01.c b/testcases/kernel/syscalls/exit_group/exit_group01.c index 5bf5b0218..9c557eedf 100644 --- a/testcases/kernel/syscalls/exit_group/exit_group01.c +++ b/testcases/kernel/syscalls/exit_group/exit_group01.c @@ -1,68 +1,110 @@ -/****************************************************************************** - * Copyright (c) Crackerjack Project., 2007 * - * Ported to LTP by Manas Kumar Nayak <maknayak@in.ibm.com> * - * Copyright (C) 2015 Cyril Hrubis <chrubis@suse.cz> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * - * the GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation, * - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * * - ******************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) Crackerjack Project., 2007 + * Ported to LTP by Manas Kumar Nayak <maknayak@in.ibm.com> + * Copyright (c) 2015 Linux Test Project + * Copyright (C) 2015 Cyril Hrubis <chrubis@suse.cz> + * Copyright (C) 2023 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> + */ -#include <stdio.h> -#include <errno.h> -#include <linux/unistd.h> -#include <sys/wait.h> +/*\ + * [Description] + * + * This test checks if exit_group() correctly ends a spawned child and all its + * running threads. + */ -#include "test.h" -#include "safe_macros.h" +#include <stdio.h> +#include <stdlib.h> +#include "tst_test.h" #include "lapi/syscalls.h" +#include "tst_safe_pthread.h" -char *TCID = "exit_group01"; -int testno; -int TST_TOTAL = 1; +#define THREADS_NUM 10 -static void verify_exit_group(void) +static pid_t *tids; +static int *counter; + +static void *worker(void *arg) { - pid_t cpid, w; + int i = *((int *)arg); + + tids[i] = tst_gettid(); + + while (1) { + ++(*counter); + usleep(0); + } + + return arg; +} + +static void spawn_threads(void) +{ + pthread_t threads[THREADS_NUM]; + + for (int i = 0; i < THREADS_NUM; i++) + SAFE_PTHREAD_CREATE(&threads[i], NULL, worker, (void *)&i); +} + +static void run(void) +{ + pid_t pid; int status; - cpid = fork(); - if (cpid == -1) - tst_brkm(TFAIL | TERRNO, NULL, "fork failed"); + *counter = 0; + + pid = SAFE_FORK(); + if (!pid) { + spawn_threads(); - if (cpid == 0) { TEST(tst_syscall(__NR_exit_group, 4)); - } else { - w = SAFE_WAIT(NULL, &status); - - if (WIFEXITED(status) && (WEXITSTATUS(status) == 4)) { - tst_resm(TPASS, "exit_group() succeeded"); - } else { - tst_resm(TFAIL | TERRNO, - "exit_group() failed (wait status = %d)", w); - } + if (TST_RET == -1) + tst_brk(TBROK | TERRNO, "exit_group() error"); + + return; } + + SAFE_WAITPID(pid, &status, 0); + + TST_EXP_EXPR(WIFEXITED(status) && WEXITSTATUS(status) == 4, + "exit_group() succeeded"); + + int old_counter = *counter; + + tst_res(TINFO, "Checking if threads are still running"); + usleep(1000000); + + TST_EXP_EXPR(old_counter == *counter, "Counter value hasn't changed"); } -int main(int ac, char **av) +static void setup(void) { - int lc; - - tst_parse_opts(ac, av, NULL, NULL); + tids = SAFE_MMAP( + NULL, + sizeof(pid_t) * THREADS_NUM, + PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS, + -1, 0); - for (lc = 0; TEST_LOOPING(lc); lc++) - verify_exit_group(); + counter = SAFE_MMAP( + NULL, + sizeof(int), + PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS, + -1, 0); +} - tst_exit(); +static void cleanup(void) +{ + SAFE_MUNMAP(tids, sizeof(pid_t) * THREADS_NUM); + SAFE_MUNMAP(counter, sizeof(int)); } + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .test_all = run, + .forks_child = 1, + .needs_checkpoints = 1, +}; -- 2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH v4 2/2] Refactor exit_group01 using new API 2023-11-21 17:26 ` [LTP] [PATCH v4 2/2] Refactor exit_group01 using new API Andrea Cervesato @ 2023-11-22 9:31 ` Richard Palethorpe 0 siblings, 0 replies; 4+ messages in thread From: Richard Palethorpe @ 2023-11-22 9:31 UTC (permalink / raw) To: Andrea Cervesato; +Cc: ltp Hello, Andrea Cervesato <andrea.cervesato@suse.de> writes: > From: Andrea Cervesato <andrea.cervesato@suse.com> > > We provided a different approach to exit_group() testing, spawning > multiple threads inside the child and checking if they get killed with > the parent process. > > Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com> > --- > testcases/kernel/syscalls/exit_group/Makefile | 2 + > .../kernel/syscalls/exit_group/exit_group01.c | 144 +++++++++++------- > 2 files changed, 95 insertions(+), 51 deletions(-) > > diff --git a/testcases/kernel/syscalls/exit_group/Makefile b/testcases/kernel/syscalls/exit_group/Makefile > index 1273a4e9c..adbac3c51 100644 > --- a/testcases/kernel/syscalls/exit_group/Makefile > +++ b/testcases/kernel/syscalls/exit_group/Makefile > @@ -3,6 +3,8 @@ > > top_srcdir ?= ../../../.. > > +exit_group01: CFLAGS+=-pthread > + > include $(top_srcdir)/include/mk/testcases.mk > > include $(top_srcdir)/include/mk/generic_leaf_target.mk > diff --git a/testcases/kernel/syscalls/exit_group/exit_group01.c b/testcases/kernel/syscalls/exit_group/exit_group01.c > index 5bf5b0218..9c557eedf 100644 > --- a/testcases/kernel/syscalls/exit_group/exit_group01.c > +++ b/testcases/kernel/syscalls/exit_group/exit_group01.c > @@ -1,68 +1,110 @@ > -/****************************************************************************** > - * Copyright (c) Crackerjack Project., 2007 * > - * Ported to LTP by Manas Kumar Nayak <maknayak@in.ibm.com> * > - * Copyright (C) 2015 Cyril Hrubis <chrubis@suse.cz> * > - * * > - * This program is free software; you can redistribute it and/or modify * > - * it under the terms of the GNU General Public License as published by * > - * the Free Software Foundation; either version 2 of the License, or * > - * (at your option) any later version. * > - * * > - * This program is distributed in the hope that it will be useful, * > - * but WITHOUT ANY WARRANTY; without even the implied warranty of * > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * > - * the GNU General Public License for more details. * > - * * > - * You should have received a copy of the GNU General Public License * > - * along with this program; if not, write to the Free Software Foundation, * > - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * > - * * > - ******************************************************************************/ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (c) Crackerjack Project., 2007 > + * Ported to LTP by Manas Kumar Nayak <maknayak@in.ibm.com> > + * Copyright (c) 2015 Linux Test Project > + * Copyright (C) 2015 Cyril Hrubis <chrubis@suse.cz> > + * Copyright (C) 2023 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> > + */ > > -#include <stdio.h> > -#include <errno.h> > -#include <linux/unistd.h> > -#include <sys/wait.h> > +/*\ > + * [Description] > + * > + * This test checks if exit_group() correctly ends a spawned child and all its > + * running threads. > + */ > > -#include "test.h" > -#include "safe_macros.h" > +#include <stdio.h> > +#include <stdlib.h> > +#include "tst_test.h" > #include "lapi/syscalls.h" > +#include "tst_safe_pthread.h" > > -char *TCID = "exit_group01"; > -int testno; > -int TST_TOTAL = 1; > +#define THREADS_NUM 10 It occured to me while looking at the mmap code that this test is far more likely to find something if we at least set the number of threads to max(2, tst_ncpus). It also would be better for embedded systems with one CPU. Taking that even further, if every thread has its affinity set to run on a unique core then this will force a lot of cross CPU communication. However that could go in another test. > > -static void verify_exit_group(void) > +static pid_t *tids; > +static int *counter; > + > +static void *worker(void *arg) > { > - pid_t cpid, w; > + int i = *((int *)arg); > + > + tids[i] = tst_gettid(); > + > + while (1) { > + ++(*counter); The atomic function can be used when updating or reading counter. > + usleep(0); nit: sched_yield better shows the intent > + } > + > + return arg; > +} > + > +static void spawn_threads(void) > +{ > + pthread_t threads[THREADS_NUM]; > + > + for (int i = 0; i < THREADS_NUM; i++) > + SAFE_PTHREAD_CREATE(&threads[i], NULL, worker, (void *)&i); > +} > + > +static void run(void) > +{ > + pid_t pid; > int status; > > - cpid = fork(); > - if (cpid == -1) > - tst_brkm(TFAIL | TERRNO, NULL, "fork failed"); > + *counter = 0; > + > + pid = SAFE_FORK(); > + if (!pid) { > + spawn_threads(); > > - if (cpid == 0) { > TEST(tst_syscall(__NR_exit_group, 4)); > - } else { > - w = SAFE_WAIT(NULL, &status); > - > - if (WIFEXITED(status) && (WEXITSTATUS(status) == 4)) { > - tst_resm(TPASS, "exit_group() succeeded"); > - } else { > - tst_resm(TFAIL | TERRNO, > - "exit_group() failed (wait status = %d)", w); > - } > + if (TST_RET == -1) > + tst_brk(TBROK | TERRNO, "exit_group() error"); > + > + return; > } > + > + SAFE_WAITPID(pid, &status, 0); > + > + TST_EXP_EXPR(WIFEXITED(status) && WEXITSTATUS(status) == 4, > + "exit_group() succeeded"); > + > + int old_counter = *counter; > + > + tst_res(TINFO, "Checking if threads are still running"); > + usleep(1000000); > + > + TST_EXP_EXPR(old_counter == *counter, "Counter value hasn't changed"); > } > > -int main(int ac, char **av) > +static void setup(void) > { > - int lc; > - > - tst_parse_opts(ac, av, NULL, NULL); > + tids = SAFE_MMAP( > + NULL, > + sizeof(pid_t) * THREADS_NUM, > + PROT_READ | PROT_WRITE, > + MAP_SHARED | MAP_ANONYMOUS, > + -1, 0); > > - for (lc = 0; TEST_LOOPING(lc); lc++) > - verify_exit_group(); > + counter = SAFE_MMAP( > + NULL, > + sizeof(int), > + PROT_READ | PROT_WRITE, > + MAP_SHARED | MAP_ANONYMOUS, > + -1, 0); > +} nit; mmap always maps at least a page, so calling it twice is wasteful. If we are setting up shared memory with more than one variable in then the cleanest way to do it is to create a struct with the variables in e.g. struct shm { int counter; pid_t pid; }; struct shm *shm = SAFE_MMAP(0, 2 * sizeof(struct shm) * tst_ncpus(), ...); struct shm *copy = shm + tst_ncpus() Also if each thread has its own counter then we won't have all the CPUs fighting to atomically update the memory which could be an issue on a machine with >128 cores. Then you can memcpy the whole shm and memcmp it after the delay. > > - tst_exit(); > +static void cleanup(void) > +{ > + SAFE_MUNMAP(tids, sizeof(pid_t) * THREADS_NUM); > + SAFE_MUNMAP(counter, sizeof(int)); > } > + > +static struct tst_test test = { > + .setup = setup, > + .cleanup = cleanup, > + .test_all = run, > + .forks_child = 1, > + .needs_checkpoints = 1, > +}; > -- > 2.35.3 -- Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-11-22 10:31 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-11-21 17:26 [LTP] [PATCH v4 0/2] Rewrite exit_group01 test Andrea Cervesato 2023-11-21 17:26 ` [LTP] [PATCH v4 1/2] Add tst_gettid wrapper around gettid syscall Andrea Cervesato 2023-11-21 17:26 ` [LTP] [PATCH v4 2/2] Refactor exit_group01 using new API Andrea Cervesato 2023-11-22 9:31 ` Richard Palethorpe
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox