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

[PATCH] runtest: Update list of testcases for Morello

by Beata Michalska

Enable those tests for which external dependencies have been satisfied through new, now available releases. At the same time update corresponding comments to better reflect actual dependencies. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- runtest/morello_transitional | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/runtest/morello_transitional b/runtest/morello_transitional index 568d00ca1..334c8a4ba 100644 --- a/runtest/morello_transitional +++ b/runtest/morello_transitional @@ -16,8 +16,8 @@ clock_gettime04 clock_gettime04 clone01 clone01 clone02 clone02 clone03 clone03 -#MUSL - pending fix in Musl 1.5 -#clone04 clone04 +#MUSL - depends on Musl release >= morello-release-1.5.0 +clone04 clone04 clone05 clone05 clone06 clone06 clone07 clone07 @@ -111,8 +111,8 @@ futex_wake03 futex_wake03 futex_wake04 futex_wake04 futex_wait_bitset01 futex_wait_bitset01 -#MUSL - pending fix in Musl 1.5 -#getcwd01 getcwd01 +#MUSL - depends on Musl release >= morello-release-1.5.0 +getcwd01 getcwd01 getcwd02 getcwd02 getcwd03 getcwd03 getcwd04 getcwd04 @@ -167,11 +167,11 @@ getuid03 getuid03 kill02 kill02 kill03 kill03 -#KERN - pending fix in kernel (shmat pcuabi changes) -#kill05 kill05 +#KERN - depends on Morello Linux kernel release >= morello-release-1.5.0 +kill05 kill05 kill06 kill06 -#KERN - pending fix in kernel (shmat pcuabi changes) -#kill07 kill07 +#KERN - depends on Morello Linux kernel release >= morello-release-1.5.0 +kill07 kill07 kill08 kill08 kill09 kill09 kill10 kill10 @@ -215,8 +215,8 @@ mmap14 mmap14 mmap15 mmap15 mmap16 mmap16 mmap17 mmap17 -#MUSL - pending fix in Musl 1.5 -#mmap18 mmap18 +#MUSL - depends on Musl release >= morello-release-1.5.0 +mmap18 mmap18 mmap19 mmap19 mprotect01 mprotect01 @@ -261,8 +261,8 @@ openat203 openat203 prctl01 prctl01 prctl02 prctl02 prctl03 prctl03 -#KERN - pending kernel fix merge -#prctl04 prctl04 +#KERN - depends on Morello Linux kernel release >= morello-release-1.5.0 +prctl04 prctl04 prctl05 prctl05 prctl06 prctl06 prctl07 prctl07 @@ -393,22 +393,22 @@ wait401 wait401 wait402 wait402 wait403 wait403 -#MUSL - pending fix in Musl 1.5 -#waitid01 waitid01 +#MUSL - depends on Musl release >= morello-release-1.5.0 +waitid01 waitid01 waitid02 waitid02 waitid03 waitid03 waitid04 waitid04 waitid05 waitid05 waitid06 waitid06 -#MUSL - pending fix in Musl 1.5 -#waitid07 waitid07 -#MUSL - pending fix in Musl 1.5 -#waitid08 waitid08 +#MUSL - depends on Musl release >= morello-release-1.5.0 +waitid07 waitid07 +#MUSL - depends on Musl release >= morello-release-1.5.0 +waitid08 waitid08 waitid09 waitid09 -#MUSL - pending fix in Musl 1.5 -#waitid10 waitid10 -#MUSL - pending fix in Musl 1.5 -#waitid11 waitid11 +#MUSL - depends on Musl release >= morello-release-1.5.0 +waitid10 waitid10 +#MUSL - depends on Musl release >= morello-release-1.5.0 +waitid11 waitid11 write01 write01 write02 write02 -- 2.25.1

2 years, 2 months

2
1
0 0

[PATCH v3] lapi/keyctl.h: Avoid gambling with variadic-ness

by Beata Michalska

Currently the keyctl helper makes silent assumption that either all expected arguments are being provided or otherwise it's somewhat safe to access beyond the actual va arg list. With AAPCS64-cap this will no longer slide through, as reading more arguments than provided will trigger capability bound fault. Empty va_list is another issue there (see KEYCTL_SESSION_TO_PARENT). Introduce dedicated macro to handle the variadic-ness instead, making sure that at any point all arguments are being provided, whether explicitly or through default values. Additionally move the keyctl_join_session_keyring opening brace to the beginning of next line to align with coding style. Reported-by: Kevin Brodsky <kevin.brodsky(a)arm.com> Suggested-by: Kevin Brodsky <kevin.brodsky(a)arm.com> Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- changes available at: https://git.morello-project.org/Bea/morello-linux-ltp/-/tree/morello/keyctl… v3: - Fixed alignment - Addded info in the commit msg on unrelevant change - Dropped a section on mapping command to nr of args v2: - define keyctl as macro so that the kectl users can remain unaware of the changes (thanks to @Tudor) include/lapi/keyctl.h | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/include/lapi/keyctl.h b/include/lapi/keyctl.h index 9c847a429..e1af4d302 100644 --- a/include/lapi/keyctl.h +++ b/include/lapi/keyctl.h @@ -39,22 +39,20 @@ static inline key_serial_t request_key(const char *type, type, description, callout_info, destringid); } -static inline long keyctl(int cmd, ...) -{ - va_list va; - uintptr_t arg2, arg3, arg4, arg5; +#define __keyctl(cmd, arg2, arg3, arg4, arg5, ...) \ +({ \ + long result; \ + result = tst_syscall(__NR_keyctl, (cmd), \ + (arg2), (arg3), (arg4), (arg5)); \ + result; \ +}) - va_start(va, cmd); - arg2 = va_arg(va, uintptr_t); - arg3 = va_arg(va, uintptr_t); - arg4 = va_arg(va, uintptr_t); - arg5 = va_arg(va, uintptr_t); - va_end(va); +#define keyctl(cmd, ...) \ + __keyctl((cmd), ##__VA_ARGS__, 0, 0, 0, 0) - return tst_syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); -} -static inline key_serial_t keyctl_join_session_keyring(const char *name) { +static inline key_serial_t keyctl_join_session_keyring(const char *name) +{ return keyctl(KEYCTL_JOIN_SESSION_KEYRING, name); } -- 2.25.1

2 years, 2 months

3
2
0 0

[PATCH v2] lapi/keyctl.h: Avoid gambling with variadic-ness

by Beata Michalska

Currently the keyctl helper makes silent assumption that either all expected arguments are being provided or otherwise it's somewhat safe to access beyond the actual va arg list. With AAPCS64-cap this will no longer slide through, as reading more arguments than provided will trigger capability bound fault. Empty va_list is another issue there (see KEYCTL_SESSION_TO_PARENT). Introduce dedicated macro to handle the variadic-ness instead, making sure that at any point all arguments are being provided, whether explicitly or through default values. Note that depicting number of arguments to be fetched from va_list based on provided command will not solve the problem as some (like KEYCTL_SEARCH) still allow optional ones. Reported-by: Kevin Brodsky <kevin.brodsky(a)arm.com> Suggested-by: Kevin Brodsky <kevin.brodsky(a)arm.com> Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- changes available at: https://git.morello-project.org/Bea/morello-linux-ltp/-/tree/morello/keyctl… v2: - define keyctl as macro so that the kectl users can remain unaware of the changes (thanks to @Tudor) include/lapi/keyctl.h | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/include/lapi/keyctl.h b/include/lapi/keyctl.h index 9c847a429..97440e50a 100644 --- a/include/lapi/keyctl.h +++ b/include/lapi/keyctl.h @@ -39,22 +39,19 @@ static inline key_serial_t request_key(const char *type, type, description, callout_info, destringid); } -static inline long keyctl(int cmd, ...) -{ - va_list va; - uintptr_t arg2, arg3, arg4, arg5; +#define __keyctl(cmd, arg2, arg3, arg4, arg5, ...) \ +({ \ + long result; \ + result = tst_syscall(__NR_keyctl, (cmd), (arg2), (arg3), (arg4), (arg5)); \ + result; \ +}) - va_start(va, cmd); - arg2 = va_arg(va, uintptr_t); - arg3 = va_arg(va, uintptr_t); - arg4 = va_arg(va, uintptr_t); - arg5 = va_arg(va, uintptr_t); - va_end(va); +#define keyctl(cmd, ...) \ + __keyctl((cmd), ##__VA_ARGS__, 0, 0, 0, 0) - return tst_syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); -} -static inline key_serial_t keyctl_join_session_keyring(const char *name) { +static inline key_serial_t keyctl_join_session_keyring(const char *name) +{ return keyctl(KEYCTL_JOIN_SESSION_KEYRING, name); } -- 2.25.1

