Commit d13ddd9c authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/sqpoll: ensure that normal task_work is also run timely 

With the move to private task_work, SQPOLL neglected to also run the
normal task_work, if any is pending. This will eventually get run, but
we should run it with the private task_work to ensure that things like
a final fput() is processed in a timely fashion.

Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/all/313824bc-799d-414f-96b7-e6de57c7e21d@gmail.com/


Reported-by: default avatarAndrew Udvare <audvare@gmail.com>
Fixes: af5d68f8 ("io_uring/sqpoll: manage task_work privately")
Tested-by: default avatarChristian Heusel <christian@heusel.eu>
Tested-by: default avatarAndrew Udvare <audvare@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b9dd56e8

io_uring/sqpoll.c

+4 −2
Original line number Diff line number Diff line
@@ -238,11 +238,13 @@ static unsigned int io_sq_tw(struct llist_node **retry_list, int max_entries) 
	if (*retry_list) {

		*retry_list = io_handle_tw_list(*retry_list, &count, max_entries);

		if (count >= max_entries)

			return count;

			goto out;

		max_entries -= count;

	}



	*retry_list = tctx_task_work_run(tctx, max_entries, &count);

out:

	if (task_work_pending(current))

		task_work_run();

	return count;

}