From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH kernel] backport fix for io_uring to prevent kernel panic
Date: Wed, 28 Jul 2021 10:38:54 +0200 [thread overview]
Message-ID: <20210728083854.815295-1-f.ebner@proxmox.com> (raw)
which could be triggered in some corner cases with (but most likely
not limited to) LVM-backed QEMU guests using io_uring.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
...lock-level-reissue-off-completion-pa.patch | 49 +++++++++++++++++++
1 file changed, 49 insertions(+)
create mode 100644 patches/kernel/0007-io_uring-don-t-block-level-reissue-off-completion-pa.patch
diff --git a/patches/kernel/0007-io_uring-don-t-block-level-reissue-off-completion-pa.patch b/patches/kernel/0007-io_uring-don-t-block-level-reissue-off-completion-pa.patch
new file mode 100644
index 0000000..ec9ce57
--- /dev/null
+++ b/patches/kernel/0007-io_uring-don-t-block-level-reissue-off-completion-pa.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fabian Ebner <f.ebner@proxmox.com>
+Date: Wed, 28 Jul 2021 08:55:31 +0200
+Subject: [PATCH] io_uring: don't block level reissue off completion path
+
+Some setups, like SCSI, can throw spurious -EAGAIN off the softirq
+completion path. Normally we expect this to happen inline as part
+of submission, but apparently SCSI has a weird corner case where it
+can happen as part of normal completions.
+
+This should be solved by having the -EAGAIN bubble back up the stack
+as part of submission, but previous attempts at this failed and we're
+not just quite there yet. Instead we currently use REQ_F_REISSUE to
+handle this case.
+
+For now, catch it in io_rw_should_reissue() and prevent a reissue
+from a bogus path.
+
+Upstream mail:
+https://lore.kernel.org/io-uring/20210727165811.284510-3-axboe@kernel.dk/T/#u
+
+Originally-by: Jens Axboe <axboe@kernel.dk>
+[backport]
+Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
+---
+ fs/io_uring.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/fs/io_uring.c b/fs/io_uring.c
+index 2b86b413641a..11f615033c70 100644
+--- a/fs/io_uring.c
++++ b/fs/io_uring.c
+@@ -2731,6 +2731,13 @@ static bool io_rw_reissue(struct io_kiocb *req, long res)
+ if (percpu_ref_is_dying(&req->ctx->refs))
+ return false;
+
++ /*
++ * Play it safe and assume not safe to re-import and reissue if we're
++ * not in the original thread group (or in task context).
++ */
++ if (!same_thread_group(req->task, current) || !in_task())
++ return false;
++
+ lockdep_assert_held(&req->ctx->uring_lock);
+
+ ret = io_sq_thread_acquire_mm_files(req->ctx, req);
+--
+2.30.2
+
--
2.30.2
next reply other threads:[~2021-07-28 8:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 8:38 Fabian Ebner [this message]
2021-07-28 9:44 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210728083854.815295-1-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.