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

[PATCH v2] runtest: Skip mremap06 in purecap

by Kevin Brodsky

The mremap06 test relies on being able to move a mapping into the unmapped space of an existing reservation (second call to mremap() in do_test()). This is explicitly disallowed in PCuABI (for all syscalls that can create mappings), and it is unclear if the original bug can be reproduced if remapping to another adddress, so let's just skip the test when running in purecap, at least for now. Signed-off-by: Kevin Brodsky <kevin.brodsky(a)arm.com> --- runtest/morello_transitional | 4 +++- runtest/syscalls_morello_purecap_skip | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/runtest/morello_transitional b/runtest/morello_transitional index 702f62c0f42c..8d52fa1a2ec2 100644 --- a/runtest/morello_transitional +++ b/runtest/morello_transitional @@ -234,7 +234,9 @@ mremap02 mremap02 mremap03 mremap03 mremap04 mremap04 mremap05 mremap05 -mremap06 mremap06 +# This test is currently incompatible with the PCuABI specification +# (mremap() into unmapped space in an existing reservation). +#mremap06 mremap06 munmap01 munmap01 munmap02 munmap02 diff --git a/runtest/syscalls_morello_purecap_skip b/runtest/syscalls_morello_purecap_skip index e4d66ee1b27f..4fa73ed9124c 100644 --- a/runtest/syscalls_morello_purecap_skip +++ b/runtest/syscalls_morello_purecap_skip @@ -6,3 +6,7 @@ process_vm_readv02 process_vm_readv03 process_vm_writev02 + +# This test is currently incompatible with the PCuABI specification +# (mremap() into unmapped space in an existing reservation). +mremap06 -- 2.43.0

7 months

2
1
0 0

[PATCH] syscalls/mremap06: Skip in purecap

by Kevin Brodsky

The mremap06 test relies on being able to move a mapping into the unmapped space of an existing reservation (second call to mremap() in do_test()). This is explicitly disallowed in PCuABI (for all syscalls that can create mappings), and it is unclear if the original bug can be reproduced if remapping to another adddress, so let's just skip the test in PCuABI. Signed-off-by: Kevin Brodsky <kevin.brodsky(a)arm.com> --- testcases/kernel/syscalls/mremap/mremap06.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testcases/kernel/syscalls/mremap/mremap06.c b/testcases/kernel/syscalls/mremap/mremap06.c index a19262750772..478840165cdc 100644 --- a/testcases/kernel/syscalls/mremap/mremap06.c +++ b/testcases/kernel/syscalls/mremap/mremap06.c @@ -96,6 +96,10 @@ static void setup(void) { int ret, i; +#ifdef __CHERI_PURE_CAPABILITY__ + tst_brk(TCONF, "Cannot test mremap() into unmapped space in purecap: not supported"); +#endif + page_size = getpagesize(); mmap_size = (NUM_PAGES+1) * page_size; mremap_size = NUM_PAGES * page_size; -- 2.43.0

7 months

2
2
0 0

[PATCH 00/10] Fixes to support reservations / PCuABI mmap*

by Kevin Brodsky

Hi, This series fixes various issues in LTP that prevent tests from passing when reservations / PCuABI address space management are implemented. Patch 1-3 are generic, and arguably general improvements. The remainder of the patches are PCuABI-specific, with appropriate #ifdef'ing where necessary. The changes are meant to be backwards-compatible (e.g. ERESERVATION is not assumed to be returned in PCuABI). Review branch: https://git.morello-project.org/kbrodsky-arm/morello-linux-ltp/-/commits/mo… Thanks, Kevin Kevin Brodsky (10): syscalls/munlock: Pass an appropriate length to munlock() syscalls/m{,un}lock: Use mmap() to obtain an owning pointer syscalls/m{,un}map: Pass a raw address when reusing an address range syscalls: Use PROT_MAX() where needed syscalls/mmap: Allow MREMAP_MAYMOVE in PCuABI syscalls/mlock{,2}: Expect ERESERVATION on unmapped area syscalls/mmap: Expect EINVAL on MAP_FIXED_NOREPLACE syscalls/mprotect: Expect EINVAL on null pointer syscalls/mremap: Expect EINVAL on narrow pointer syscalls/mmap: Skip MAP_GROWSDOWN tests in PCuABI .../syscalls/memfd_create/memfd_create_common.c | 3 ++- testcases/kernel/syscalls/mlock/mlock01.c | 13 +++---------- testcases/kernel/syscalls/mlock/mlock02.c | 12 +++++++++++- testcases/kernel/syscalls/mlock2/mlock202.c | 5 +++-- testcases/kernel/syscalls/mmap/mmap16.c | 11 +++++++++-- testcases/kernel/syscalls/mmap/mmap17.c | 4 ++++ testcases/kernel/syscalls/mmap/mmap18.c | 7 +++++++ testcases/kernel/syscalls/mmap/mmap19.c | 4 ++-- testcases/kernel/syscalls/mprotect/mprotect01.c | 11 +++++++++-- testcases/kernel/syscalls/mprotect/mprotect02.c | 3 ++- testcases/kernel/syscalls/mprotect/mprotect04.c | 5 +++-- testcases/kernel/syscalls/mprotect/mprotect05.c | 4 +++- testcases/kernel/syscalls/mremap/mremap03.c | 5 +++++ testcases/kernel/syscalls/mremap/mremap05.c | 4 +++- testcases/kernel/syscalls/munlock/munlock01.c | 13 +++---------- testcases/kernel/syscalls/munlock/munlock02.c | 1 + 16 files changed, 70 insertions(+), 35 deletions(-) -- 2.43.0

