- linux-morello-ltp - op-lists.linaro.org

[PATCH v2] semctl03: Rework tests to avoid pointless variadic-ness

by Beata Michalska

Simplify semctl03 testcases by dropping the variadicness from test wrappers which might spin out of control if not handled correctly. Also, it seems that the level of indirection for the valid union semun argument went slightly too far, resulting in passing over an address of the above mentioned union instead it's value, so fix that one as well. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- v2: - restore test wrappers but drop variadicness from those .../kernel/syscalls/ipc/semctl/semctl03.c | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl03.c b/testcases/kernel/syscalls/ipc/semctl/semctl03.c index f9f335e4a..dacd929b6 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl03.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl03.c @@ -21,28 +21,16 @@ static int sem_id = -1; static int bad_id = -1; static struct semid_ds sem_ds; -static union semun sem_un = {.buf = &sem_ds}; -static void *semds_ptr = &sem_un; +static void *semds_ptr = &sem_ds; static void *bad_ptr; -static union semun arg = {0}; -static int libc_semctl(int semid, int semnum, int cmd, ...) +static int libc_semctl(int semid, int semnum, int cmd, union semun arg) { - va_list ap; - - va_start(ap, cmd); - arg = va_arg(ap, union semun); - va_end(ap); return semctl(semid, semnum, cmd, arg); } -static int sys_semctl(int semid, int semnum, int cmd, ...) +static int sys_semctl(int semid, int semnum, int cmd, union semun arg) { - va_list ap; - - va_start(ap, cmd); - arg = va_arg(ap, union semun); - va_end(ap); return tst_syscall(__NR_semctl, semid, semnum, cmd, arg); } @@ -61,7 +49,7 @@ static struct tcases { static struct test_variants { - int (*semctl)(int semid, int semnum, int cmd, ...); + int (*semctl)(int semid, int semnum, int cmd, union semun arg); char *desc; } variants[] = { { .semctl = libc_semctl, .desc = "libc semctl()"}, @@ -74,13 +62,14 @@ static void verify_semctl(unsigned int n) { struct tcases *tc = &tests[n]; struct test_variants *tv = &variants[tst_variant]; + union semun arg = {.buf = *(tc->buf)}; if (tc->error == EFAULT && tv->semctl == libc_semctl) { tst_res(TCONF, "EFAULT is skipped for libc variant"); return; } - TST_EXP_FAIL(tv->semctl(*(tc->sem_id), 0, tc->ipc_cmd, *(tc->buf)), + TST_EXP_FAIL(tv->semctl(*(tc->sem_id), 0, tc->ipc_cmd, arg), tc->error, "semctl() with %s", tc->message); } -- 2.25.1

1 year, 11 months

3
2
0 0

[PATCH] semctl03: Rework tests to avoid pointless variadic-ness

by Beata Michalska

Simplify semctl03 testcases by dropping the variadic wrappers which might spin out of control if not handled correctly. Also, it seems that the level of indirection for the valid union semun argument went slightly too far, resulting in passing over an address of the above mentioned union instead it's value, so fix that one as well. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- .../kernel/syscalls/ipc/semctl/semctl03.c | 50 +++++++------------ 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl03.c b/testcases/kernel/syscalls/ipc/semctl/semctl03.c index f9f335e4a..4686b366b 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl03.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl03.c @@ -16,35 +16,14 @@ #include "lapi/sem.h" #include "libnewipc.h" #include "lapi/syscalls.h" +#include <stdbool.h> static int sem_id = -1; static int bad_id = -1; static struct semid_ds sem_ds; -static union semun sem_un = {.buf = &sem_ds}; -static void *semds_ptr = &sem_un; +static void *semds_ptr = &sem_ds; static void *bad_ptr; -static union semun arg = {0}; - -static int libc_semctl(int semid, int semnum, int cmd, ...) -{ - va_list ap; - - va_start(ap, cmd); - arg = va_arg(ap, union semun); - va_end(ap); - return semctl(semid, semnum, cmd, arg); -} - -static int sys_semctl(int semid, int semnum, int cmd, ...) -{ - va_list ap; - - va_start(ap, cmd); - arg = va_arg(ap, union semun); - va_end(ap); - return tst_syscall(__NR_semctl, semid, semnum, cmd, arg); -} static struct tcases { int *sem_id; @@ -61,12 +40,12 @@ static struct tcases { static struct test_variants { - int (*semctl)(int semid, int semnum, int cmd, ...); + bool syscall_wrapper; char *desc; } variants[] = { - { .semctl = libc_semctl, .desc = "libc semctl()"}, + { true, .desc = "libc semctl()"}, #if (__NR_sys_semctl != __LTP__NR_INVALID_SYSCALL) - { .semctl = sys_semctl, .desc = "__NR_semctl syscall"}, + { false, .desc = "__NR_semctl syscall"}, #endif }; @@ -74,14 +53,19 @@ static void verify_semctl(unsigned int n) { struct tcases *tc = &tests[n]; struct test_variants *tv = &variants[tst_variant]; - - if (tc->error == EFAULT && tv->semctl == libc_semctl) { - tst_res(TCONF, "EFAULT is skipped for libc variant"); - return; + union semun arg = {.buf = *(tc->buf)}; + + if (tv->syscall_wrapper) { + if (tc->error == EFAULT) + tst_res(TCONF, "EFAULT is skipped for libc variant"); + else + TST_EXP_FAIL(semctl(*(tc->sem_id), 0, tc->ipc_cmd, arg), + tc->error, "semctl() with %s", tc->message); + } else { + TST_EXP_FAIL(tst_syscall(__NR_semctl, *(tc->sem_id), 0, + tc->ipc_cmd, arg), tc->error, + "semctl() with %s", tc->message); } - - TST_EXP_FAIL(tv->semctl(*(tc->sem_id), 0, tc->ipc_cmd, *(tc->buf)), - tc->error, "semctl() with %s", tc->message); } static void setup(void) -- 2.25.1