2 years, 2 months

3
8
0 0

[PATCH v4] README: Update build instructions

by Beata Michalska

Clean-up the instructions for building LTP syscall testcases, as those have become bit stale. Also add some additional details on the required setup. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- changes available at: https://git.morello-project.org/Bea/morello-linux-ltp/-/tree/morello/readme… v4: - re-fitting the 'Building' section title into one line - re-phrasing the description for OUTPUT_DIR and renaming that one into LTP_INSTALL v3: - switching to 'plain aarch64' instead using aarch64 v2: - increasing readability (hopefully) - added info on aarch64 build - dropped -pthread option as this one is not required when building with Musl (@thanks to Yury) README.rst | 75 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/README.rst b/README.rst index 342901f4d..4aebadd35 100644 --- a/README.rst +++ b/README.rst @@ -18,8 +18,8 @@ https://op-lists.linaro.org/mailman3/lists/linux-morello-ltp.op-lists.linar… pure-capability kernel-user ABI (PCuABI) (see `Morello Linux ABI specifications <https://git.morello-project.org/morello/kernel/linux/-/wikis/home>`_) -Building (cross-compiling) & running relevant tests (purecap mode) -------------------------------------------------------------------- +Building & running relevant tests (purecap and plain aarch64 mode) +------------------------------------------------------------------ Dependencies/requirements: (additional to what's required to build base LTP): @@ -29,7 +29,7 @@ Dependencies/requirements: (additional to what's required to build base LTP): Binary releases: https://git.morello-project.org/morello/llvm-project-releases - - **morello/baremetal-release-1.4** + **morello/linux-aarch64-release-1.4** for Morello + - **morello/baremetal-release-1.x*** + **morello/linux-aarch64-release-1.x*** for Morello purecap crt objects @@ -37,6 +37,8 @@ Dependencies/requirements: (additional to what's required to build base LTP): - Kernel uAPI header files: https://git.morello-project.org/morello/morello-linux-headers +\* All based on the same release/tag version. + Building Musl: -------------- @@ -44,16 +46,27 @@ Assumptions: .. code-block:: - clang - Morello Clang (see Dependencies) configured for current environment + clang - Morello Clang (see Dependencies) configured for current environment + + +.. code-block:: + + TRIPLE - Target architecture: + - morello+c64 (purecap): aarch64-linux-musl_purecap + - plain aarch64: aarch64-linux-gnu + + MORELLO_SUPPORT - Enabling support for Morello + - morello+c64 (purecap): --enable-morello + - plain aarch64: --disable-morello .. code-block:: CC=clang ./configure \ --disable-shared \ - --enable-morello \ + ${MORELLO_SUPPORT} \ --disable-libshim \ - --target=aarch64-linux-musl_purecap \ + --target=${TRIPLE} \ --prefix=${INSTALL_PATH} @@ -72,27 +85,31 @@ Assumptions: .. code-block:: clang - Morello Clang (see Dependencies) configured for current environment - KHDR_DIR - kernel uAPI headers - MUSL - Musl build (see above) - MORELLO_CRT_OBJS - as per https://git.morello-project.org/morello/llvm-project-releases/-/tree/morell… - -> $(clang -print-resource-dir)/lib/aarch64-unknown-linux-musl_purecap - + TRIPLE - target architecture: + - morello+c64 (purecap): aarch64-linux-musl_purecap + - plain aarch64: aarch64-linux-gnu + (needs to match *TRIPLE* specified for Musl build) + KHDR_DIR - kernel uAPI headers (see Dependencies or alternatively headers + installed for Morello Linux kernel through make headers_install) + MUSL - installed Musl libc for Morello (see section above: `Building Musl`); + this will serve as a location for --sysroot option + (note this must match chosen configuration - see + *TRIPLE* & *MORELLO_SUPPORT* in `Building Musl`) + LTP_BUILD - out-of-tree build path (created by LTP's build.sh script if needed) + LTP_INSTALL - destination path where LTP tests are to be installed + TARGETS - build targets, currently only pan and testcases/kernel/syscalls + are supported, it can be further narrowed down for specific syscall + testcases: + TARGETS="pan testcases/kernel/syscalls/${syscall}" + TARGET_FEATURE - morello+c64 (purecap) only: -march=morello+c64 .. code-block:: - CLANG_RES_DIR=$(clang -print-resource-dir) + CFLAGS="--target=${TRIPLE} ${TARGET_FEATURE} --sysroot=${MUSL} \ + -isystem ${KHDR_DIR}/usr/include -g -Wall" - CFLAGS_COMMON="--target=aarch64-linux-gnu -integrated-as -g -static -nostdinc -pthread \ - -isystem $KHDR_DIR/usr/include" - - CFLAGS_PURECAP="$CFLAGS_COMMON -march=morello+c64 -mabi=purecap \ - -isystem $CLANG_RES_DIR/include -isystem $MUSL/include -Wall" - - LDFLAGS_COMMON="--target=aarch64-linux-gnu -fuse-ld=lld -static -nostdlib" - - LDFLAGS_PURECAP="$LDFLAGS_COMMON $MUSL/lib/crt1.o $MUSL/lib/crti.o \ - $MORELLO_CRT_OBJS/clang_rt.crtbegin.o $MORELLO_CRT_OBJS/libclang_rt.builtins.a \ - $MORELLO_CRT_OBJS/clang_rt.crtend.o $MUSL/lib/crtn.o -L$MUSL/lib/ -lc -L$LTP_BUILD/lib" + LDFLAGS="--target=${TRIPLE} -rtlib=compiler-rt --sysroot=${MUSL} \ + -fuse-ld=lld -static -L${LTP_BUILD}/lib" export CC=clang export HOST_CFLAGS="-O2 -Wall" @@ -101,9 +118,17 @@ Assumptions: MAKE_OPTS="TST_NEWER_64_SYSCALL=no TST_COMPAT_16_SYSCALL=no" \ TARGETS="pan testcases/kernel/syscalls" BUILD_DIR="$LTP_BUILD" \ - CFLAGS="$CFLAGS_PURECAP" LDFLAGS="$LDFLAGS_PURECAP" \ - ./build.sh -t cross -o out -ip "${OUTPUT_DIR}/opt/ltp" + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + ./build.sh -t cross -o out -ip "${LTP_INSTALL}" + +This can be split into separate steps for ``configure``, ``build`` and ``install`` by +specifying additional parameter to ``build.sh`` detailing each step: + +.. code-block:: + -r configure - run configure only + -r build - run build only + -r install - run install only Running tests: -------------- -- 2.38.1

2 years, 2 months

3
4
0 0

[PATCH v3] README: Update build instructions

by Beata Michalska

