From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 27 Jan 2023 16:50:31 +0000 (-0700)
Subject: io_uring: add reschedule point to handle_tw_list()
X-Git-Tag: v6.1.16~229
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d9399e543062251cc6102e7e5d80f3bd79115316;p=users%2Fdwmw2%2Flinux.git

io_uring: add reschedule point to handle_tw_list()

commit f58680085478dd292435727210122960d38e8014 upstream.

If CONFIG_PREEMPT_NONE is set and the task_work chains are long, we
could be running into issues blocking others for too long. Add a
reschedule check in handle_tw_list(), and flush the ctx if we need to
reschedule.

Cc: stable@vger.kernel.org # 5.10+
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 5dc21591bf687..78c677869308f 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1030,10 +1030,16 @@ static unsigned int handle_tw_list(struct llist_node *node,
 			/* if not contended, grab and improve batching */
 			*locked = mutex_trylock(&(*ctx)->uring_lock);
 			percpu_ref_get(&(*ctx)->refs);
-		}
+		} else if (!*locked)
+			*locked = mutex_trylock(&(*ctx)->uring_lock);
 		req->io_task_work.func(req, locked);
 		node = next;
 		count++;
+		if (unlikely(need_resched())) {
+			ctx_flush_and_put(*ctx, locked);
+			*ctx = NULL;
+			cond_resched();
+		}
 	}
 
 	return count;