7 months

2
15
0 0

[Announcement] Morello LTP 1.8.0 Integration drop - changelog

by Beata Michalska

Hi All, The Morello LTP 1.8.0 integration drop is now available [1] Main changes: ------------ - Merged upstream LTP 20230929 release (see [2] for details) - Number of small fixes aligning LTP testcases with capabilities and PCuABI - Added support for capabilities to bpf testcases Contributions: ------------- Shout out to all the contributors and reviewers for all the work behind getting the changes in, much appreciated! git shortlog -s -e -n --invert-grep --grep="cherry" morello-release-1.7.0.. 13 Kevin Brodsky <kevin.brodsky(a)arm.com> 5 Zachary Leaf <zachary.leaf(a)arm.com> 2 Teo Couprie Diaz <teo.coupriediaz(a)arm.com> --- [1] https://git.morello-project.org/morello/morello-linux-ltp/-/tags/morello-re… [2] https://github.com/linux-test-project/ltp/releases/tag/20230929

7 months

1
0
0 0

[PATCH] runtest: Sync the list of testcases for Morello

by Beata Michalska

Update Morello runtest files to sync with merged upstream tag 20230929 Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- runtest/morello_transitional | 12 +++++++++--- runtest/morello_transitional_extended | 8 ++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/runtest/morello_transitional b/runtest/morello_transitional index d851948be..702f62c0f 100644 --- a/runtest/morello_transitional +++ b/runtest/morello_transitional @@ -26,6 +26,7 @@ clone09 clone09 clone301 clone301 clone302 clone302 +clone303 clone303 close01 close01 close02 close02 @@ -43,6 +44,10 @@ exit02 exit02 exit_group01 exit_group01 faccessat01 faccessat01 +faccessat02 faccessat02 + +faccessat201 faccessat201 +faccessat202 faccessat202 fchdir01 fchdir01 fchdir02 fchdir02 @@ -53,7 +58,6 @@ fcntl02 fcntl02 fcntl03 fcntl03 fcntl04 fcntl04 fcntl05 fcntl05 -fcntl06 fcntl06 fcntl07 fcntl07 fcntl08 fcntl08 fcntl09 fcntl09 @@ -190,6 +194,7 @@ madvise07 madvise07 madvise08 madvise08 madvise09 madvise09 madvise10 madvise10 +madvise11 madvise11 mmap001 mmap001 -m 1 @@ -199,7 +204,6 @@ mmap03 mmap03 mmap04 mmap04 mmap05 mmap05 mmap06 mmap06 -mmap07 mmap07 mmap08 mmap08 mmap09 mmap09 mmap10 mmap10 @@ -218,17 +222,19 @@ mmap17 mmap17 #MUSL - depends on Musl release >= morello-release-1.5.0 mmap18 mmap18 mmap19 mmap19 - +mmap20 mmap20 mprotect01 mprotect01 mprotect02 mprotect02 mprotect03 mprotect03 mprotect04 mprotect04 +mprotect05 mprotect05 mremap01 mremap01 mremap02 mremap02 mremap03 mremap03 mremap04 mremap04 mremap05 mremap05 +mremap06 mremap06 munmap01 munmap01 munmap02 munmap02 diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index 44641a33e..eff21411b 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -33,6 +33,9 @@ epoll_wait01 epoll_wait01 epoll_wait02 epoll_wait02 epoll_wait03 epoll_wait03 epoll_wait04 epoll_wait04 +epoll_wait05 epoll_wait05 +epoll_wait06 epoll_wait06 +epoll_wait07 epoll_wait07 epoll_wait99 epoll_wait99 epoll_pwait01 epoll_pwait01 epoll_pwait02 epoll_pwait02 @@ -72,6 +75,7 @@ keyctl09 keyctl09 mq_open01 mq_open01 mq_notify01 mq_notify01 mq_notify02 mq_notify02 +mq_notify03 mq_notify03 mq_timedsend01 mq_timedsend01 mq_timedreceive01 mq_timedreceive01 mq_unlink01 mq_unlink01 @@ -106,12 +110,12 @@ semctl08 semctl08 semctl09 semctl09 semget01 semget01 semget02 semget02 -semget03 semget03 semget05 semget05 -semget06 semget06 semop01 semop01 semop02 semop02 semop03 semop03 +semop04 semop04 +semop05 semop05 #KERN - shmat*: depends on Morello Linux kernel release >= morello-release-1.5.0 shmat01 shmat01 -- 2.25.1