Clean-up the instructions for building LTP syscall testcases, as those have become bit stale. Also add some additional details on the required setup. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- changes available at: https://git.morello-project.org/Bea/morello-linux-ltp/-/tree/morello/readme… v3: - switching to 'plain aarch64' instead using aarch64 v2: - increasing readability (hopefully) - added info on aarch64 build - dropped -pthread option as this one is not required when building with Musl (@thanks to Yury) README.rst | 75 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/README.rst b/README.rst index 342901f4d..1950d1ddf 100644 --- a/README.rst +++ b/README.rst @@ -18,8 +18,10 @@ https://op-lists.linaro.org/mailman3/lists/linux-morello-ltp.op-lists.linar… pure-capability kernel-user ABI (PCuABI) (see `Morello Linux ABI specifications <https://git.morello-project.org/morello/kernel/linux/-/wikis/home>`_) -Building (cross-compiling) & running relevant tests (purecap mode) -------------------------------------------------------------------- +Building (cross-compiling) & running relevant tests +--------------------------------------------------- +(Pure Capability ABI & plain AArch64 mode) +------------------------------------------ Dependencies/requirements: (additional to what's required to build base LTP): @@ -29,7 +31,7 @@ Dependencies/requirements: (additional to what's required to build base LTP): Binary releases: https://git.morello-project.org/morello/llvm-project-releases - - **morello/baremetal-release-1.4** + **morello/linux-aarch64-release-1.4** for Morello + - **morello/baremetal-release-1.x*** + **morello/linux-aarch64-release-1.x*** for Morello purecap crt objects @@ -37,6 +39,8 @@ Dependencies/requirements: (additional to what's required to build base LTP): - Kernel uAPI header files: https://git.morello-project.org/morello/morello-linux-headers +\* All based on the same release/tag version. + Building Musl: -------------- @@ -44,16 +48,27 @@ Assumptions: .. code-block:: - clang - Morello Clang (see Dependencies) configured for current environment + clang - Morello Clang (see Dependencies) configured for current environment + + +.. code-block:: + + TRIPLE - Target architecture: + - morello+c64 (purecap): aarch64-linux-musl_purecap + - plain aarch64: aarch64-linux-gnu + + MORELLO_SUPPORT - Enabling support for Morello + - morello+c64 (purecap): --enable-morello + - plain aarch64: --disable-morello .. code-block:: CC=clang ./configure \ --disable-shared \ - --enable-morello \ + ${MORELLO_SUPPORT} \ --disable-libshim \ - --target=aarch64-linux-musl_purecap \ + --target=${TRIPLE} \ --prefix=${INSTALL_PATH} @@ -72,27 +87,31 @@ Assumptions: .. code-block:: clang - Morello Clang (see Dependencies) configured for current environment - KHDR_DIR - kernel uAPI headers - MUSL - Musl build (see above) - MORELLO_CRT_OBJS - as per https://git.morello-project.org/morello/llvm-project-releases/-/tree/morell… - -> $(clang -print-resource-dir)/lib/aarch64-unknown-linux-musl_purecap - + TRIPLE - target architecture: + - morello+c64 (purecap): aarch64-linux-musl_purecap + - plain aarch64: aarch64-linux-gnu + (needs to match *TRIPLE* specified for Musl build) + KHDR_DIR - kernel uAPI headers (see Dependencies or alternatively headers + installed for Morello Linux kernel through make headers_install) + MUSL - installed Musl libc for Morello (see section above: `Building Musl`); + this will serve as a location for --sysroot option + (note this must match chosen configuration - see + *TRIPLE* & *MORELLO_SUPPORT* in `Building Musl`) + LTP_BUILD - out-of-tree build path (created by LTP's build.sh script if needed) + OUTPUT_DIR - pre-existing location where LTP tests are to be installed + TARGETS - build targets, currently only pan and testcases/kernel/syscalls + are supported, it can be further narrowed down for specific syscall + testcases: + TARGETS="pan testcases/kernel/syscalls/${syscall}" + TARGET_FEATURE - morello+c64 (purecap) only: -march=morello+c64 .. code-block:: - CLANG_RES_DIR=$(clang -print-resource-dir) + CFLAGS="--target=${TRIPLE} ${TARGET_FEATURE} --sysroot=${MUSL} \ + -isystem ${KHDR_DIR}/usr/include -g -Wall" - CFLAGS_COMMON="--target=aarch64-linux-gnu -integrated-as -g -static -nostdinc -pthread \ - -isystem $KHDR_DIR/usr/include" - - CFLAGS_PURECAP="$CFLAGS_COMMON -march=morello+c64 -mabi=purecap \ - -isystem $CLANG_RES_DIR/include -isystem $MUSL/include -Wall" - - LDFLAGS_COMMON="--target=aarch64-linux-gnu -fuse-ld=lld -static -nostdlib" - - LDFLAGS_PURECAP="$LDFLAGS_COMMON $MUSL/lib/crt1.o $MUSL/lib/crti.o \ - $MORELLO_CRT_OBJS/clang_rt.crtbegin.o $MORELLO_CRT_OBJS/libclang_rt.builtins.a \ - $MORELLO_CRT_OBJS/clang_rt.crtend.o $MUSL/lib/crtn.o -L$MUSL/lib/ -lc -L$LTP_BUILD/lib" + LDFLAGS="--target=${TRIPLE} -rtlib=compiler-rt --sysroot=${MUSL} \ + -fuse-ld=lld -static -L${LTP_BUILD}/lib" export CC=clang export HOST_CFLAGS="-O2 -Wall" @@ -101,9 +120,17 @@ Assumptions: MAKE_OPTS="TST_NEWER_64_SYSCALL=no TST_COMPAT_16_SYSCALL=no" \ TARGETS="pan testcases/kernel/syscalls" BUILD_DIR="$LTP_BUILD" \ - CFLAGS="$CFLAGS_PURECAP" LDFLAGS="$LDFLAGS_PURECAP" \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ ./build.sh -t cross -o out -ip "${OUTPUT_DIR}/opt/ltp" +This can be split into separate steps for ``configure``, ``build`` and ``install`` by +specifying additional parameter to ``build.sh`` detailing each step: + +.. code-block:: + + -r configure - run configure only + -r build - run build only + -r install - run install only Running tests: -------------- -- 2.38.1

2 years, 2 months

1
0
0 0

[PATCH v2] README: Update build instructions

by Beata Michalska

