Linux block layer
 help / color / mirror / Atom feed
From: Zhenxian Ma <mzx199711@gmail.com>
To: axboe@kernel.dk, linux-block@vger.kernel.org
Cc: hch@lst.de, Zhenxian Ma <mzx199711@gmail.com>,
	syzbot+bd975ef54294bec73f0e@syzkaller.appspotmail.com,
	Tal Zussman <tz2294@columbia.edu>,
	Julian Sun <sunjunchao@bytedance.com>
Subject: [PATCH] block: don't take i_rwsem twice in the direct write fallback
Date: Wed, 21 Oct 2026 17:33:32 +0800	[thread overview]
Message-ID: <20261021093332.17334-1-mzx199711@gmail.com> (raw)

commit 2fec4fd97cc3 ("block: take i_rwsem for the direct I/O write
fallback") takes i_rwsem around blkdev_buffered_write() in the direct
write fallback.  commit 1b1be9ea4e34 ("block: take the inode lock for
buffered write fallback") fixes the same race by taking i_rwsem inside
blkdev_buffered_write().  With both applied, the fallback takes i_rwsem
shared twice.

Drop the outer locking in the fallback.

Fixes: 1b1be9ea4e34 ("block: take the inode lock for buffered write fallback")
Reported-by: syzbot+bd975ef54294bec73f0e@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=bd975ef54294bec73f0e
Cc: Tal Zussman <tz2294@columbia.edu>
Cc: Julian Sun <sunjunchao@bytedance.com>
Assisted-by: LLM
Signed-off-by: Zhenxian Ma <mzx199711@gmail.com>
---
 block/fops.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/block/fops.c b/block/fops.c
index 0e4c42c8b74f..ddab4940d76b 100644
--- a/block/fops.c
+++ b/block/fops.c
@@ -809,13 +809,8 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
 				else if (!blkdev_dio_fua(iocb, bdev))
 					need_sync = true;
 			} else {
-				ssize_t ret2;
-
-				inode_lock_shared(bd_inode);
-				ret2 = blkdev_buffered_write(iocb, from);
-				inode_unlock_shared(bd_inode);
 				ret = direct_write_fallback(iocb, from, ret,
-							    ret2);
+						blkdev_buffered_write(iocb, from));
 				need_sync = true;
 			}
 		} else if (ret > 0 && !blkdev_dio_fua(iocb, bdev)) {
-- 
2.39.3


             reply	other threads:[~2026-10-21  9:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-21  9:33 Zhenxian Ma [this message]
2026-10-21 16:49 ` [PATCH] block: don't take i_rwsem twice in the direct write fallback Bart Van Assche
2026-10-22  6:25 ` [PATCH v2] block: fix recursive i_rwsem locking in blkdev_write_iter() Zhenxian Ma
2026-10-22 16:19   ` Bart Van Assche
2026-10-27  6:14     ` Zhenxian Ma
2026-10-27  7:36       ` Shin'ichiro Kawasaki
2026-10-27 14:48   ` Jens Axboe

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=20261021093332.17334-1-mzx199711@gmail.com \
    --to=mzx199711@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=hch@lst.de \
    --cc=linux-block@vger.kernel.org \
    --cc=sunjunchao@bytedance.com \
    --cc=syzbot+bd975ef54294bec73f0e@syzkaller.appspotmail.com \
    --cc=tz2294@columbia.edu \
    /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