From: Martijn Coenen <maco@android.com>
To: axboe@kernel.dk, hch@infradead.org, ming.lei@redhat.com
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
gregkh@linuxfoundation.org, kernel-team@android.com,
narayan@google.com, dariofreni@google.com, ioffe@google.com,
jiyong@google.com, maco@google.com,
Martijn Coenen <maco@android.com>
Subject: [PATCH v2] loop: change queue block size to match when using DIO.
Date: Wed, 4 Sep 2019 21:49:01 +0200 [thread overview]
Message-ID: <20190904194901.165883-1-maco@android.com> (raw)
In-Reply-To: <20190828103229.191853-1-maco@android.com>
The loop driver assumes that if the passed in fd is opened with
O_DIRECT, the caller wants to use direct I/O on the loop device.
However, if the underlying block device has a different block size than
the loop block queue, direct I/O can't be enabled. Instead of requiring
userspace to manually change the blocksize and re-enable direct I/O,
just change the queue block sizes to match, as well as the io_min size.
Signed-off-by: Martijn Coenen <maco@android.com>
---
v2 changes:
- Fixed commit message to say the block size must match the underlying
block device, not the underlying filesystem.
- Also set physical blocksize and minimal io size correspondingly.
drivers/block/loop.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index ab7ca5989097a..b547182037af2 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -994,6 +994,16 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync)
blk_queue_write_cache(lo->lo_queue, true, false);
+ if (io_is_direct(lo->lo_backing_file) && inode->i_sb->s_bdev) {
+ /* In case of direct I/O, match underlying block size */
+ unsigned short bsize = bdev_logical_block_size(
+ inode->i_sb->s_bdev);
+
+ blk_queue_logical_block_size(lo->lo_queue, bsize);
+ blk_queue_physical_block_size(lo->lo_queue, bsize);
+ blk_queue_io_min(lo->lo_queue, bsize);
+ }
+
loop_update_rotational(lo);
loop_update_dio(lo);
set_capacity(lo->lo_disk, size);
--
2.23.0.187.g17f5b7556c-goog
next prev parent reply other threads:[~2019-09-04 19:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 10:32 [PATCH] loop: change queue block size to match when using DIO Martijn Coenen
2019-08-30 15:50 ` Christoph Hellwig
2019-09-02 19:37 ` Martijn Coenen
2019-09-04 19:49 ` Martijn Coenen [this message]
2019-09-10 10:12 ` [PATCH v2] " Martijn Coenen
2019-09-30 8:24 ` Christoph Hellwig
2019-10-01 10:03 ` Martijn Coenen
2019-10-01 14:10 ` 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=20190904194901.165883-1-maco@android.com \
--to=maco@android.com \
--cc=axboe@kernel.dk \
--cc=dariofreni@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=ioffe@google.com \
--cc=jiyong@google.com \
--cc=kernel-team@android.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maco@google.com \
--cc=ming.lei@redhat.com \
--cc=narayan@google.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).