Merge tag 'io_uring-6.3-2023-04-14' of git://git.kernel.dk/linux

torvalds · torvalds · commit 1c6492d64646 · 2023-04-15T10:29:53.000-07:00
Pull io_uring fix from Jens Axboe:
 "Just a small tweak to when task_work needs redirection, marked for
  stable as well"

* tag 'io_uring-6.3-2023-04-14' of git://git.kernel.dk/linux:
  io_uring: complete request via task work in case of DEFER_TASKRUN
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
@@ -998,7 +998,7 @@ static void __io_req_complete_post(struct io_kiocb *req)
 
 void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags)
 {
-	if (req->ctx->task_complete && (issue_flags & IO_URING_F_IOWQ)) {
+	if (req->ctx->task_complete && req->ctx->submitter_task != current) {
 		req->io_task_work.func = io_req_task_complete;
 		io_req_task_work_add(req);
 	} else if (!(issue_flags & IO_URING_F_UNLOCKED) ||

Original file line number	Diff line number	Diff line change
`@@ -998,7 +998,7 @@ static void __io_req_complete_post(struct io_kiocb *req)`
`998`	`998`
`999`	`999`	`void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags)`
`1000`	`1000`	`{`
`1001`		`- if (req->ctx->task_complete && (issue_flags & IO_URING_F_IOWQ)) {`
	`1001`	`+ if (req->ctx->task_complete && req->ctx->submitter_task != current) {`
`1002`	`1002`	`req->io_task_work.func = io_req_task_complete;`
`1003`	`1003`	`io_req_task_work_add(req);`
`1004`	`1004`	`} else if (!(issue_flags & IO_URING_F_UNLOCKED) \|\|`