io_uring: add reschedule point to handle_tw_list()
authorJens Axboe <axboe@kernel.dk>
Fri, 27 Jan 2023 16:50:31 +0000 (09:50 -0700)
committerJens Axboe <axboe@kernel.dk>
Sun, 29 Jan 2023 22:17:41 +0000 (15:17 -0700)
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>
io_uring/io_uring.c

index fab581a..acf6d96 100644 (file)
@@ -1179,10 +1179,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;