From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 15 Jan 2019 21:48:31 +0000 (-0700)
Subject: t/io_uring: fixes
X-Git-Tag: fio-3.13~17
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=7d1435e6090234770558893a09d3879b0054f974

t/io_uring: fixes

- Break out if we get a fatal error from reap_events()
- Ignore polled=1 if do_nop=1

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/t/io_uring.c b/t/io_uring.c
index dd510be5..0545a1dd 100644
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -338,9 +338,10 @@ submit:
 		do {
 			int r;
 			r = reap_events(s);
-			if (r == -1)
+			if (r == -1) {
+				s->finish = 1;
 				break;
-			else if (r > 0)
+			} else if (r > 0)
 				this_reap += r;
 		} while (sq_thread_poll && this_reap < to_wait);
 		s->reaps += this_reap;
@@ -406,7 +407,7 @@ static int setup_ring(struct submitter *s)
 
 	memset(&p, 0, sizeof(p));
 
-	if (polled)
+	if (polled && !do_nop)
 		p.flags |= IORING_SETUP_IOPOLL;
 	if (sq_thread_poll) {
 		p.flags |= IORING_SETUP_SQPOLL;