1 year, 11 months

2
1
0 0

[PATCH v2] syscalls/clone3: Update struct clone_args

by Beata Michalska

Update the signature for clone_args struct bringing in support for capabilities and re-visit relevant testcases to take into account struct's new published versions. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- v2: - pull in definition of offsetoff from stddef.h include/lapi/clone.h | 19 +++++++++++-------- testcases/kernel/syscalls/clone3/clone302.c | 3 ++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/include/lapi/clone.h b/include/lapi/clone.h index 437d1376f..6ff5e618b 100644 --- a/include/lapi/clone.h +++ b/include/lapi/clone.h @@ -17,14 +17,17 @@ #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; + __aligned_u64 flags; + __kernel_aligned_uintptr_t pidfd; + __kernel_aligned_uintptr_t child_tid; + __kernel_aligned_uintptr_t parent_tid; + __aligned_u64 exit_signal; + __kernel_aligned_uintptr_t stack; + __aligned_u64 stack_size; + __kernel_aligned_uintptr_t tls; + __kernel_aligned_uintptr_t set_tid; + __aligned_u64 set_tid_size; + __aligned_u64 cgroup; }; static inline int clone3(struct clone_args *args, size_t size) diff --git a/testcases/kernel/syscalls/clone3/clone302.c b/testcases/kernel/syscalls/clone3/clone302.c index 08d6417ce..ec188bb05 100644 --- a/testcases/kernel/syscalls/clone3/clone302.c +++ b/testcases/kernel/syscalls/clone3/clone302.c @@ -12,6 +12,7 @@ #define _GNU_SOURCE #include <stdlib.h> +#include <stddef.h> #include "tst_test.h" #include "lapi/clone.h" @@ -34,7 +35,7 @@ static struct tcase { } tcases[] = { {"invalid args", &invalid_args, sizeof(*valid_args), 0, NULL, SIGCHLD, 0, 0, 0, EFAULT}, {"zero size", &valid_args, 0, 0, NULL, SIGCHLD, 0, 0, 0, EINVAL}, - {"short size", &valid_args, sizeof(*valid_args) - 1, 0, NULL, SIGCHLD, 0, 0, 0, EINVAL}, + {"short size", &valid_args, offsetof(struct clone_args, tls) - 1, 0, NULL, SIGCHLD, 0, 0, 0, EINVAL}, {"extra size", &valid_args, sizeof(*valid_args) + 1, 0, NULL, SIGCHLD, 0, 0, 0, EFAULT}, {"sighand-no-VM", &valid_args, sizeof(*valid_args), CLONE_SIGHAND, NULL, SIGCHLD, 0, 0, 0, EINVAL}, {"thread-no-sighand", &valid_args, sizeof(*valid_args), CLONE_THREAD, NULL, SIGCHLD, 0, 0, 0, EINVAL}, -- 2.25.1

1 year, 11 months

2
1
0 0

[PATCH] runtest: Enable execve test for empty argv

by Beata Michalska

