https://github.com/torvalds/linux
Revision b7db41c9e03b5189bc94993bd50e4506ac9e34c1 authored by Jens Axboe on 04 July 2020, 14:55:50 UTC, committed by Jens Axboe on 04 July 2020, 19:44:45 UTC
When switching to TWA_SIGNAL for task_work notifications, we also made
any signal based condition in io_cqring_wait() return -ERESTARTSYS.
This breaks applications that rely on using signals to abort someone
waiting for events.

Check if we have a signal pending because of queued task_work, and
repeat the signal check once we've run the task_work. This provides a
reliable way of telling the two apart.

Additionally, only use TWA_SIGNAL if we are using an eventfd. If not,
we don't have the dependency situation described in the original commit,
and we can get by with just using TWA_RESUME like we previously did.

Fixes: ce593a6c480a ("io_uring: use signal based task_work running")
Cc: stable@vger.kernel.org # v5.7
Reported-by: Andres Freund <andres@anarazel.de>
Tested-by: Andres Freund <andres@anarazel.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent ce593a6
Raw File
Tip revision: b7db41c9e03b5189bc94993bd50e4506ac9e34c1 authored by Jens Axboe on 04 July 2020, 14:55:50 UTC
io_uring: fix regression with always ignoring signals in io_cqring_wait()
Tip revision: b7db41c
.get_maintainer.ignore
Christoph Hellwig <hch@lst.de>
Marc Gonzalez <marc.w.gonzalez@free.fr>
back to top