fstests: fix io_uring testing
v2 cover fstests: fix io_uring testing
[PATCH 1/3]
According to the manual of io_uring_queue_init, it doesn't set errno but return the -errno on failure. So we should check the return value of io_uring_queue_init, to make sure if the io_uring is supported by kernel. We've left this problem in xfstests/ltp/fsstress.c long time.
V2 replace "if()...else..." with "switch()..."
[PATCH 2/3]
And besides kernel build without CONFIG_IO_URING, a system can disable the io_uring supporting manually, by set sysctl kernel.io_uring_disabled=2. The former cause io_uring_queue_init return ENOSYS, but the latter will return EPERM. So I let fsstress to deal with both situations.
V2 follows the "switch()..." format of patch 1/3
[PATCH 3/3]
This patch is re-written totally, and no any RVB.
This v2 decides to notrun if sysctl kernel.io_uring_disabled is 2. Then change README to clarify how to make sure io_uring testing to be run.
Thanks,
Zorro
PATCH v2 1/3 fsstress: check io_uring_queue_init errno properly
As the manual of io_uring_queue_init says "io_uring_queue_init(3) returns 0 on success and -errno on failure". We should check if the return value is -ENOSYS, not the errno.
--- ltp/fsstress.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
ltp/fsstress.c +11 -7
@@ -763,13 +763,17 @@ int main(int argc, char **argv)#ifdef URING have_io_uring = true;/* If ENOSYS, just ignore uring, other errors are fatal. */ -if (io_uring_queue_init (URING_ENTRIES , &ring,0 )) { -if (errno ==ENOSYS ) { - have_io_uring = false; - }else { -fprintf (stderr,"io_uring_queue_init failed\n" ); -exit (1 ); - } + c =io_uring_queue_init (URING_ENTRIES , &ring,0 ); +switch (c){ +case 0 : + have_io_uring = true; +break ; +case -ENOSYS : + have_io_uring = false; +break ; +default : +fprintf (stderr,"io_uring_queue_init failed\n" ); +exit (1 ); }#endif for (i =0 ;keep_looping (i, loops); i++)
Signature · 1 line
2.43.0
PATCH v2 2/3 fsstress: bypass io_uring testing if io_uring_queue_init returns EPERM
In reply to Zorro LangI found the io_uring testing still fails as:
io_uring_queue_init failed
even if kernel supports io_uring feature.
That because of the /proc/sys/kernel/io_uring_disabled isn't 0.
Different value means:
0 All processes can create io_uring instances as normal. 1 io_uring creation is disabled (io_uring_setup() will fail with
-EPERM) for unprivileged processes not in the io_uring_group group. Existing io_uring instances can still be used. See the documentation for io_uring_group for more information.
2 io_uring creation is disabled for all processes. io_uring_setup()
always fails with -EPERM. Existing io_uring instances can still be used.
So besides the CONFIG_IO_URING kernel config, there's another switch can on or off the io_uring supporting. And the "2" or "1" might be the default on some systems.
On this situation the io_uring_queue_init returns -EPERM, so I change the fsstress to ignore io_uring testing if io_uring_queue_init returns -ENOSYS or -EPERM. And print different verbose message for debug.
--- ltp/fsstress.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
ltp/fsstress.c +14 -2
@@ -762,7 +762,12 @@ int main(int argc, char **argv)#endif #ifdef URING have_io_uring = true; -/* If ENOSYS, just ignore uring, other errors are fatal. */ +/* +* If ENOSYS, just ignore uring, due to kernel doesn't support it. +* If EPERM, maybe due to sysctl kernel.io_uring_disabled isn't 0, +* or some selinux policies, etc. +* Other errors are fatal. +*/ c =io_uring_queue_init (URING_ENTRIES , &ring,0 );switch (c){case 0 :
@@ -770,9 +775,16 @@ int main(int argc, char **argv)break ;case -ENOSYS : have_io_uring = false; +if (verbose) +printf ("io_uring isn't supported by kernel\n" ); +break ; +case -EPERM : + have_io_uring = false; +if (verbose) +printf ("io_uring isn't allowed, check io_uring_disabled sysctl or selinux policy\n" );break ;default : -fprintf (stderr,"io_uring_queue_init failed\n" ); +fprintf (stderr,"io_uring_queue_init failed, errno=%d\n" , -c); exit(1); }#endif
Signature · 1 line
2.43.0
PATCH v2 3/3 common/rc: notrun if io_uring is disabled by sysctl
In reply to Zorro LangIf kernel supports io_uring, userspace still can/might disable that supporting by set /proc/sys/kernel/io_uring_disabled=2. Let's notrun if io_uring is disabled by that way.
--- README | 6 ++++++ common/rc | 10 ++++++++++ src/feature.c | 19 ++++++++++++------- 3 files changed, 28 insertions(+), 7 deletions(-)
README +6 -0
@@ -142,6 +142,12 @@ Setup Environment https://www.lscdweb.com/registered/udf_verifier.html, then copy the udf_test binary to xfstests/src/. +8. (optional) To do io_uring related testing, please make sure below 3 things: + 1) kernel is built with CONFIG_IO_URING=y + 2) sysctl -w kernel.io_uring_disabled=0 (or set it to 2 to disable io_uring + testing dynamically if kernel supports) + 3) install liburing development package contains liburing.h before building + fstests For example, to run the tests with loopback partitions:
common/rc +10 -0
@@ -2317,6 +2317,8 @@ _require_aiodio() # this test requires that the kernel supports IO_URING _require_io_uring() { + local n + $here/src/feature -R case $? in 0)
@@ -2324,6 +2326,14 @@ _require_io_uring() 1) _notrun "kernel does not support IO_URING" ;; + 2) + n=$(sysctl -n kernel.io_uring_disabled 2>/dev/null) + if [ "$n" != "0" ];then + _notrun "io_uring isn't enabled totally by admin" + else + _fail "unexpected EPERM error, please check selinux or something else" + fi + ;; *) _fail "unexpected error testing for IO_URING support" ;;
src/feature.c +12 -7
@@ -232,15 +232,20 @@ check_uring_support(void)int err; err =io_uring_queue_init (1 , &ring,0 ); -if (err ==0 ) +switch (err) { +case 0 :return 0 ; - -if (err == -ENOSYS )/* CONFIG_IO_URING=n */ +case -ENOSYS : +/* CONFIG_IO_URING=n */ return 1 ; - -fprintf (stderr,"unexpected error from io_uring_queue_init(): %s\n" , -strerror (-err)); -return 2 ; +case -EPERM : +/* Might be due to sysctl io_uring_disabled isn't 0 */ +return 2 ; +default : +fprintf (stderr,"unexpected error from io_uring_queue_init(): %s\n" , +strerror (-err)); +return 100 ; + }#else /* liburing is unavailable, assume IO_URING is unsupported */ return 1 ;
Signature · 1 line
2.43.0
Re: [PATCH v2 3/3] common/rc: notrun if io_uring is disabled by sysctl
Quoted 5 lines · Zorro Lang
If kernel supports
io_uring, userspace still can/might disable that supporting by set /proc/sys/kernel/io_uring_disabled=2. Let's notrun ifio_uringis disabled by that way.Signed-off-by Zorro Lang <[email protected]>
Looks fine to me,
--D
Quoted 87 lines
--- README | 6 ++++++ common/rc | 10 ++++++++++ src/feature.c | 19 ++++++++++++------- 3 files changed, 28 insertions(+), 7 deletions(-)README +6
-0@@ -142,6 +142,12 @@ Setup Environment https://www.lscdweb.com/registered/udf_verifier.html, then copy the udf_test binary to xfstests/src/. +8. (optional) To do io_uring related testing, please make sure below 3 things: + 1) kernel is built with CONFIG_IO_URING=y + 2) sysctl -w kernel.io_uring_disabled=0 (or set it to 2 to disable io_uring + testing dynamically if kernel supports) + 3) install liburing development package contains liburing.h before building + fstests For example, to run the tests with loopback partitions:common/rc +10
-0@@ -2317,6 +2317,8 @@ _require_aiodio() # this test requires that the kernel supports IO_URING _require_io_uring() { + local n + $here/src/feature -R case $? in 0)@@ -2324,6 +2326,14 @@ _require_io_uring() 1) _notrun "kernel does not support IO_URING" ;; + 2) + n=$(sysctl -n kernel.io_uring_disabled 2>/dev/null) + if [ "$n" != "0" ];then + _notrun "io_uring isn't enabled totally by admin" + else + _fail "unexpected EPERM error, please check selinux or something else" + fi + ;; *) _fail "unexpected error testing for IO_URING support" ;;src/feature.c +12
-7@@ -232,15 +232,20 @@ check_uring_support(void)int err; err =io_uring_queue_init (1 , &ring,0 ); -if (err ==0 ) +switch (err) { +case 0 :return 0 ; - -if (err == -ENOSYS )/* CONFIG_IO_URING=n */ +case -ENOSYS : +/* CONFIG_IO_URING=n */ return 1 ; - -fprintf (stderr,"unexpected error from io_uring_queue_init(): %s\n" , -strerror (-err)); -return 2 ; +case -EPERM : +/* Might be due to sysctl io_uring_disabled isn't 0 */ +return 2 ; +default : +fprintf (stderr,"unexpected error from io_uring_queue_init(): %s\n" , +strerror (-err)); +return 100 ; + }#else /* liburing is unavailable, assume IO_URING is unsupported */ return 1 ;Signature · 1 line
2.43.0