As per upstream commit: 47ebb84018c6 ("syscalls/execve06: Add test for argv[0] = NULL") new execve testcase has been added. Enable it for Morello transitional list as well. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- runtest/morello_transitional | 1 + 1 file changed, 1 insertion(+) diff --git a/runtest/morello_transitional b/runtest/morello_transitional index e877c08ee..458e6287c 100644 --- a/runtest/morello_transitional +++ b/runtest/morello_transitional @@ -35,6 +35,7 @@ execve02 execve02 execve03 execve03 execve04 execve04 execve05 execve05 -i 5 -n 32 +execve06 execve06 exit01 exit01 exit02 exit02 -- 2.25.1

1 year, 11 months

2
1
0 0

[PATCH] runtest: Remove open05 from morello_transitional testcases list

by Beata Michalska

As per upstream commit: 72efdad1d07b ("Remove open05.c") the open05 test is no longer available (functionality covered by open08 one) so drop it from Morello transitional syscall list. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- runtest/morello_transitional | 1 - 1 file changed, 1 deletion(-) diff --git a/runtest/morello_transitional b/runtest/morello_transitional index 334c8a4ba..e877c08ee 100644 --- a/runtest/morello_transitional +++ b/runtest/morello_transitional @@ -238,7 +238,6 @@ open01 open01 open02 open02 open03 open03 open04 open04 -open05 open05 open06 open06 open07 open07 open08 open08 -- 2.25.1

1 year, 11 months

2
2
0 0

[PATCH] syscalls/clone3: Update struct clone_args

by Beata Michalska

Update the signature for clone_args struct bringing in support for capabilities and re-visit relevant testcases to take into account struct's new published versions. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- include/lapi/clone.h | 19 +++++++++++-------- testcases/kernel/syscalls/clone3/clone302.c | 4 +++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/lapi/clone.h b/include/lapi/clone.h index 437d1376f..6ff5e618b 100644 --- a/include/lapi/clone.h +++ b/include/lapi/clone.h @@ -17,14 +17,17 @@ #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; + __aligned_u64 flags; + __kernel_aligned_uintptr_t pidfd; + __kernel_aligned_uintptr_t child_tid; + __kernel_aligned_uintptr_t parent_tid; + __aligned_u64 exit_signal; + __kernel_aligned_uintptr_t stack; + __aligned_u64 stack_size; + __kernel_aligned_uintptr_t tls; + __kernel_aligned_uintptr_t set_tid; + __aligned_u64 set_tid_size; + __aligned_u64 cgroup; }; static inline int clone3(struct clone_args *args, size_t size) diff --git a/testcases/kernel/syscalls/clone3/clone302.c b/testcases/kernel/syscalls/clone3/clone302.c index 08d6417ce..b6d8698ef 100644 --- a/testcases/kernel/syscalls/clone3/clone302.c +++ b/testcases/kernel/syscalls/clone3/clone302.c @@ -16,6 +16,8 @@ #include "tst_test.h" #include "lapi/clone.h" +#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) + static struct clone_args *valid_args, *invalid_args; unsigned long stack; static int *invalid_address; @@ -34,7 +36,7 @@ static struct tcase { } tcases[] = { {"invalid args", &invalid_args, sizeof(*valid_args), 0, NULL, SIGCHLD, 0, 0, 0, EFAULT}, {"zero size", &valid_args, 0, 0, NULL, SIGCHLD, 0, 0, 0, EINVAL}, - {"short size", &valid_args, sizeof(*valid_args) - 1, 0, NULL, SIGCHLD, 0, 0, 0, EINVAL}, + {"short size", &valid_args, offsetof(struct clone_args, tls) - 1, 0, NULL, SIGCHLD, 0, 0, 0, EINVAL}, {"extra size", &valid_args, sizeof(*valid_args) + 1, 0, NULL, SIGCHLD, 0, 0, 0, EFAULT}, {"sighand-no-VM", &valid_args, sizeof(*valid_args), CLONE_SIGHAND, NULL, SIGCHLD, 0, 0, 0, EINVAL}, {"thread-no-sighand", &valid_args, sizeof(*valid_args), CLONE_THREAD, NULL, SIGCHLD, 0, 0, 0, EINVAL}, -- 2.25.1

1 year, 11 months

2
1
0 0

[PATCH] syscalls/msync: map and unmap to get ENOMEM

by Teo Couprie Diaz

