From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Darrick J. Wong" <djwong@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Matthew Wilcox <willy@infradead.org>,
Christian Brauner <christian@brauner.io>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-xfs@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] block: use iomap for writes to block devices
Date: Thu, 20 Jul 2023 16:04:51 +0200 [thread overview]
Message-ID: <20230720140452.63817-6-hch@lst.de> (raw)
In-Reply-To: <20230720140452.63817-1-hch@lst.de>
Use iomap in buffer_head compat mode to write to block devices.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/Kconfig | 1 +
block/fops.c | 31 +++++++++++++++++++++++++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/block/Kconfig b/block/Kconfig
index 86122e459fe046..1a13ef0b1ca10c 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -5,6 +5,7 @@
menuconfig BLOCK
bool "Enable the block layer" if EXPERT
default y
+ select FS_IOMAP
select SBITMAP
help
Provide block layer support for the kernel.
diff --git a/block/fops.c b/block/fops.c
index 0c37c35003c3b7..31d356c83f27a3 100644
--- a/block/fops.c
+++ b/block/fops.c
@@ -15,6 +15,7 @@
#include <linux/falloc.h>
#include <linux/suspend.h>
#include <linux/fs.h>
+#include <linux/iomap.h>
#include <linux/module.h>
#include "blk.h"
@@ -386,6 +387,27 @@ static ssize_t blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
return __blkdev_direct_IO(iocb, iter, bio_max_segs(nr_pages));
}
+static int blkdev_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
+ unsigned int flags, struct iomap *iomap, struct iomap *srcmap)
+{
+ struct block_device *bdev = I_BDEV(inode);
+ loff_t isize = i_size_read(inode);
+
+ iomap->bdev = bdev;
+ iomap->offset = ALIGN_DOWN(offset, bdev_logical_block_size(bdev));
+ if (WARN_ON_ONCE(iomap->offset >= isize))
+ return -EIO;
+ iomap->type = IOMAP_MAPPED;
+ iomap->addr = iomap->offset;
+ iomap->length = isize - iomap->offset;
+ iomap->flags |= IOMAP_F_BUFFER_HEAD;
+ return 0;
+}
+
+static const struct iomap_ops blkdev_iomap_ops = {
+ .iomap_begin = blkdev_iomap_begin,
+};
+
static int blkdev_writepage(struct page *page, struct writeback_control *wbc)
{
return block_write_full_page(page, blkdev_get_block, wbc);
@@ -555,6 +577,11 @@ blkdev_direct_write(struct kiocb *iocb, struct iov_iter *from)
return written;
}
+static ssize_t blkdev_buffered_write(struct kiocb *iocb, struct iov_iter *from)
+{
+ return iomap_file_buffered_write(iocb, from, &blkdev_iomap_ops);
+}
+
/*
* Write data to the block device. Only intended for the block device itself
* and the raw driver which basically is a fake block device.
@@ -604,9 +631,9 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
ret = blkdev_direct_write(iocb, from);
if (ret >= 0 && iov_iter_count(from))
ret = direct_write_fallback(iocb, from, ret,
- generic_perform_write(iocb, from));
+ blkdev_buffered_write(iocb, from));
} else {
- ret = generic_perform_write(iocb, from);
+ ret = blkdev_buffered_write(iocb, from);
}
if (ret > 0)
--
2.39.2
next prev parent reply other threads:[~2023-07-20 14:05 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 14:04 allow building a kernel without buffer_heads Christoph Hellwig
2023-07-20 14:04 ` [PATCH 1/6] fs: remove emergency_thaw_bdev Christoph Hellwig
2023-07-20 14:12 ` Johannes Thumshirn
2023-07-20 15:43 ` Hannes Reinecke
2023-07-24 19:54 ` Luis Chamberlain
2023-07-20 14:04 ` [PATCH 2/6] fs: rename and move block_page_mkwrite_return Christoph Hellwig
2023-07-20 14:13 ` Johannes Thumshirn
2023-07-20 15:45 ` Hannes Reinecke
2023-07-24 19:55 ` Luis Chamberlain
2023-07-20 14:04 ` [PATCH 3/6] block: open code __generic_file_write_iter for blkdev writes Christoph Hellwig
2023-07-20 14:14 ` Johannes Thumshirn
2023-07-20 15:46 ` Hannes Reinecke
2023-07-24 20:05 ` Luis Chamberlain
2023-07-20 14:04 ` [PATCH 4/6] block: stop setting ->direct_IO Christoph Hellwig
2023-07-20 14:15 ` Johannes Thumshirn
2023-07-20 15:46 ` Hannes Reinecke
2023-07-24 20:07 ` Luis Chamberlain
2023-07-20 14:04 ` Christoph Hellwig [this message]
2023-07-20 15:48 ` [PATCH 5/6] block: use iomap for writes to block devices Hannes Reinecke
2023-07-24 20:14 ` Luis Chamberlain
[not found] ` <CGME20230727091404eucas1p2cbc14ec51eb1442496b1a4c30cd04803@eucas1p2.samsung.com>
2023-07-27 9:14 ` Pankaj Raghav
2023-07-20 14:04 ` [PATCH 6/6] fs: add CONFIG_BUFFER_HEAD Christoph Hellwig
2023-07-20 14:45 ` Matthew Wilcox
2023-07-21 6:24 ` Christoph Hellwig
2023-07-20 15:53 ` Hannes Reinecke
2023-07-21 6:25 ` Christoph Hellwig
2023-07-24 20:16 ` Luis Chamberlain
2023-07-20 14:51 ` allow building a kernel without buffer_heads Bob Peterson
2023-07-20 14:51 ` [Cluster-devel] " Bob Peterson
2023-07-21 6:26 ` Christoph Hellwig
2023-07-21 6:26 ` [Cluster-devel] " Christoph Hellwig
2023-08-01 17:21 allow building a kernel without buffer_heads v3 Christoph Hellwig
2023-08-01 17:22 ` [PATCH 5/6] block: use iomap for writes to block devices Christoph Hellwig
2023-08-02 7:27 ` Christian Brauner
2023-08-02 11:50 ` Johannes Thumshirn
2024-04-26 10:37 ` Xu Yang
2024-05-08 1:45 ` Xu Yang
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=20230720140452.63817-6-hch@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=christian@brauner.io \
--cc=djwong@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-xfs@vger.kernel.org \
--cc=willy@infradead.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 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.