Merge branch 'fix_iouring_eintr' of https://github.com/anarazel/fio

* 'fix_iouring_eintr' of https://github.com/anarazel/fio:
  engines/io_uring: Handle EINTR.

diff --git a/engines/io_uring.c b/engines/io_uring.c
index 65f8e2361cbda824b8efe97aae009e6dae169f4d..8c4bcc57f414582419bad9986a29143b2d686785 100644 (file)
--- a/engines/io_uring.c
+++ b/engines/io_uring.c
@@ -259,7 +259,7 @@ static int fio_ioring_getevents(struct thread_data *td, unsigned int min,
                        r = io_uring_enter(ld, 0, actual_min,
                                                IORING_ENTER_GETEVENTS);
                        if (r < 0) {
-                               if (errno == EAGAIN)
+                               if (errno == EAGAIN || errno == EINTR)
                                        continue;
                                td_verror(td, errno, "io_uring_enter");
                                break;
@@ -370,7 +370,7 @@ static int fio_ioring_commit(struct thread_data *td)
                        io_u_mark_submit(td, ret);
                        continue;
                } else {
-                       if (errno == EAGAIN) {
+                       if (errno == EAGAIN || errno == EINTR) {
                                ret = fio_ioring_cqring_reap(td, 0, ld->queued);
                                if (ret)
                                        continue;