In msync03, sbrk(0) was used and offset to get a pointer to an unmapped area. This caused issues in purecap because sbrk is now disabled, and in compat with the 1.5 verrsion of musl because of a bug in the sbrk implementation. Instead, don't rely on sbrk at all and mmap a page, unmap it and use this pointer in order to get an unmapped area of memory, generating an ENOMEM in compat and purecap. Signed-off-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com> --- testcases/kernel/syscalls/msync/msync03.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testcases/kernel/syscalls/msync/msync03.c b/testcases/kernel/syscalls/msync/msync03.c index 8fa62e57a..6d59c9d26 100644 --- a/testcases/kernel/syscalls/msync/msync03.c +++ b/testcases/kernel/syscalls/msync/msync03.c @@ -130,8 +130,17 @@ static void setup(void) SAFE_GETRLIMIT(NULL, RLIMIT_DATA, &rl); addr3 = (char *)(uintptr_t)rl.rlim_max; - /* memory pointed to by addr4 was not mapped */ - addr4 = sbrk(0) + (4 * page_sz); + /* memory pointed to by addr4 is not mapped */ + addr4 = mmap(NULL, page_sz, PROT_NONE, MAP_PRIVATE, 0, 0); + if (addr4 == MAP_FAILED) { + addr4 = NULL; + } else { + if (!munmap(addr4, page_sz)) + tst_resm(TFAIL, "Could not setup test, munmap failed :\n%s", + strerror(errno)); + } + + tst_resm(TINFO, "addr4 : %p", addr4); } static void msync_verify(struct test_case_t *tc) -- 2.25.1

1 year, 11 months

2
5
0 0

[PATCH v2] runtest: Disable brk* testcases for Morello

by Beata Michalska

Disable brk* tests as those depend on yet to be released Morello Linux kernel version. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- Targetting LTP morello/master only v2: - Dropped the comment on dependency as one was added in a separate patch runtest/morello_transitional_extended | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index 286e3e568..6bfa14058 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -1,8 +1,8 @@ #DESCRIPTION: Morello transitional extended ABI system calls #KERN - depends on Morello Linux kernel release > morello-release-1.5.0 -brk01 brk01 -brk02 brk02 +#brk01 brk01 +#brk02 brk02 #KERN - epoll_*: depends on Morello Linux kernel release >= morello-release-1.5.0 epoll_create01 epoll_create01 -- 2.25.1

1 year, 11 months

4
3
0 0

[PATCH] runtest: Add dependency notes to the extended list of PCuABI testcases

by Beata Michalska

Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- runtest/morello_transitional_extended | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index 240dec83f..286e3e568 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -1,9 +1,12 @@ #DESCRIPTION: Morello transitional extended ABI system calls +#KERN - depends on Morello Linux kernel release > morello-release-1.5.0 brk01 brk01 brk02 brk02 +#KERN - epoll_*: depends on Morello Linux kernel release >= morello-release-1.5.0 epoll_create01 epoll_create01 +#MUSL - depends on Musl release >= morello-release-1.5.0 epoll_create02 epoll_create02 epoll_create1_01 epoll_create1_01 epoll_create1_02 epoll_create1_02 @@ -24,6 +27,7 @@ epoll_pwait03 epoll_pwait03 epoll_pwait04 epoll_pwait04 epoll_pwait05 epoll_pwait05 +#KERN - io_*: depends on Morello Linux kernel release >= morello-release-1.5.0 io_cancel01 io_cancel01 io_cancel02 io_cancel02 io_destroy01 io_destroy01 @@ -37,6 +41,7 @@ io_submit01 io_submit01 io_submit02 io_submit02 io_submit03 io_submit03 +#KERN - keyctl*: depends on Morello Linux kernel release >= morello-release-1.5.0 keyctl01 keyctl01 keyctl02 keyctl02 keyctl03 keyctl03 @@ -73,6 +78,7 @@ semop01 semop01 semop02 semop02 semop03 semop03 +#KERN - shmat*: depends on Morello Linux kernel release >= morello-release-1.5.0 shmat01 shmat01 shmat02 shmat02 shmat03 shmat03 -- 2.25.1

1 year, 11 months

2
1
0 0

[PATCH] runtest: Disable brk* testcases for Morello

by Beata Michalska

Disable brk* tests as those depend on yet to be released Morello Linux kernel version. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- This patch is targeting LTP morello/master only. runtest/morello_transitional_extended | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index 240dec83f..01db9d821 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -1,7 +1,8 @@ #DESCRIPTION: Morello transitional extended ABI system calls -brk01 brk01 -brk02 brk02 +#KERN - depends on Morello Linux kernel release > morello-release-1.5.0 +#brk01 brk01 +#brk02 brk02 epoll_create01 epoll_create01 epoll_create02 epoll_create02 -- 2.25.1

1 year, 11 months

2
3
0 0

2024

2023

2022

linux-morello-ltp