FAILED: patch "[PATCH] io_uring: fix poll file assign deadlock" failed to apply to 5.17-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.17-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From cce64ef01308b677a687d90927fc2b2e0e1cba67 Mon Sep 17 00:00:00 2001
From: Pavel Begunkov <[email protected]>
Date: Wed, 13 Apr 2022 16:10:34 +0100
Subject: [PATCH] io_uring: fix poll file assign deadlock
We pass "unlocked" into io_assign_file() in io_poll_check_events(), which can lead to double locking.
Fixes 6bf9c47a3989 ("io_uring: defer file assignment")
Signed-off-by Pavel Begunkov <[email protected]>
Link https://lore.kernel.org/r/2476d4ae46554324b599ee4055447b105f20a75a.1649862516.git.asml.silence@gmail.com open here
Signed-off-by Jens Axboe <[email protected]>
fs/io_uring.c +2 -1
@@ -5858,8 +5858,9 @@ static int io_poll_check_events(struct io_kiocb *req, bool locked)if (!req->result) {struct poll_table_struct pt = { ._key = req->apoll_events }; +unsigned flags = locked ?0 :IO_URING_F_UNLOCKED ; -if (unlikely (!io_assign_file (req,IO_URING_F_UNLOCKED ))) +if (unlikely (!io_assign_file (req, flags))) req->result = -EBADF ;else req->result =vfs_poll (req->file, &pt) & req->apoll_events;