summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2019-09-12 14:23:21 -0600
committerJens Axboe <axboe@kernel.dk>2019-09-12 14:23:21 -0600
commitf4f37131558402109b113e731d583aadb3fc38a4 (patch)
tree5be3f95e8d333cb17da9e6d06676b9da5a416686
parent17318cf6e42ef6b8d14e400eb1f6cc78dd668e1d (diff)
parentf6abd73197dd534a4944eabfdd11f5104fcf9409 (diff)
downloadfio-f4f37131558402109b113e731d583aadb3fc38a4.tar.gz
fio-f4f37131558402109b113e731d583aadb3fc38a4.tar.bz2
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.
-rw-r--r--engines/io_uring.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/io_uring.c b/engines/io_uring.c
index 65f8e236..8c4bcc57 100644
--- 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;