Skip to contentSkip to conversation

io_uring: make io_sqpoll_wait_sq return void

PATCH Applied Quanfa Fu 2 participants 2 messages Jan 15, 2023 io_uring

lore
Share & tools
lore

Quanfa Fu

author
#0 lore raw

PATCH 1/1 io_uring: make io_sqpoll_wait_sq return void

Change the return type to void since it always return 0, and no need to do the checking in syscall io_uring_enter.

---
 io_uring/io_uring.c | 8 +++-----
 io_uring/sqpoll.c   | 3 +--
 io_uring/sqpoll.h   | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)
io_uring/io_uring.c +3 -5
index 2ac1cd8d23ea..7305c9e34566 100644
@@ -3330,11 +3330,9 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit,
 		}
 		if (flags & IORING_ENTER_SQ_WAKEUP)
 			wake_up(&ctx->sq_data->wait);
-		if (flags & IORING_ENTER_SQ_WAIT) {
-			ret = io_sqpoll_wait_sq(ctx);
-			if (ret)
-				goto out;
-		}
+		if (flags & IORING_ENTER_SQ_WAIT)
+			io_sqpoll_wait_sq(ctx);
+
 		ret = to_submit;
 	} else if (to_submit) {
 		ret = io_uring_add_tctx_node(ctx);
io_uring/sqpoll.c +1 -2
index 559652380672..0119d3f1a556 100644
@@ -312,7 +312,7 @@ static int io_sq_thread(void *data)
 	do_exit(0);
 }
 
-int io_sqpoll_wait_sq(struct io_ring_ctx *ctx)
+void io_sqpoll_wait_sq(struct io_ring_ctx *ctx)
 {
 	DEFINE_WAIT(wait);
 
@@ -327,7 +327,6 @@ int io_sqpoll_wait_sq(struct io_ring_ctx *ctx)
 	} while (!signal_pending(current));
 
 	finish_wait(&ctx->sqo_sq_wait, &wait);
-	return 0;
 }
 
 __cold int io_sq_offload_create(struct io_ring_ctx *ctx,
io_uring/sqpoll.h +1 -1
index 0c3fbcd1f583..e1b8d508d22d 100644
@@ -26,4 +26,4 @@ void io_sq_thread_stop(struct io_sq_data *sqd);
 void io_sq_thread_park(struct io_sq_data *sqd);
 void io_sq_thread_unpark(struct io_sq_data *sqd);
 void io_put_sq_data(struct io_sq_data *sqd);
-int io_sqpoll_wait_sq(struct io_ring_ctx *ctx);
+void io_sqpoll_wait_sq(struct io_ring_ctx *ctx);
Signature · 1 line
2.31.1
maintainer Applied
#1 lore raw
Quoted 4 lines · Quanfa Fu

Change the return type to void since it always return 0, and no need to do the checking in syscall io_uring_enter.

Applied, thanks!

[1/1] io_uring: make io_sqpoll_wait_sq return void

      commit: 19d49cb3be0d03cd19f02fd5a0760a53bcc2ae25

Best regards,

Signature · 1 line
Jens Axboe