This series updates the brk LTP tests to use direct syscalls which makes the compat tests pass on our musl-based distribution.
Add a simple sanity check for purecap that checks for ENOSYS and fails otherwise. Deactivate brk02 in purecap as it cannot be completed.
checkpatch complains about using ENOSYS but brk should not be implemented in purecap, so this is expected.
Branch for review : review/teo/brk-fixes-v5 https://git.morello-project.org/Teo-CD/morello-linux-ltp/-/commits/review/te... --- v2: Better descriptions, switched to direct syscall and not checking for EINTR. v3: Fix tst_syscall return type and use it again for brk. v4: Check if enabled in brk01 _and_ brk02 via setup, unify types, commit message improvements. v5: Commit message improvements.
Teo Couprie Diaz (2): syscalls/brk: use direct syscall syscalls/brk: add a sanity check for purecap
runtest/morello_transitional_extended | 3 +++ testcases/kernel/syscalls/brk/brk01.c | 23 +++++++++++++++-------- testcases/kernel/syscalls/brk/brk02.c | 24 ++++++++++++++++-------- 3 files changed, 34 insertions(+), 16 deletions(-)
base-commit: fa9f8b217b1f298a10e8cc3e825db8e2aaf82ea2
Direct usage of brk is discouraged in favor of using malloc. Also, brk was removed from POSIX in POSIX.1-2001. In particular, the musl libc's brk always returns -ENOMEM which causes the LTP tests to exit prematurely. Invoking the syscall directly allows them to properly validate brk behavior.
Use tst_syscall() and handle the failure cases ourselves, as we don't depend on the libc to do it anymore.
The patch also removes the dependency on sbrk to get the current break as it has the same issues. Instead, call tst_syscall(__NR_brk, 0) which always returns the current break.
Signed-off-by: Teo Couprie Diaz teo.coupriediaz@arm.com --- testcases/kernel/syscalls/brk/brk01.c | 13 +++++-------- testcases/kernel/syscalls/brk/brk02.c | 14 ++++++-------- 2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/testcases/kernel/syscalls/brk/brk01.c b/testcases/kernel/syscalls/brk/brk01.c index 5f482b943..d4596c20f 100644 --- a/testcases/kernel/syscalls/brk/brk01.c +++ b/testcases/kernel/syscalls/brk/brk01.c @@ -9,14 +9,15 @@ #include <errno.h>
#include "tst_test.h" +#include "lapi/syscalls.h"
void verify_brk(void) { - uintptr_t cur_brk, new_brk; + void *cur_brk, *new_brk; size_t inc = getpagesize() * 2 - 1; unsigned int i;
- cur_brk = (uintptr_t)sbrk(0); + cur_brk = (void *)tst_syscall(__NR_brk, 0);
for (i = 0; i < 33; i++) { switch (i % 3) { @@ -31,16 +32,12 @@ void verify_brk(void) break; }
- TST_EXP_PASS_SILENT(brk((void *)new_brk), "brk()"); - if (!TST_PASS) - return; - - cur_brk = (uintptr_t)sbrk(0); + cur_brk = (void *)tst_syscall(__NR_brk, new_brk);
if (cur_brk != new_brk) { tst_res(TFAIL, "brk() failed to set address have %p expected %p", - (void *)cur_brk, (void *)new_brk); + cur_brk, new_brk); return; }
diff --git a/testcases/kernel/syscalls/brk/brk02.c b/testcases/kernel/syscalls/brk/brk02.c index 11e803cb4..dabda30c2 100644 --- a/testcases/kernel/syscalls/brk/brk02.c +++ b/testcases/kernel/syscalls/brk/brk02.c @@ -14,24 +14,22 @@ #include <unistd.h> #include <sys/mman.h> #include "tst_test.h" +#include "lapi/syscalls.h"
void brk_down_vmas(void) { - void *brk_addr = sbrk(0); - - if (brk_addr == (void *) -1) - tst_brk(TBROK, "sbrk() failed"); + void *brk_addr = (void *)tst_syscall(__NR_brk, 0);
unsigned long page_size = getpagesize(); void *addr = brk_addr + page_size;
- if (brk(addr)) { + if ((void *)tst_syscall(__NR_brk, addr) < addr) { tst_res(TFAIL | TERRNO, "Cannot expand brk() by page size"); return; }
addr += page_size; - if (brk(addr)) { + if ((void *)tst_syscall(__NR_brk, addr) < addr) { tst_res(TFAIL | TERRNO, "Cannot expand brk() by 2x page size"); return; } @@ -42,12 +40,12 @@ void brk_down_vmas(void) }
addr += page_size; - if (brk(addr)) { + if ((void *)tst_syscall(__NR_brk, addr) < addr) { tst_res(TFAIL | TERRNO, "Cannot expand brk() after mprotect"); return; }
- if (brk(brk_addr)) { + if ((void *)tst_syscall(__NR_brk, brk_addr) != brk_addr) { tst_res(TFAIL | TERRNO, "Cannot restore brk() to start address"); return; }
brk is disabled in purecap, see the ABI for reference[1], so only check that calling it returns -ENOSYS. Do it explicitly in the test setup otherwise the tests would be skipped by tst_syscall. Skip them in purecap if it is correctly disabled.
Add brk01 and brk02 to the morello_transitional_extended list.
[1]: https://git.morello-project.org/morello/kernel/linux/-/wikis/Morello-pure-ca...
Signed-off-by: Teo Couprie Diaz teo.coupriediaz@arm.com --- runtest/morello_transitional_extended | 3 +++ testcases/kernel/syscalls/brk/brk01.c | 10 ++++++++++ testcases/kernel/syscalls/brk/brk02.c | 10 ++++++++++ 3 files changed, 23 insertions(+)
diff --git a/runtest/morello_transitional_extended b/runtest/morello_transitional_extended index 067fe82da..9549f9aa5 100644 --- a/runtest/morello_transitional_extended +++ b/runtest/morello_transitional_extended @@ -1,5 +1,8 @@ #DESCRIPTION: Morello transitional extended ABI system calls
+brk01 brk01 +brk02 brk02 + epoll_create01 epoll_create01 epoll_create02 epoll_create02 epoll_create1_01 epoll_create1_01 diff --git a/testcases/kernel/syscalls/brk/brk01.c b/testcases/kernel/syscalls/brk/brk01.c index d4596c20f..adc6153b2 100644 --- a/testcases/kernel/syscalls/brk/brk01.c +++ b/testcases/kernel/syscalls/brk/brk01.c @@ -49,6 +49,16 @@ void verify_brk(void) tst_res(TPASS, "brk() works fine"); }
+static void setup(void) +{ +#ifdef __CHERI_PURE_CAPABILITY__ + TST_EXP_FAIL(syscall(__NR_brk, 0), ENOSYS, + "brk is not implemented in purecap"); + tst_brk(TCONF, "Cannot test brk in purecap: syscall disabled."); +#endif +} + static struct tst_test test = { + .setup = setup, .test_all = verify_brk, }; diff --git a/testcases/kernel/syscalls/brk/brk02.c b/testcases/kernel/syscalls/brk/brk02.c index dabda30c2..ec1db545e 100644 --- a/testcases/kernel/syscalls/brk/brk02.c +++ b/testcases/kernel/syscalls/brk/brk02.c @@ -53,6 +53,16 @@ void brk_down_vmas(void) tst_res(TPASS, "munmap at least two VMAs of brk() passed"); }
+static void setup(void) +{ +#ifdef __CHERI_PURE_CAPABILITY__ + TST_EXP_FAIL(syscall(__NR_brk, 0), ENOSYS, + "brk is not implemented in purecap"); + tst_brk(TCONF, "Cannot test brk in purecap: syscall disabled."); +#endif +} + static struct tst_test test = { + .setup = setup, .test_all = brk_down_vmas, };
On 24/11/2022 11:41, Teo Couprie Diaz wrote:
This series updates the brk LTP tests to use direct syscalls which makes the compat tests pass on our musl-based distribution.
Add a simple sanity check for purecap that checks for ENOSYS and fails otherwise. Deactivate brk02 in purecap as it cannot be completed.
checkpatch complains about using ENOSYS but brk should not be implemented in purecap, so this is expected.
Branch for review : review/teo/brk-fixes-v5 https://git.morello-project.org/Teo-CD/morello-linux-ltp/-/commits/review/te...
v2: Better descriptions, switched to direct syscall and not checking for EINTR. v3: Fix tst_syscall return type and use it again for brk. v4: Check if enabled in brk01 _and_ brk02 via setup, unify types, commit message improvements. v5: Commit message improvements.
Teo Couprie Diaz (2): syscalls/brk: use direct syscall syscalls/brk: add a sanity check for purecap
runtest/morello_transitional_extended | 3 +++ testcases/kernel/syscalls/brk/brk01.c | 23 +++++++++++++++-------- testcases/kernel/syscalls/brk/brk02.c | 24 ++++++++++++++++-------- 3 files changed, 34 insertions(+), 16 deletions(-)
Looks good to me.
Kevin
base-commit: fa9f8b217b1f298a10e8cc3e825db8e2aaf82ea2
Hi Teo,
As discussed offline, I have made minor modification to [PATCH v5 2/2], changing lines : tst_brk(TCONF, "Cannot test brk in purecap: syscall disabled."); into: tst_brk(TCONF, "Cannot test brk in purecap: syscall not implemented.");
The series has now been merged with the above mentioned changes into morello/next.
Thanks.
--- BR B.
On Thu, Nov 24, 2022 at 10:41:59AM +0000, Teo Couprie Diaz wrote:
This series updates the brk LTP tests to use direct syscalls which makes the compat tests pass on our musl-based distribution.
Add a simple sanity check for purecap that checks for ENOSYS and fails otherwise. Deactivate brk02 in purecap as it cannot be completed.
checkpatch complains about using ENOSYS but brk should not be implemented in purecap, so this is expected.
Branch for review : review/teo/brk-fixes-v5 https://git.morello-project.org/Teo-CD/morello-linux-ltp/-/commits/review/te...
v2: Better descriptions, switched to direct syscall and not checking for EINTR. v3: Fix tst_syscall return type and use it again for brk. v4: Check if enabled in brk01 _and_ brk02 via setup, unify types, commit message improvements. v5: Commit message improvements.
Teo Couprie Diaz (2): syscalls/brk: use direct syscall syscalls/brk: add a sanity check for purecap
runtest/morello_transitional_extended | 3 +++ testcases/kernel/syscalls/brk/brk01.c | 23 +++++++++++++++-------- testcases/kernel/syscalls/brk/brk02.c | 24 ++++++++++++++++-------- 3 files changed, 34 insertions(+), 16 deletions(-)
base-commit: fa9f8b217b1f298a10e8cc3e825db8e2aaf82ea2
2.25.1
linux-morello-ltp mailing list -- linux-morello-ltp@op-lists.linaro.org To unsubscribe send an email to linux-morello-ltp-leave@op-lists.linaro.org
linux-morello-ltp@op-lists.linaro.org
-
Beata Michalska -
Kevin Brodsky -
Teo Couprie Diaz