10 months

1
0
0 0

[PATCH] fanotify14: Add support for validating kernel version

by Beata Michalska

Some of the test cases for fanotify14 do rely on a fairly recent kernel changes. Make sure those are available before triggering relevant tests. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- testcases/kernel/syscalls/fanotify/fanotify14.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testcases/kernel/syscalls/fanotify/fanotify14.c b/testcases/kernel/syscalls/fanotify/fanotify14.c index 4596511f0..8556f70c0 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify14.c +++ b/testcases/kernel/syscalls/fanotify/fanotify14.c @@ -27,6 +27,7 @@ #define _GNU_SOURCE #include "tst_test.h" #include <errno.h> +#include <stdbool.h> #ifdef HAVE_SYS_FANOTIFY_H #include "fanotify.h" @@ -65,6 +66,12 @@ static struct test_case_t { struct test_case_flags_t mask; int expected_errno; int *pfd; + /* + * This should be handled by min_kver from the test itself, + * but as in this case it's a set of test cases ... + */ + bool verify_kver; + } test_cases[] = { /* FAN_REPORT_FID without class FAN_CLASS_NOTIF is not valid */ { @@ -228,6 +235,7 @@ static struct test_case_t { .mask = { FAN_ACCESS, "anonymous pipe"}, .pfd = pipes, .expected_errno = EINVAL, + .verify_kver = true, }, /* filesystem mark on anonymous pipe is not valid */ { @@ -236,6 +244,7 @@ static struct test_case_t { .mask = { FAN_ACCESS, "anonymous pipe"}, .pfd = pipes, .expected_errno = EINVAL, + .verify_kver = true, }, }; @@ -246,6 +255,11 @@ static void do_test(unsigned int number) tst_res(TINFO, "Test case %d: fanotify_init(%s, O_RDONLY)", number, tc->init.desc); + if (tc->verify_kver && tst_kvercmp(6, 5, 0) < 0) { + tst_res(TCONF, "Required kernel version 6.5.0 or higher"); + return; + } + if (fan_report_target_fid_unsupported && tc->init.flags & FAN_REPORT_TARGET_FID) { FANOTIFY_INIT_FLAGS_ERR_MSG(FAN_REPORT_TARGET_FID, fan_report_target_fid_unsupported); -- 2.25.1

10 months

2
4
0 0

[PATCH] syscalls/epoll_wait: Rename epoll_wait05 test

by Beata Michalska