Clean-up the instructions for building LTP syscall testcases, as those have become bit stale. Also add some additional details on the required setup. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- changes available at: https://git.morello-project.org/Bea/morello-linux-ltp/-/tree/morello/readme… v2: - increasing readability (hopefully) - added info on aarch64 build - dropped -pthread option as this one is not required when building with Musl (@thanks to Yury) README.rst | 73 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/README.rst b/README.rst index 342901f4d..1d70be901 100644 --- a/README.rst +++ b/README.rst @@ -18,8 +18,8 @@ https://op-lists.linaro.org/mailman3/lists/linux-morello-ltp.op-lists.linar… pure-capability kernel-user ABI (PCuABI) (see `Morello Linux ABI specifications <https://git.morello-project.org/morello/kernel/linux/-/wikis/home>`_) -Building (cross-compiling) & running relevant tests (purecap mode) -------------------------------------------------------------------- +Building (cross-compiling) & running relevant tests (purecap & aarch64 mode) +---------------------------------------------------------------------------- Dependencies/requirements: (additional to what's required to build base LTP): @@ -29,7 +29,7 @@ Dependencies/requirements: (additional to what's required to build base LTP): Binary releases: https://git.morello-project.org/morello/llvm-project-releases - - **morello/baremetal-release-1.4** + **morello/linux-aarch64-release-1.4** for Morello + - **morello/baremetal-release-1.x*** + **morello/linux-aarch64-release-1.x*** for Morello purecap crt objects @@ -37,6 +37,8 @@ Dependencies/requirements: (additional to what's required to build base LTP): - Kernel uAPI header files: https://git.morello-project.org/morello/morello-linux-headers +\* All based on the same release/tag version. + Building Musl: -------------- @@ -44,16 +46,27 @@ Assumptions: .. code-block:: - clang - Morello Clang (see Dependencies) configured for current environment + clang - Morello Clang (see Dependencies) configured for current environment + + +.. code-block:: + + TRIPLE - Target architecture: + - morello+c64 (purecap): aarch64-linux-musl_purecap + - aarch64: aarch64-linux-gnu + + MORELLO_SUPPORT - Enabling support for Morello + - morello+c64 (purecap): --enable-morello + - aarch64: --disable-morello .. code-block:: CC=clang ./configure \ --disable-shared \ - --enable-morello \ + ${MORELLO_SUPPORT} \ --disable-libshim \ - --target=aarch64-linux-musl_purecap \ + --target=${TRIPLE} \ --prefix=${INSTALL_PATH} @@ -72,27 +85,31 @@ Assumptions: .. code-block:: clang - Morello Clang (see Dependencies) configured for current environment - KHDR_DIR - kernel uAPI headers - MUSL - Musl build (see above) - MORELLO_CRT_OBJS - as per https://git.morello-project.org/morello/llvm-project-releases/-/tree/morell… - -> $(clang -print-resource-dir)/lib/aarch64-unknown-linux-musl_purecap - + TRIPLE - target architecture: + - morello+c64 (purecap): aarch64-linux-musl_purecap + - aarch64: aarch64-linux-gnu + (needs to match *TRIPLE* specified for Musl build) + KHDR_DIR - kernel uAPI headers (see Dependencies or alternatively headers + installed for Morello Linux kernel through make headers_install) + MUSL - installed Musl libc for Morello (see section above: `Building Musl`); + this will serve as a location for --sysroot option + (note this must match chosen configuration - see + *TRIPLE* & *MORELLO_SUPPORT* in `Building Musl`) + LTP_BUILD - out-of-tree build path (created by LTP's build.sh script if needed) + OUTPUT_DIR - pre-existing location where LTP tests are to be installed + TARGETS - build targets, currently only pan and testcases/kernel/syscalls + are supported, it can be further narrowed down for specific syscall + testcases: + TARGETS="pan testcases/kernel/syscalls/${syscall}" + TARGET_FEATURE - morello+c64 (purecap) only: -march=morello+c64 .. code-block:: - CLANG_RES_DIR=$(clang -print-resource-dir) + CFLAGS="--target=${TRIPLE} ${TARGET_FEATURE} --sysroot=${MUSL} \ + -isystem ${KHDR_DIR}/usr/include -g -Wall" - CFLAGS_COMMON="--target=aarch64-linux-gnu -integrated-as -g -static -nostdinc -pthread \ - -isystem $KHDR_DIR/usr/include" - - CFLAGS_PURECAP="$CFLAGS_COMMON -march=morello+c64 -mabi=purecap \ - -isystem $CLANG_RES_DIR/include -isystem $MUSL/include -Wall" - - LDFLAGS_COMMON="--target=aarch64-linux-gnu -fuse-ld=lld -static -nostdlib" - - LDFLAGS_PURECAP="$LDFLAGS_COMMON $MUSL/lib/crt1.o $MUSL/lib/crti.o \ - $MORELLO_CRT_OBJS/clang_rt.crtbegin.o $MORELLO_CRT_OBJS/libclang_rt.builtins.a \ - $MORELLO_CRT_OBJS/clang_rt.crtend.o $MUSL/lib/crtn.o -L$MUSL/lib/ -lc -L$LTP_BUILD/lib" + LDFLAGS="--target=${TRIPLE} -rtlib=compiler-rt --sysroot=${MUSL} \ + -fuse-ld=lld -static -L${LTP_BUILD}/lib" export CC=clang export HOST_CFLAGS="-O2 -Wall" @@ -101,9 +118,17 @@ Assumptions: MAKE_OPTS="TST_NEWER_64_SYSCALL=no TST_COMPAT_16_SYSCALL=no" \ TARGETS="pan testcases/kernel/syscalls" BUILD_DIR="$LTP_BUILD" \ - CFLAGS="$CFLAGS_PURECAP" LDFLAGS="$LDFLAGS_PURECAP" \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ ./build.sh -t cross -o out -ip "${OUTPUT_DIR}/opt/ltp" +This can be split into separate steps for ``configure``, ``build`` and ``install`` by +specifying additional parameter to ``build.sh`` detailing each step: + +.. code-block:: + + -r configure - run configure only + -r build - run build only + -r install - run install only Running tests: -------------- -- 2.38.1

2 years, 2 months

3
2
0 0

[PATCH] README: Update build instructions

by Beata Michalska

Clean-up the instructions for building LTP syscall testcases, as those have become bit stale. Also add some additional details on the required setup. Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- Changes available at: https://git.morello-project.org/Bea/morello-linux-ltp/-/tree/morello/dev README.rst | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/README.rst b/README.rst index 342901f4d..fc07d3b64 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ https://op-lists.linaro.org/mailman3/lists/linux-morello-ltp.op-lists.linar… Building (cross-compiling) & running relevant tests (purecap mode) ------------------------------------------------------------------- -Dependencies/requirements: (additional to what's required to build base LTP): +Dependencies/requirements: (additional to what's required to build base LTP) - Morello LLVM toolchain (version >= 1.4) @@ -29,7 +29,7 @@ Dependencies/requirements: (additional to what's required to build base LTP): Binary releases: https://git.morello-project.org/morello/llvm-project-releases - - **morello/baremetal-release-1.4** + **morello/linux-aarch64-release-1.4** for Morello + - **morello/baremetal-release-1.*** + **morello/linux-aarch64-release-1.*** for Morello purecap crt objects @@ -37,6 +37,8 @@ Dependencies/requirements: (additional to what's required to build base LTP): - Kernel uAPI header files: https://git.morello-project.org/morello/morello-linux-headers +\* All based on the same release/tag version. + Building Musl: -------------- @@ -72,27 +74,24 @@ Assumptions: .. code-block:: clang - Morello Clang (see Dependencies) configured for current environment - KHDR_DIR - kernel uAPI headers - MUSL - Musl build (see above) - MORELLO_CRT_OBJS - as per https://git.morello-project.org/morello/llvm-project-releases/-/tree/morell… - -> $(clang -print-resource-dir)/lib/aarch64-unknown-linux-musl_purecap - + KHDR_DIR - kernel uAPI headers (see Dependencies or alternatively + headers installed for Morello Linux kernel through make headers_install) + MUSL - installed Musl libc for Morello (see section above: Building Musl); + this will serve as a location for --sysroot option + LTP_BUILD - location for the out-of-tree build (generated automatically) + OUTPUT_DIR - pre-existing location where LTP tests are to be installed + TARGETS - build targets, currently only pan and testcases/kernel/syscalls + are supported, it can be further narrowed down for + specific syscall testcases: + TARGETS="pan testcases/kernel/syscalls/${syscall}" .. code-block:: - CLANG_RES_DIR=$(clang -print-resource-dir) - - CFLAGS_COMMON="--target=aarch64-linux-gnu -integrated-as -g -static -nostdinc -pthread \ - -isystem $KHDR_DIR/usr/include" - - CFLAGS_PURECAP="$CFLAGS_COMMON -march=morello+c64 -mabi=purecap \ - -isystem $CLANG_RES_DIR/include -isystem $MUSL/include -Wall" + CFLAGS="--target=aarch64-linux-musl_purecap -march=morello+c64 --sysroot=${MUSL} \ + -isystem $KHDR_DIR/usr/include -g -pthread -Wall" - LDFLAGS_COMMON="--target=aarch64-linux-gnu -fuse-ld=lld -static -nostdlib" - - LDFLAGS_PURECAP="$LDFLAGS_COMMON $MUSL/lib/crt1.o $MUSL/lib/crti.o \ - $MORELLO_CRT_OBJS/clang_rt.crtbegin.o $MORELLO_CRT_OBJS/libclang_rt.builtins.a \ - $MORELLO_CRT_OBJS/clang_rt.crtend.o $MUSL/lib/crtn.o -L$MUSL/lib/ -lc -L$LTP_BUILD/lib" + LDFLAGS="--target=aarch64-linux-musl_purecap -rtlib=compiler-rt --sysroot=${MUSL} \ + -fuse-ld=lld -static -L${LTP_BUILD}/lib" export CC=clang export HOST_CFLAGS="-O2 -Wall" @@ -101,9 +100,17 @@ Assumptions: MAKE_OPTS="TST_NEWER_64_SYSCALL=no TST_COMPAT_16_SYSCALL=no" \ TARGETS="pan testcases/kernel/syscalls" BUILD_DIR="$LTP_BUILD" \ - CFLAGS="$CFLAGS_PURECAP" LDFLAGS="$LDFLAGS_PURECAP" \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ ./build.sh -t cross -o out -ip "${OUTPUT_DIR}/opt/ltp" +This can be split into separate steps for ``configure``, ``build`` and ``install`` by +specifying additional parameter to build.sh detailing each step: + +.. code-block:: + + -r configure - run cunfigure only + -r build - run build only + -r install - run install only Running tests: -------------- -- 2.25.1

