Skip to content

Commit

Permalink
io_uring: don't gate task_work run on TIF_NOTIFY_SIGNAL
Browse files Browse the repository at this point in the history
This isn't a reliable mechanism to tell if we have task_work pending, we
really should be looking at whether we have any items queued. This is
problematic if forward progress is gated on running said task_work. One
such example is reading from a pipe, where the write side has been closed
right before the read is started. The fput() of the file queues TWA_RESUME
task_work, and we need that task_work to be run before ->release() is
called for the pipe. If ->release() isn't called, then the read will sit
forever waiting on data that will never arise.

Fix this by io_run_task_work() so it checks if we have task_work pending
rather than rely on TIF_NOTIFY_SIGNAL for that. The latter obviously
doesn't work for task_work that is queued without TWA_SIGNAL.

Reported-by: Christiano Haesbaert <[email protected]>
Cc: [email protected]
Link: axboe/liburing#665
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
axboe committed Sep 29, 2022
1 parent b000145 commit 46a525e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions io_uring/io_uring.h
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ static inline unsigned int io_sqring_entries(struct io_ring_ctx *ctx)

static inline int io_run_task_work(void)
{
if (test_thread_flag(TIF_NOTIFY_SIGNAL)) {
if (task_work_pending(current)) {
if (test_thread_flag(TIF_NOTIFY_SIGNAL))
clear_notify_signal();
__set_current_state(TASK_RUNNING);
clear_notify_signal();
if (task_work_pending(current))
task_work_run();
task_work_run();
return 1;
}

Expand Down

0 comments on commit 46a525e

Please sign in to comment.