In order to avoid name collisions with current (and potentially future) upstream changes, rename the epoll_wait05 test. The naming is definitely far from being perfect but t leaves a lot of space for introducing new tests without generating conflicts. Besides, there does not seem to be any other established way of doing that with no clear guidelines on how to specify test descriptor in such cases (even when considering tests sub-grouping). So there it is ... Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- runtest/morello_transitional_extended | 2 +- runtest/syscalls | 2 +- testcases/kernel/syscalls/epoll_wait/.gitignore | 2 +- .../syscalls/epoll_wait/{epoll_wait05.c => epoll_wait99.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename testcases/kernel/syscalls/epoll_wait/{epoll_wait05.c => epoll_wait99.c} (100%) diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index b145d4672..44641a33e 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -33,7 +33,7 @@ epoll_wait01 epoll_wait01 epoll_wait02 epoll_wait02 epoll_wait03 epoll_wait03 epoll_wait04 epoll_wait04 -epoll_wait05 epoll_wait05 +epoll_wait99 epoll_wait99 epoll_pwait01 epoll_pwait01 epoll_pwait02 epoll_pwait02 epoll_pwait03 epoll_pwait03 diff --git a/runtest/syscalls b/runtest/syscalls index 921afe312..abb98b3d2 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -175,7 +175,7 @@ epoll_wait01 epoll_wait01 epoll_wait02 epoll_wait02 epoll_wait03 epoll_wait03 epoll_wait04 epoll_wait04 -epoll_wait05 epoll_wait05 +epoll_wait99 epoll_wait99 epoll_pwait01 epoll_pwait01 epoll_pwait02 epoll_pwait02 epoll_pwait03 epoll_pwait03 diff --git a/testcases/kernel/syscalls/epoll_wait/.gitignore b/testcases/kernel/syscalls/epoll_wait/.gitignore index ab5a9c010..84387a306 100644 --- a/testcases/kernel/syscalls/epoll_wait/.gitignore +++ b/testcases/kernel/syscalls/epoll_wait/.gitignore @@ -2,4 +2,4 @@ epoll_wait01 epoll_wait02 epoll_wait03 epoll_wait04 -epoll_wait05 +epoll_wait99 diff --git a/testcases/kernel/syscalls/epoll_wait/epoll_wait05.c b/testcases/kernel/syscalls/epoll_wait/epoll_wait99.c similarity index 100% rename from testcases/kernel/syscalls/epoll_wait/epoll_wait05.c rename to testcases/kernel/syscalls/epoll_wait/epoll_wait99.c -- 2.25.1

10 months

2
1
0 0

[PATCH v4 0/4] add eBPF support

by Zachary Leaf

Looks like we're almost there with the bpf syscall patches on the linux-morello list[1]. Some of the bpf tests require either CAP_SYS_ADMIN or CAP_BPF, or enabling unprivileged bpf with: echo "0" > /proc/sys/kernel/unprivileged_bpf_disabled Thanks, Zach Review branch: https://git.morello-project.org/zdleaf/morello-linux-test-project/-/tree/mo… Kernel changes: https://git.morello-project.org/zdleaf/linux/-/tree/morello/bpf_v6 [1] https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org… v3..v4: - Move ptr_to_u64() delete from patch 1 to patch 2 Zachary Leaf (4): bpf: update lapi with new bpf.h bpf: align tests with PCuABI/uAPI bpf: add bpf_valid_attr test runtest: add bpf to extended PCuABI syscall list include/lapi/bpf.h | 354 +++++++++++++----- runtest/morello_transitional_extended | 13 + testcases/kernel/syscalls/bpf/bpf_common.c | 10 +- testcases/kernel/syscalls/bpf/bpf_map01.c | 12 +- testcases/kernel/syscalls/bpf/bpf_prog03.c | 4 +- .../kernel/syscalls/bpf/bpf_valid_attr.c | 59 +++ 6 files changed, 349 insertions(+), 103 deletions(-) create mode 100644 testcases/kernel/syscalls/bpf/bpf_valid_attr.c -- 2.34.1

11 months, 1 week

3
10
0 0

[PATCH v2] libs/libltpvdso: Add support for purecap vDSO testing

by Aditya Deshpande

Tests which currently use the vDSO find it using getauxval(). However, in purecap, the pointer to the vDSO in the auxiliary vector is a capability and therefore cannot be returned as an unsigned long. Replace getauxval() with getauxptr() when building for purecap to solve this issue. This patch replicates changes made to the Morello kernel vDSO selftests to enable testing in purecap. See Morello/Linux/Kernel: ("Add support for purecap vDSO testing"). Signed-off-by: Aditya Deshpande <aditya.deshpande(a)arm.com> --- include/parse_vdso.h | 20 ++++++++++++++++++++ libs/libltpvdso/vdso_helpers.c | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/parse_vdso.h b/include/parse_vdso.h index 5212fc659..643c773da 100644 --- a/include/parse_vdso.h +++ b/include/parse_vdso.h @@ -9,6 +9,10 @@ #include <stdint.h> +#ifdef HAVE_GETAUXVAL +# include <sys/auxv.h> +#endif /* HAVE_GETAUXVAL */ + /* * To use this vDSO parser, first call one of the vdso_init_* functions. * If you've already parsed auxv, then pass the value of AT_SYSINFO_EHDR @@ -38,4 +42,20 @@ extern void *vdso_sym(const char *version, const char *name); typedef int (*gettime_t)(clockid_t clk_id, void *ts); void find_clock_gettime_vdso(gettime_t *ptr_vdso_gettime, gettime_t *ptr_vdso_gettime64); + +/* + * Under PCuABI, pointers in the auxiliary vector can no longer be represented + * as unsigned long as they are now capabilities. Get the capability to the + * vDSO using getauxptr() instead, which returns a a capability instead of + * unsigned long. + */ +static inline uintptr_t get_sysinfo_ehdr() +{ +#ifdef __CHERI_PURE_CAPABILITY__ + return (uintptr_t)getauxptr(AT_SYSINFO_EHDR); +#else + return getauxval(AT_SYSINFO_EHDR); +#endif +} + #endif /* PARSE_VDSO_H__ */ diff --git a/libs/libltpvdso/vdso_helpers.c b/libs/libltpvdso/vdso_helpers.c index 208c12f65..cb5e01687 100644 --- a/libs/libltpvdso/vdso_helpers.c +++ b/libs/libltpvdso/vdso_helpers.c @@ -14,7 +14,7 @@ # include <sys/auxv.h> #endif /* HAVE_GETAUXVAL */ -static unsigned long sysinfo_ehdr; +static uintptr_t sysinfo_ehdr; static void vdso_init(void) { @@ -22,7 +22,7 @@ static void vdso_init(void) if (sysinfo_ehdr) return; - sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR); + sysinfo_ehdr = get_sysinfo_ehdr(); if (!sysinfo_ehdr) { tst_res(TINFO, "Couldn't find AT_SYSINFO_EHDR"); return; -- 2.25.1

11 months, 1 week

3
3
0 0

[PATCH] libs/libltpvdso: Add support for purecap vDSO testing

by Aditya Deshpande

Tests which currently use the vDSO find it using getauxval(). However, in purecap, the pointer to the vDSO in the auxiliary vector is a capability and therefore cannot be returned as an unsigned long. Replace getauxval() with getauxptr() when building for purecap to solve this issue. This patch replicates changes made to the Morello kernel vDSO selftests to enable testing in purecap. See Morello/Linux/Kernel: ad001738e9c8 ("Add support for purecap vDSO testing"). Signed-off-by: Aditya Deshpande <aditya.deshpande(a)arm.com> --- include/parse_vdso.h | 28 ++++++++++++++++++++++++++++ libs/libltpvdso/vdso_helpers.c | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/include/parse_vdso.h b/include/parse_vdso.h index 5212fc659..43c865cc1 100644 --- a/include/parse_vdso.h +++ b/include/parse_vdso.h @@ -9,6 +9,10 @@ #include <stdint.h> +#ifdef HAVE_GETAUXVAL +# include <sys/auxv.h> +#endif /* HAVE_GETAUXVAL */ + /* * To use this vDSO parser, first call one of the vdso_init_* functions. * If you've already parsed auxv, then pass the value of AT_SYSINFO_EHDR @@ -38,4 +42,28 @@ extern void *vdso_sym(const char *version, const char *name); typedef int (*gettime_t)(clockid_t clk_id, void *ts); void find_clock_gettime_vdso(gettime_t *ptr_vdso_gettime, gettime_t *ptr_vdso_gettime64); + +/* + * Define uintptr_t as a capability in purecap. + * When not in purecap, uintptr_t will default to unsigned long. + */ +#ifdef __CHERI_PURE_CAPABILITY__ +typedef __uintcap_t uintptr_t; +#endif + +/* + * Under PCuABI, pointers in the auxiliary vector can no longer be represented + * as unsigned long as they are now capabilities. Get the capability to the + * vDSO using getauxptr() instead, which returns a a capability instead of + * unsigned long. + */ +static inline uintptr_t get_sysinfo_ehdr() +{ +#ifdef __CHERI_PURE_CAPABILITY__ + return getauxptr(AT_SYSINFO_EHDR); +#else + return (uintptr_t)getauxval(AT_SYSINFO_EHDR); +#endif +} + #endif /* PARSE_VDSO_H__ */ diff --git a/libs/libltpvdso/vdso_helpers.c b/libs/libltpvdso/vdso_helpers.c index 208c12f65..cb5e01687 100644 --- a/libs/libltpvdso/vdso_helpers.c +++ b/libs/libltpvdso/vdso_helpers.c @@ -14,7 +14,7 @@ # include <sys/auxv.h> #endif /* HAVE_GETAUXVAL */ -static unsigned long sysinfo_ehdr; +static uintptr_t sysinfo_ehdr; static void vdso_init(void) { @@ -22,7 +22,7 @@ static void vdso_init(void) if (sysinfo_ehdr) return; - sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR); + sysinfo_ehdr = get_sysinfo_ehdr(); if (!sysinfo_ehdr) { tst_res(TINFO, "Couldn't find AT_SYSINFO_EHDR"); return; -- 2.25.1

11 months, 3 weeks

2
1
0 0

2024

2023

2022

linux-morello-ltp