2 years, 2 months

3
5
0 0

[PATCH v2] runtest: Add ptrace tests to extended PCuABI syscall list

by Kristina Martsenko

The ptrace tests pass (for both purecap and compat), so add them to the extended Morello transitional syscalls list. Do not add ptrace04, ptrace07, ptrace08, ptrace09 or ptrace10 as they are not run (TCONF) on arm64. Signed-off-by: Kristina Martsenko <kristina.martsenko(a)arm.com> --- Changes in v2: - removed the tests that are not run on arm64 runtest/morello_transitional_extended | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index 067fe82da..464e5d00f 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -44,6 +44,14 @@ keyctl07 keyctl07 keyctl08 keyctl08 keyctl09 keyctl09 +ptrace01 ptrace01 +ptrace02 ptrace02 +ptrace03 ptrace03 +ptrace05 ptrace05 +# Broken test; See: testcases/kernel/syscalls/ptrace/Makefile for more details. +#ptrace06 ptrace06 +ptrace11 ptrace11 + semctl01 semctl01 semctl02 semctl02 semctl03 semctl03 -- 2.30.2

2 years, 2 months

2
1
0 0

[PATCH] lapi/keyctl.h: Avoid gambling with variadic-ness

by Beata Michalska

Currently the keyctl helper makes silent assumption that either all expected arguments are being provided or otherwise it's somewhat safe to access beyond the actual va arg list. With AAPCS64-cap this will no longer slide through, as reading more arguments than provided will trigger capability bound fault. Introduce dedicated macro to handle the variadic-ness instead, making sure that at any point all arguments are being provided, whether explicitly or through default values. Reported-by: Kevin Brodsky <kevin.brodsky(a)arm.com> Suggested-by: Kevin Brodsky <kevin.brodsky(a)arm.com> Signed-off-by: Beata Michalska <beata.michalska(a)arm.com> --- include/lapi/keyctl.h | 22 +++++++++---------- testcases/cve/cve-2016-7042.c | 6 ++--- testcases/kernel/syscalls/add_key/add_key03.c | 2 +- testcases/kernel/syscalls/add_key/add_key04.c | 2 +- testcases/kernel/syscalls/keyctl/keyctl01.c | 6 ++--- testcases/kernel/syscalls/keyctl/keyctl02.c | 8 +++---- testcases/kernel/syscalls/keyctl/keyctl03.c | 2 +- testcases/kernel/syscalls/keyctl/keyctl04.c | 6 ++--- testcases/kernel/syscalls/keyctl/keyctl05.c | 10 ++++----- testcases/kernel/syscalls/keyctl/keyctl06.c | 2 +- testcases/kernel/syscalls/keyctl/keyctl07.c | 4 ++-- testcases/kernel/syscalls/keyctl/keyctl09.c | 4 ++-- .../syscalls/request_key/request_key02.c | 4 ++-- .../syscalls/request_key/request_key03.c | 4 ++-- .../syscalls/request_key/request_key04.c | 10 ++++----- testcases/kernel/watchqueue/common.h | 4 ++-- testcases/kernel/watchqueue/wqueue01.c | 2 +- testcases/kernel/watchqueue/wqueue02.c | 2 +- testcases/kernel/watchqueue/wqueue03.c | 2 +- testcases/kernel/watchqueue/wqueue04.c | 2 +- testcases/kernel/watchqueue/wqueue05.c | 2 +- testcases/kernel/watchqueue/wqueue06.c | 2 +- testcases/kernel/watchqueue/wqueue07.c | 2 +- testcases/kernel/watchqueue/wqueue08.c | 2 +- testcases/kernel/watchqueue/wqueue09.c | 4 ++-- 25 files changed, 57 insertions(+), 59 deletions(-) diff --git a/include/lapi/keyctl.h b/include/lapi/keyctl.h index 9c847a429..1c7436ef6 100644 --- a/include/lapi/keyctl.h +++ b/include/lapi/keyctl.h @@ -39,23 +39,21 @@ static inline key_serial_t request_key(const char *type, type, description, callout_info, destringid); } -static inline long keyctl(int cmd, ...) -{ - va_list va; - uintptr_t arg2, arg3, arg4, arg5; +#define __KEYCTL(cmd, arg2, arg3, arg4, arg5, ...) \ + keyctl((cmd), (arg2), (arg3), (arg4), (arg5)) - va_start(va, cmd); - arg2 = va_arg(va, uintptr_t); - arg3 = va_arg(va, uintptr_t); - arg4 = va_arg(va, uintptr_t); - arg5 = va_arg(va, uintptr_t); - va_end(va); +#define KEYCTL(cmd, ...) \ + __KEYCTL((cmd), ##__VA_ARGS__, 0, 0, 0, 0) +static inline long keyctl(int cmd, uintptr_t arg2, uintptr_t arg3, + uintptr_t arg4, uintptr_t arg5) +{ return tst_syscall(__NR_keyctl, cmd, arg2, arg3, arg4, arg5); } -static inline key_serial_t keyctl_join_session_keyring(const char *name) { - return keyctl(KEYCTL_JOIN_SESSION_KEYRING, name); +static inline key_serial_t keyctl_join_session_keyring(const char *name) +{ + return KEYCTL(KEYCTL_JOIN_SESSION_KEYRING, name); } #endif /* defined(HAVE_KEYUTILS_H) && defined(HAVE_LIBKEYUTILS) */ diff --git a/testcases/cve/cve-2016-7042.c b/testcases/cve/cve-2016-7042.c index 4434265dd..91ffccf2f 100644 --- a/testcases/cve/cve-2016-7042.c +++ b/testcases/cve/cve-2016-7042.c @@ -34,7 +34,7 @@ static void do_test(void) if (key == -1) tst_brk(TBROK, "Failed to add key"); - if (keyctl(KEYCTL_UPDATE, key, "b", 1)) + if (KEYCTL(KEYCTL_UPDATE, key, "b", 1)) tst_brk(TBROK, "Failed to update key"); fd = SAFE_OPEN(PATH_KEYS, O_RDONLY); @@ -47,7 +47,7 @@ static void do_test(void) SAFE_CLOSE(fd); - if (keyctl(KEYCTL_UNLINK, key, KEY_SPEC_SESSION_KEYRING)) + if (KEYCTL(KEYCTL_UNLINK, key, KEY_SPEC_SESSION_KEYRING)) tst_brk(TBROK, "Failed to unlink key"); key = 0; } @@ -60,7 +60,7 @@ static void setup(void) static void cleanup(void) { - if (key > 0 && keyctl(KEYCTL_UNLINK, key, KEY_SPEC_SESSION_KEYRING)) + if (key > 0 && KEYCTL(KEYCTL_UNLINK, key, KEY_SPEC_SESSION_KEYRING)) tst_res(TWARN, "Failed to unlink key"); if (fd > 0) diff --git a/testcases/kernel/syscalls/add_key/add_key03.c b/testcases/kernel/syscalls/add_key/add_key03.c index d26912cb7..53613fc08 100644 --- a/testcases/kernel/syscalls/add_key/add_key03.c +++ b/testcases/kernel/syscalls/add_key/add_key03.c @@ -35,7 +35,7 @@ static key_serial_t create_keyring(const char *description) static key_serial_t get_keyring_id(key_serial_t special_id) { - TEST(keyctl(KEYCTL_GET_KEYRING_ID, special_id, 1)); + TEST(KEYCTL(KEYCTL_GET_KEYRING_ID, special_id, 1)); if (TST_RET < 0) { tst_brk(TBROK | TTERRNO, "unable to get ID of keyring %d", special_id); diff --git a/testcases/kernel/syscalls/add_key/add_key04.c b/testcases/kernel/syscalls/add_key/add_key04.c index aa02fdd1d..105135566 100644 --- a/testcases/kernel/syscalls/add_key/add_key04.c +++ b/testcases/kernel/syscalls/add_key/add_key04.c @@ -40,7 +40,7 @@ static void do_test(void) { int status; - TEST(keyctl(KEYCTL_JOIN_SESSION_KEYRING, NULL)); + TEST(KEYCTL(KEYCTL_JOIN_SESSION_KEYRING, NULL)); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to join new session keyring"); diff --git a/testcases/kernel/syscalls/keyctl/keyctl01.c b/testcases/kernel/syscalls/keyctl/keyctl01.c index 55e069c68..2e29c8375 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl01.c +++ b/testcases/kernel/syscalls/keyctl/keyctl01.c @@ -22,19 +22,19 @@ static void do_test(void) { key_serial_t key; - TEST(keyctl(KEYCTL_GET_KEYRING_ID, KEY_SPEC_USER_SESSION_KEYRING)); + TEST(KEYCTL(KEYCTL_GET_KEYRING_ID, KEY_SPEC_USER_SESSION_KEYRING)); if (TST_RET != -1) tst_res(TPASS, "KEYCTL_GET_KEYRING_ID succeeded"); else tst_res(TFAIL | TTERRNO, "KEYCTL_GET_KEYRING_ID failed"); for (key = INT32_MAX; key > INT32_MIN; key--) { - TEST(keyctl(KEYCTL_READ, key)); + TEST(KEYCTL(KEYCTL_READ, key)); if (TST_RET == -1 && TST_ERR == ENOKEY) break; } - TEST(keyctl(KEYCTL_REVOKE, key)); + TEST(KEYCTL(KEYCTL_REVOKE, key)); if (TST_RET != -1) { tst_res(TFAIL, "KEYCTL_REVOKE succeeded unexpectedly"); return; diff --git a/testcases/kernel/syscalls/keyctl/keyctl02.c b/testcases/kernel/syscalls/keyctl/keyctl02.c index 564aef4da..e5e1ae40c 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl02.c +++ b/testcases/kernel/syscalls/keyctl/keyctl02.c @@ -42,7 +42,7 @@ static void *do_read(void *arg) key_serial_t key = (unsigned long)arg; char buffer[4] = { 0 }; - keyctl(KEYCTL_READ, key, buffer, 4); + KEYCTL(KEYCTL_READ, key, buffer, 4); return NULL; } @@ -51,7 +51,7 @@ static void *do_revoke(void *arg) { key_serial_t key = (unsigned long)arg; - keyctl(KEYCTL_REVOKE, key); + KEYCTL(KEYCTL_REVOKE, key); return NULL; } @@ -100,7 +100,7 @@ static void do_test(void) * If we have invalidate, we can drop extra key immediately as well, * which also schedules gc. */ - if (keyctl(KEYCTL_INVALIDATE, key_inv) == -1 && errno != EOPNOTSUPP) + if (KEYCTL(KEYCTL_INVALIDATE, key_inv) == -1 && errno != EOPNOTSUPP) tst_brk(TBROK | TERRNO, "Failed to invalidate key"); /* @@ -108,7 +108,7 @@ static void do_test(void) * so we wait and periodically check for last test key to be removed. */ for (i = 0; i < MAX_WAIT_FOR_GC_MS; i += 100) { - ret = keyctl(KEYCTL_REVOKE, key); + ret = KEYCTL(KEYCTL_REVOKE, key); if (ret == -1 && errno == ENOKEY) break; usleep(100*1000); diff --git a/testcases/kernel/syscalls/keyctl/keyctl03.c b/testcases/kernel/syscalls/keyctl/keyctl03.c index 9d7b9a0b5..159cc7d0d 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl03.c +++ b/testcases/kernel/syscalls/keyctl/keyctl03.c @@ -32,7 +32,7 @@ static void do_test(void) request_key("keyring", "foo", "bar", KEY_SPEC_THREAD_KEYRING); - TEST(keyctl(KEYCTL_UNLINK, key, KEY_SPEC_SESSION_KEYRING)); + TEST(KEYCTL(KEYCTL_UNLINK, key, KEY_SPEC_SESSION_KEYRING)); if (TST_RET) tst_res(TFAIL | TTERRNO, "keyctl unlink failed"); else diff --git a/testcases/kernel/syscalls/keyctl/keyctl04.c b/testcases/kernel/syscalls/keyctl/keyctl04.c index 1fed23ca6..8693099fb 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl04.c +++ b/testcases/kernel/syscalls/keyctl/keyctl04.c @@ -23,16 +23,16 @@ static void do_test(void) { key_serial_t tid_keyring; - TEST(keyctl(KEYCTL_GET_KEYRING_ID, KEY_SPEC_THREAD_KEYRING, 1)); + TEST(KEYCTL(KEYCTL_GET_KEYRING_ID, KEY_SPEC_THREAD_KEYRING, 1)); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to create thread keyring"); tid_keyring = TST_RET; - TEST(keyctl(KEYCTL_SET_REQKEY_KEYRING, KEY_REQKEY_DEFL_THREAD_KEYRING)); + TEST(KEYCTL(KEYCTL_SET_REQKEY_KEYRING, KEY_REQKEY_DEFL_THREAD_KEYRING)); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to set reqkey keyring"); - TEST(keyctl(KEYCTL_GET_KEYRING_ID, KEY_SPEC_THREAD_KEYRING, 0)); + TEST(KEYCTL(KEYCTL_GET_KEYRING_ID, KEY_SPEC_THREAD_KEYRING, 0)); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to get thread keyring ID"); if (TST_RET == tid_keyring) diff --git a/testcases/kernel/syscalls/keyctl/keyctl05.c b/testcases/kernel/syscalls/keyctl/keyctl05.c index 7d7c076c0..6879ab7b2 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl05.c +++ b/testcases/kernel/syscalls/keyctl/keyctl05.c @@ -75,7 +75,7 @@ static const char x509_cert[] = static void new_session_keyring(void) { - TEST(keyctl(KEYCTL_JOIN_SESSION_KEYRING, NULL)); + TEST(KEYCTL(KEYCTL_JOIN_SESSION_KEYRING, NULL)); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to join new session keyring"); } @@ -121,7 +121,7 @@ static void test_update_nonupdatable(const char *type, * Non-updatable keys don't start with write permission, so we must * explicitly grant it. */ - TEST(keyctl(KEYCTL_SETPERM, keyid, KEY_POS_ALL)); + TEST(KEYCTL(KEYCTL_SETPERM, keyid, KEY_POS_ALL)); if (TST_RET != 0) { tst_res(TFAIL | TTERRNO, "failed to grant write permission to '%s' key", type); @@ -129,7 +129,7 @@ static void test_update_nonupdatable(const char *type, } tst_res(TINFO, "Try to update the '%s' key...", type); - TEST(keyctl(KEYCTL_UPDATE, keyid, payload, plen)); + TEST(KEYCTL(KEYCTL_UPDATE, keyid, payload, plen)); if (TST_RET == 0) { tst_res(TFAIL, "updating '%s' key unexpectedly succeeded", type); @@ -169,7 +169,7 @@ static void test_update_setperm_race(void) for (i = 0; i < 10000; i++) { perm ^= KEY_POS_WRITE; - TEST(keyctl(KEYCTL_SETPERM, keyid, perm)); + TEST(KEYCTL(KEYCTL_SETPERM, keyid, perm)); if (TST_RET != 0) tst_brk(TBROK | TTERRNO, "setperm failed"); } @@ -178,7 +178,7 @@ static void test_update_setperm_race(void) tst_res(TINFO, "Try to update the 'user' key..."); for (i = 0; i < 10000; i++) { - TEST(keyctl(KEYCTL_UPDATE, keyid, payload, sizeof(payload))); + TEST(KEYCTL(KEYCTL_UPDATE, keyid, payload, sizeof(payload))); if (TST_RET != 0 && TST_ERR != EACCES) { tst_res(TFAIL | TTERRNO, "failed to update 'user' key"); return; diff --git a/testcases/kernel/syscalls/keyctl/keyctl06.c b/testcases/kernel/syscalls/keyctl/keyctl06.c index f76a85ff2..97170a026 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl06.c +++ b/testcases/kernel/syscalls/keyctl/keyctl06.c @@ -37,7 +37,7 @@ static void do_test(void) add_test_key("key2"); memset(key_ids, 0, sizeof(key_ids)); - TEST(keyctl(KEYCTL_READ, KEY_SPEC_PROCESS_KEYRING, + TEST(KEYCTL(KEYCTL_READ, KEY_SPEC_PROCESS_KEYRING, (char *)key_ids, sizeof(key_serial_t))); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "KEYCTL_READ failed"); diff --git a/testcases/kernel/syscalls/keyctl/keyctl07.c b/testcases/kernel/syscalls/keyctl/keyctl07.c index 875ef0bb8..20dfa8a08 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl07.c +++ b/testcases/kernel/syscalls/keyctl/keyctl07.c @@ -46,7 +46,7 @@ static void try_to_read_negative_key(void) } /* Get the ID of the negative key by reading the keyring */ - TEST(keyctl(KEYCTL_READ, KEY_SPEC_PROCESS_KEYRING, + TEST(KEYCTL(KEYCTL_READ, KEY_SPEC_PROCESS_KEYRING, &key_id, sizeof(key_id))); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "KEYCTL_READ unexpectedly failed"); @@ -60,7 +60,7 @@ static void try_to_read_negative_key(void) * to read from memory address 0x00000000ffffff92. */ tst_res(TINFO, "trying to read from the negative key..."); - TEST(keyctl(KEYCTL_READ, key_id, buffer, sizeof(buffer))); + TEST(KEYCTL(KEYCTL_READ, key_id, buffer, sizeof(buffer))); if (TST_RET != -1) { tst_brk(TFAIL, "KEYCTL_READ on negative key unexpectedly succeeded"); diff --git a/testcases/kernel/syscalls/keyctl/keyctl09.c b/testcases/kernel/syscalls/keyctl/keyctl09.c index c88c481b9..c18a3ab25 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl09.c +++ b/testcases/kernel/syscalls/keyctl/keyctl09.c @@ -33,7 +33,7 @@ static void do_test(void) if (!TST_PASS) return; - TST_EXP_POSITIVE(keyctl(KEYCTL_READ, TST_RET, buffer, sizeof(buffer))); + TST_EXP_POSITIVE(KEYCTL(KEYCTL_READ, TST_RET, buffer, sizeof(buffer))); if (!TST_PASS) return; @@ -42,7 +42,7 @@ static void do_test(void) ENCRYPTED_KEY_INVALID_PAYLOAD, 60, KEY_SPEC_PROCESS_KEYRING), EINVAL); - keyctl(KEYCTL_CLEAR, KEY_SPEC_PROCESS_KEYRING); + KEYCTL(KEYCTL_CLEAR, KEY_SPEC_PROCESS_KEYRING); } static struct tst_test test = { diff --git a/testcases/kernel/syscalls/request_key/request_key02.c b/testcases/kernel/syscalls/request_key/request_key02.c index 89a78142e..3aaae41e3 100644 --- a/testcases/kernel/syscalls/request_key/request_key02.c +++ b/testcases/kernel/syscalls/request_key/request_key02.c @@ -68,13 +68,13 @@ static int init_key(char *name, int cmd) tst_brk(TBROK | TERRNO, "add_key() failed"); if (cmd == KEYCTL_REVOKE) { - if (keyctl(cmd, n) == -1) { + if (KEYCTL(cmd, n) == -1) { tst_brk(TBROK | TERRNO, "failed to revoke a key"); } } if (cmd == KEYCTL_SET_TIMEOUT) { - if (keyctl(cmd, n, sec) == -1) { + if (KEYCTL(cmd, n, sec) == -1) { tst_brk(TBROK | TERRNO, "failed to set timeout for a key"); } diff --git a/testcases/kernel/syscalls/request_key/request_key03.c b/testcases/kernel/syscalls/request_key/request_key03.c index 3f0c093f3..177932ad9 100644 --- a/testcases/kernel/syscalls/request_key/request_key03.c +++ b/testcases/kernel/syscalls/request_key/request_key03.c @@ -48,7 +48,7 @@ static void test_with_key_type(const char *type, const char *payload, pid_t request_key_pid; bool info_only; - TEST(keyctl(KEYCTL_JOIN_SESSION_KEYRING, NULL)); + TEST(KEYCTL(KEYCTL_JOIN_SESSION_KEYRING, NULL)); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to join new session keyring"); @@ -97,7 +97,7 @@ static void test_with_key_type(const char *type, const char *payload, "unexpected error adding key of type '%s'", type); } - TEST(keyctl(KEYCTL_CLEAR, KEY_SPEC_SESSION_KEYRING)); + TEST(KEYCTL(KEYCTL_CLEAR, KEY_SPEC_SESSION_KEYRING)); if (TST_RET < 0) { tst_brk(TBROK | TTERRNO, "unable to clear keyring"); diff --git a/testcases/kernel/syscalls/request_key/request_key04.c b/testcases/kernel/syscalls/request_key/request_key04.c index c125f4261..b049d8799 100644 --- a/testcases/kernel/syscalls/request_key/request_key04.c +++ b/testcases/kernel/syscalls/request_key/request_key04.c @@ -24,25 +24,25 @@ static void do_test(void) key_serial_t keyid; int saved_errno; - TEST(keyctl(KEYCTL_JOIN_SESSION_KEYRING, NULL)); + TEST(KEYCTL(KEYCTL_JOIN_SESSION_KEYRING, NULL)); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to join new session keyring"); - TEST(keyctl(KEYCTL_SETPERM, KEY_SPEC_SESSION_KEYRING, + TEST(KEYCTL(KEYCTL_SETPERM, KEY_SPEC_SESSION_KEYRING, KEY_POS_SEARCH|KEY_POS_READ|KEY_POS_VIEW)); if (TST_RET < 0) { tst_brk(TBROK | TTERRNO, "failed to set permissions on session keyring"); } - TEST(keyctl(KEYCTL_SET_REQKEY_KEYRING, + TEST(KEYCTL(KEYCTL_SET_REQKEY_KEYRING, KEY_REQKEY_DEFL_SESSION_KEYRING)); if (TST_RET < 0) { tst_brk(TBROK | TTERRNO, "failed to set request-key default keyring"); } - TEST(keyctl(KEYCTL_READ, KEY_SPEC_SESSION_KEYRING, + TEST(KEYCTL(KEYCTL_READ, KEY_SPEC_SESSION_KEYRING, &keyid, sizeof(keyid))); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to read from session keyring"); @@ -54,7 +54,7 @@ static void do_test(void) tst_brk(TBROK, "request_key() unexpectedly succeeded"); saved_errno = TST_ERR; - TEST(keyctl(KEYCTL_READ, KEY_SPEC_SESSION_KEYRING, + TEST(KEYCTL(KEYCTL_READ, KEY_SPEC_SESSION_KEYRING, &keyid, sizeof(keyid))); if (TST_RET < 0) tst_brk(TBROK | TTERRNO, "failed to read from session keyring"); diff --git a/testcases/kernel/watchqueue/common.h b/testcases/kernel/watchqueue/common.h index 92e8f079c..ea35219e5 100644 --- a/testcases/kernel/watchqueue/common.h +++ b/testcases/kernel/watchqueue/common.h @@ -85,8 +85,8 @@ static inline key_serial_t wqueue_add_key(int fd) if (key == -1) tst_brk(TBROK, "add_key error: %s", tst_strerrno(errno)); - keyctl(KEYCTL_WATCH_KEY, key, fd, 0x01); - keyctl(KEYCTL_WATCH_KEY, KEY_SPEC_SESSION_KEYRING, fd, 0x02); + KEYCTL(KEYCTL_WATCH_KEY, key, fd, 0x01); + KEYCTL(KEYCTL_WATCH_KEY, KEY_SPEC_SESSION_KEYRING, fd, 0x02); return key; } diff --git a/testcases/kernel/watchqueue/wqueue01.c b/testcases/kernel/watchqueue/wqueue01.c index 904e512af..dd0a68dfb 100644 --- a/testcases/kernel/watchqueue/wqueue01.c +++ b/testcases/kernel/watchqueue/wqueue01.c @@ -32,7 +32,7 @@ static void run(void) fd = wqueue_watch(256, &wqueue_filter); key = wqueue_add_key(fd); - keyctl(KEYCTL_UPDATE, key, "b", 1); + KEYCTL(KEYCTL_UPDATE, key, "b", 1); wqueue_consumer(fd, saw_key_updated); SAFE_CLOSE(fd); diff --git a/testcases/kernel/watchqueue/wqueue02.c b/testcases/kernel/watchqueue/wqueue02.c index 0c3e947d1..37929b9d0 100644 --- a/testcases/kernel/watchqueue/wqueue02.c +++ b/testcases/kernel/watchqueue/wqueue02.c @@ -32,7 +32,7 @@ static void run(void) fd = wqueue_watch(256, &wqueue_filter); key = wqueue_add_key(fd); - keyctl(KEYCTL_UNLINK, key, KEY_SPEC_SESSION_KEYRING); + KEYCTL(KEYCTL_UNLINK, key, KEY_SPEC_SESSION_KEYRING); wqueue_consumer(fd, saw_key_unlinked); SAFE_CLOSE(fd); diff --git a/testcases/kernel/watchqueue/wqueue03.c b/testcases/kernel/watchqueue/wqueue03.c index c17fc1452..8ce23b253 100644 --- a/testcases/kernel/watchqueue/wqueue03.c +++ b/testcases/kernel/watchqueue/wqueue03.c @@ -32,7 +32,7 @@ static void run(void) fd = wqueue_watch(256, &wqueue_filter); key = wqueue_add_key(fd); - keyctl(KEYCTL_REVOKE, key); + KEYCTL(KEYCTL_REVOKE, key); wqueue_consumer(fd, saw_key_revoked); SAFE_CLOSE(fd); diff --git a/testcases/kernel/watchqueue/wqueue04.c b/testcases/kernel/watchqueue/wqueue04.c index fc880064b..c23a75254 100644 --- a/testcases/kernel/watchqueue/wqueue04.c +++ b/testcases/kernel/watchqueue/wqueue04.c @@ -32,7 +32,7 @@ static void run(void) fd = wqueue_watch(256, &wqueue_filter); key = wqueue_add_key(fd); - keyctl(KEYCTL_LINK, key, KEY_SPEC_SESSION_KEYRING); + KEYCTL(KEYCTL_LINK, key, KEY_SPEC_SESSION_KEYRING); wqueue_consumer(fd, saw_key_linked); SAFE_CLOSE(fd); diff --git a/testcases/kernel/watchqueue/wqueue05.c b/testcases/kernel/watchqueue/wqueue05.c index 78a4c702e..221d95d22 100644 --- a/testcases/kernel/watchqueue/wqueue05.c +++ b/testcases/kernel/watchqueue/wqueue05.c @@ -32,7 +32,7 @@ static void run(void) fd = wqueue_watch(256, &wqueue_filter); key = wqueue_add_key(fd); - keyctl(KEYCTL_INVALIDATE, key); + KEYCTL(KEYCTL_INVALIDATE, key); wqueue_consumer(fd, saw_key_invalidated); SAFE_CLOSE(fd); diff --git a/testcases/kernel/watchqueue/wqueue06.c b/testcases/kernel/watchqueue/wqueue06.c index 2cb6a966d..692612255 100644 --- a/testcases/kernel/watchqueue/wqueue06.c +++ b/testcases/kernel/watchqueue/wqueue06.c @@ -31,7 +31,7 @@ static void run(void) fd = wqueue_watch(256, &wqueue_filter); wqueue_add_key(fd); - keyctl(KEYCTL_CLEAR, KEY_SPEC_SESSION_KEYRING); + KEYCTL(KEYCTL_CLEAR, KEY_SPEC_SESSION_KEYRING); wqueue_consumer(fd, saw_key_cleared); SAFE_CLOSE(fd); diff --git a/testcases/kernel/watchqueue/wqueue07.c b/testcases/kernel/watchqueue/wqueue07.c index 6c4d1e92a..a7daad973 100644 --- a/testcases/kernel/watchqueue/wqueue07.c +++ b/testcases/kernel/watchqueue/wqueue07.c @@ -32,7 +32,7 @@ static void run(void) fd = wqueue_watch(256, &wqueue_filter); key = wqueue_add_key(fd); - keyctl(KEYCTL_SETPERM, key, KEY_POS_ALL | KEY_USR_ALL); + KEYCTL(KEYCTL_SETPERM, key, KEY_POS_ALL | KEY_USR_ALL); wqueue_consumer(fd, saw_key_setattr); SAFE_CLOSE(fd); diff --git a/testcases/kernel/watchqueue/wqueue08.c b/testcases/kernel/watchqueue/wqueue08.c index 4ed9522da..bea3a6c36 100644 --- a/testcases/kernel/watchqueue/wqueue08.c +++ b/testcases/kernel/watchqueue/wqueue08.c @@ -37,7 +37,7 @@ static void run(void) key = wqueue_add_key(fd); /* if watch_id = -1 key is removed from the watch queue */ - keyctl(KEYCTL_WATCH_KEY, key, fd, -1); + KEYCTL(KEYCTL_WATCH_KEY, key, fd, -1); wqueue_consumer(fd, saw_watch_removal); SAFE_CLOSE(fd); diff --git a/testcases/kernel/watchqueue/wqueue09.c b/testcases/kernel/watchqueue/wqueue09.c index 9f077b35b..f19d98f09 100644 --- a/testcases/kernel/watchqueue/wqueue09.c +++ b/testcases/kernel/watchqueue/wqueue09.c @@ -44,7 +44,7 @@ static void run(void) iterations = (getpagesize() / WATCH_QUEUE_NOTE_SIZE) * 2; for (i = 0; i < iterations; i++) - keyctl(KEYCTL_UPDATE, key, "b", 1); + KEYCTL(KEYCTL_UPDATE, key, "b", 1); data_lost = 0; while (!data_lost) @@ -58,7 +58,7 @@ static void run(void) static void cleanup(void) { - keyctl(KEYCTL_REVOKE, key); + KEYCTL(KEYCTL_REVOKE, key); SAFE_CLOSE(fd); } -- 2.25.1

2 years, 2 months

2
2
0 0

[PATCH] runtest: Add ptrace tests to extended PCuABI syscall list

by Kristina Martsenko

The ptrace tests pass (for both purecap and compat), so add them to the extended Morello transitional syscalls list. Signed-off-by: Kristina Martsenko <kristina.martsenko(a)arm.com> --- runtest/morello_transitional_extended | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index 067fe82da..fa3920bd8 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -44,6 +44,19 @@ keyctl07 keyctl07 keyctl08 keyctl08 keyctl09 keyctl09 +ptrace01 ptrace01 +ptrace02 ptrace02 +ptrace03 ptrace03 +ptrace04 ptrace04 +ptrace05 ptrace05 +# Broken test; See: testcases/kernel/syscalls/ptrace/Makefile for more details. +#ptrace06 ptrace06 +ptrace07 ptrace07 +ptrace08 ptrace08 +ptrace09 ptrace09 +ptrace10 ptrace10 +ptrace11 ptrace11 + semctl01 semctl01 semctl02 semctl02 semctl03 semctl03 -- 2.30.2

2 years, 2 months

2
2
0 0

2025

2024

2023

2022

linux-morello-ltp