This small series updates the io_uring tests and adds them to the
morello_transitional_extended list.
This series depends on the following Morello Linux series:
"Support io_uring for Purecap apps"
v2:
- Remove changes to unused io_uring_sqe struct from the lapi header, and
add a comment on why it's left unmodified
- Remove the io_uring01 from relevant skip file
- Update the io_uring dependency tag to "> morello-release-1.6.0" as it
missed the boat
Review branch:
https://git.morello-project.org/tudcre01/morello-linux-ltp/-/commits/morell…
Tudor Cretu (2):
syscalls/io_uring: Align struct io_uring_sqe with new uABI
runtest: Add io_uring tests to the extended PCuABI syscall list
include/lapi/io_uring.h | 4 ++++
runtest/morello_transitional_extended | 4 ++++
runtest/syscalls_morello_purecap_skip | 4 ----
testcases/kernel/syscalls/io_uring/io_uring01.c | 4 ++--
testcases/kernel/syscalls/io_uring/io_uring02.c | 6 +++---
5 files changed, 13 insertions(+), 9 deletions(-)
--
2.34.1
Commit 41348659371e ("setpgid02: Temporarily disable EPERM test case")
disabled a test case that failed in CI due to its configuration.
This temporary measure is now suprseded by the fixes upstream.
Revert this commit and cherry-pick the relevant upstream commits.
These commits will be in the upcoming (in a few weeks) LTP release,
so it might not be needed to cherry-pick them now.
Teo Couprie Diaz (3):
Revert "setpgid02: Temporarily disable EPERM test case"
setpgid02: Use pid_max as PGID for EPERM
setpgid03: Add test for PGID in different session
testcases/kernel/syscalls/setpgid/setpgid02.c | 19 +++++++------------
testcases/kernel/syscalls/setpgid/setpgid03.c | 4 ++++
2 files changed, 11 insertions(+), 12 deletions(-)
--
2.34.1
setpgid02 was changed upstream in commit f2797fa44893 ("setpgid02: Convert
to new LTP API") and now assumes that LTP runs in a different session from
init (PID 1) for the EPERM test case.
This breaks in our CI as the busybox rootfs runs sh as PID 1.
Skip the EPERM test case for the morello release 1.6.0 while waiting for
a fix to be decided with upstream.
This mostly doesn't impact test coverage as EPERM is also tested for in
setpgid03.
Signed-off-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com>
---
testcases/kernel/syscalls/setpgid/setpgid02.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c
index 4b63afee8..4dcb7613d 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid02.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid02.c
@@ -31,7 +31,12 @@ static struct tcase {
} tcases[] = {
{&pid, &negative_pid, EINVAL},
{&ppid, &pgid, ESRCH},
- {&pid, &init_pgid, EPERM}
+ /*
+ * FIXME: This test case makes an assumption that is invalid in our CI.
+ * Skip it for now as the error case is covered in setpgid03 anyway.
+ * Should be restored when the fix is decided with upstream.
+ */
+/* {&pid, &init_pgid, EPERM} */
};
static void setup(void)
--
2.34.1
setpgid02 was changed upstream in commit f2797fa44893 ("setpgid02: Convert
to new LTP API") and now assumes that LTP runs in a different session from
init (PID 1) for the EPERM test case.
This breaks in our CI as the busybox rootfs runs sh as PID 1.
Skip the EPERM test case for the morello release 1.6.0 while waiting for
a fix to be decided with upstream.
This mostly doesn't impact test coverage as EPERM is also tested for in
setpgid03.
Signed-off-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com>
---
testcases/kernel/syscalls/setpgid/setpgid02.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c
index 4b63afee8..fe68361aa 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid02.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid02.c
@@ -31,7 +31,12 @@ static struct tcase {
} tcases[] = {
{&pid, &negative_pid, EINVAL},
{&ppid, &pgid, ESRCH},
- {&pid, &init_pgid, EPERM}
+ /*
+ * This test case makes an assumption that is invalid in our CI.
+ * Skip it for now as the error case is covered in setpgid03 anyway.
+ * Should be restored when the fix is decided with upstream.
+ */
+/* {&pid, &init_pgid, EPERM} */
};
static void setup(void)
--
2.34.1
setpgid02 was changed upstream in commit f2797fa44893 ("setpgid02: Convert
to new LTP API") and now assumes that LTP runs in a different session from
init (PID 1).
This breaks in our CI as the busybox rootfs runs sh as PID 1.
Don't run this test in CI for the morello release 1.6.0 while waiting
for a fix to be decided with upstream.
Signed-off-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com>
---
runtest/morello_transitional | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/runtest/morello_transitional b/runtest/morello_transitional
index d851948..8632615 100644
--- a/runtest/morello_transitional
+++ b/runtest/morello_transitional
@@ -328,7 +328,10 @@ setgid02 setgid02
setgid03 setgid03
setpgid01 setpgid01
-setpgid02 setpgid02
+# This test has been updated upstream and makes incorrect assumptions breaking
+# CI. Skip it for Morello release 1.6.0, but should be run again once a fix is
+# decided with upstream.
+#setpgid02 setpgid02
setpgid03 setpgid03
setregid01 setregid01
--
2.34.1
setpgid02 was changed upstream in commit f2797fa44893 ("setpgid02: Convert
to new LTP API") and now assumes that LTP runs in a different session from
init (PID 1).
This breaks in our CI as the busybox rootfs runs sh as PID 1.
Skip this test for the morello release 1.6.0 while waiting for a fix to be
decided with upstream.
Signed-off-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com>
---
runtest/syscalls_morello_skip | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/runtest/syscalls_morello_skip b/runtest/syscalls_morello_skip
index 1eb10f6..80a4f47 100644
--- a/runtest/syscalls_morello_skip
+++ b/runtest/syscalls_morello_skip
@@ -2,6 +2,11 @@
# because of either the build setup for Morello or the system the tests run on.
# KERN - *: depends on Morello Linux kernel release >= morello-release-1.6.0
+# setpgid02 assumes incorrectly that LTP will always run in a different session
+# from init (PID 1). This breaks in the kernel CI.
+# This is to be removed when a fix has been implemented.
+setpgid02
+
# leapsec01 is skipped as systemd-timesyncd interfers with it and it doesn't
# test any worthwhile functionality.
leapsec01
--
2.34.1
This small series updates the io_uring tests and adds them to the
morello_transitional_extended list.
This series depends on the following Morello Linux series:
"Support io_uring for Purecap apps"
Review branch:
https://git.morello-project.org/tudcre01/morello-linux-ltp/-/commits/morell…
Tudor Cretu (2):
syscalls/io_uring: Update uAPI structs
runtest: Add io_uring tests to extended PCuABI syscall list
include/lapi/io_uring.h | 10 +++++-----
runtest/morello_transitional_extended | 4 ++++
testcases/kernel/syscalls/io_uring/io_uring01.c | 4 ++--
testcases/kernel/syscalls/io_uring/io_uring02.c | 6 +++---
4 files changed, 14 insertions(+), 10 deletions(-)
--
2.34.1