From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>, Sasha Levin <sashal@kernel.org>,
io-uring@vger.kernel.org
Subject: [PATCH AUTOSEL 5.11 19/22] io_uring: don't mark S_ISBLK async work as unbounded
Date: Mon, 5 Apr 2021 12:04:02 -0400 [thread overview]
Message-ID: <20210405160406.268132-19-sashal@kernel.org> (raw)
In-Reply-To: <20210405160406.268132-1-sashal@kernel.org>
From: Jens Axboe <axboe@kernel.dk>
[ Upstream commit 4b982bd0f383db9132e892c0c5144117359a6289 ]
S_ISBLK is marked as unbounded work for async preparation, because it
doesn't match S_ISREG. That is incorrect, as any read/write to a block
device is also a bounded operation. Fix it up and ensure that S_ISBLK
isn't marked unbounded.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/io_uring.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 5c4378694d54..d9a673976f2d 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1546,7 +1546,7 @@ static void io_prep_async_work(struct io_kiocb *req)
if (req->flags & REQ_F_ISREG) {
if (def->hash_reg_file || (ctx->flags & IORING_SETUP_IOPOLL))
io_wq_hash_work(&req->work, file_inode(req->file));
- } else {
+ } else if (!req->file || !S_ISBLK(file_inode(req->file)->i_mode)) {
if (def->unbound_nonreg_file)
req->work.flags |= IO_WQ_WORK_UNBOUND;
}
--
2.30.2
next prev parent reply other threads:[~2021-04-05 16:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-05 16:03 [PATCH AUTOSEL 5.11 01/22] interconnect: core: fix error return code of icc_link_destroy() Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 02/22] gfs2: Flag a withdraw if init_threads() fails Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 03/22] KVM: arm64: Hide system instruction access to Trace registers Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 04/22] KVM: arm64: Disable guest access to trace filter controls Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 05/22] drm/imx: imx-ldb: fix out of bounds array access warning Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 06/22] gfs2: report "already frozen/thawed" errors Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 07/22] scsi: iscsi: Fix race condition between login and sync thread Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 08/22] ftrace: Check if pages were allocated before calling free_pages() Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 09/22] tools/kvm_stat: Add restart delay Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 10/22] drm/tegra: dc: Don't set PLL clock to 0Hz Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 11/22] gpu: host1x: Use different lock classes for each client Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 12/22] XArray: Fix splitting to non-zero orders Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 13/22] radix tree test suite: Fix compilation Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 14/22] block: only update parent bi_status when bio fail Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 15/22] radix tree test suite: Register the main thread with the RCU library Sasha Levin
2021-04-05 16:03 ` [PATCH AUTOSEL 5.11 16/22] idr test suite: Take RCU read lock in idr_find_test_1 Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 17/22] idr test suite: Create anchor before launching throbber Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 18/22] null_blk: fix command timeout completion handling Sasha Levin
2021-04-05 16:04 ` Sasha Levin [this message]
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 20/22] riscv: evaluate put_user() arg before enabling user access Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 21/22] riscv,entry: fix misaligned base for excp_vect_table Sasha Levin
2021-04-05 16:04 ` [PATCH AUTOSEL 5.11 22/22] block: don't ignore REQ_NOWAIT for direct IO Sasha Levin
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=20210405160406.268132-19-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox