Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Andrew Udvare <audvare@gmail.com>
Fixes: af5d68f889 ("io_uring/sqpoll: manage task_work privately")
Tested-by: Christian Heusel <christian@heusel.eu>
Tested-by: Andrew Udvare <audvare@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2024-05-21 12:31:12 -06:00
parent b9dd56e813
commit d13ddd9c89
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
io_uring/sqpoll.c
View File

@ -238,11 +238,13 @@ static unsigned int io_sq_tw(struct llist_node **retry_list, int max_entries)
if (*retry_list) { if (*retry_list) {
*retry_list = io_handle_tw_list(*retry_list, &count, max_entries); *retry_list = io_handle_tw_list(*retry_list, &count, max_entries);
if (count >= max_entries) if (count >= max_entries)
return count; goto out;
max_entries -= count; max_entries -= count;
} }
*retry_list = tctx_task_work_run(tctx, max_entries, &count); *retry_list = tctx_task_work_run(tctx, max_entries, &count);
out:
if (task_work_pending(current))
task_work_run();
return count; return count;
} }