Skip to content

Commit f03f9c9

Browse files
mcmilkbehlendorf
authored andcommitted
ZTS: Enable io_uring support on el9/el10
The io_uring interface is available as a Technology Preview. Details: https://access.redhat.com/solutions/4723221 Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: George Melikov <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tino Reichardt <[email protected]> Closes #17397
1 parent 08bf660 commit f03f9c9

File tree

3 files changed

+12
-27
lines changed

3 files changed

+12
-27
lines changed

.github/workflows/scripts/qemu-6-tests.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ case "$1" in
9393
;;
9494
esac
9595

96+
# enable io_uring on el9/el10
97+
case "$1" in
98+
almalinux9|almalinux10)
99+
sudo sysctl kernel.io_uring_disabled=0 > /dev/null
100+
;;
101+
esac
102+
96103
# run functional testings and save exitcode
97104
cd /var/tmp
98105
TAGS=$2/$3

tests/zfs-tests/tests/functional/direct/dio_async_fio_ioengines.ksh

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,11 @@ fio_async_ioengines="posixaio"
6565
if is_linux; then
6666
fio_async_ioengines+=" libaio"
6767
if $(grep -q "CONFIG_IO_URING=y" /boot/config-$(uname -r)); then
68-
if [ -e /etc/os-release ] ; then
69-
source /etc/os-release
70-
if [ $PLATFORM_ID = "platform:el9" ] ; then
71-
log_note "io_uring disabled on RHEL 9 " \
72-
"variants: fails with " \
73-
"'Operation not permitted'"
74-
elif $(check_fio_ioengine -eq 0); then
75-
fio_async_ioengines+=" io_uring"
76-
else
77-
log_note "io_uring not supported by fio and " \
78-
"will not be tested"
79-
fi
80-
else
81-
if $(check_fio_ioengine); then
82-
fio_async_ioengines+=" io_uring"
83-
84-
else
85-
log_note "io_uring not supported by fio and " \
86-
"will not be tested"
87-
fi
68+
if $(check_fio_ioengine); then
69+
fio_async_ioengines+=" io_uring"
70+
else
71+
log_note "io_uring not supported by fio and " \
72+
"will not be tested"
8873
fi
8974
else
9075
log_note "io_uring not supported by kernel will not " \

tests/zfs-tests/tests/functional/io/io_uring.ksh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ if ! $(grep -q "CONFIG_IO_URING=y" /boot/config-$(uname -r)); then
4545
log_unsupported "Requires io_uring support within Kernel"
4646
fi
4747

48-
if [ -e /etc/os-release ] ; then
49-
source /etc/os-release
50-
if [ $PLATFORM_ID = "platform:el9" ]; then
51-
log_unsupported "Disabled on RHEL 9 variants: fails with 'Operation not permitted'"
52-
fi
53-
fi
54-
5548
fio --ioengine=io_uring --parse-only || log_unsupported "fio io_uring support required"
5649

5750
function cleanup

0 commit comments

Comments
 (0)