Skip to content

Commit 487c607

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: use iomap for writes to block devices
Use iomap in buffer_head compat mode to write to block devices. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed-by: Pankaj Raghav <p.raghav@samsung.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Christian Brauner <brauner@kernel.org> Link: https://lore.kernel.org/r/20230801172201.1923299-6-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent a05f7bd commit 487c607

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

block/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
menuconfig BLOCK
66
bool "Enable the block layer" if EXPERT
77
default y
8+
select FS_IOMAP
89
select SBITMAP
910
help
1011
Provide block layer support for the kernel.

block/fops.c

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/falloc.h>
1616
#include <linux/suspend.h>
1717
#include <linux/fs.h>
18+
#include <linux/iomap.h>
1819
#include <linux/module.h>
1920
#include "blk.h"
2021

@@ -386,6 +387,27 @@ static ssize_t blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
386387
return __blkdev_direct_IO(iocb, iter, bio_max_segs(nr_pages));
387388
}
388389

390+
static int blkdev_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
391+
unsigned int flags, struct iomap *iomap, struct iomap *srcmap)
392+
{
393+
struct block_device *bdev = I_BDEV(inode);
394+
loff_t isize = i_size_read(inode);
395+
396+
iomap->bdev = bdev;
397+
iomap->offset = ALIGN_DOWN(offset, bdev_logical_block_size(bdev));
398+
if (iomap->offset >= isize)
399+
return -EIO;
400+
iomap->type = IOMAP_MAPPED;
401+
iomap->addr = iomap->offset;
402+
iomap->length = isize - iomap->offset;
403+
iomap->flags |= IOMAP_F_BUFFER_HEAD;
404+
return 0;
405+
}
406+
407+
static const struct iomap_ops blkdev_iomap_ops = {
408+
.iomap_begin = blkdev_iomap_begin,
409+
};
410+
389411
static int blkdev_writepage(struct page *page, struct writeback_control *wbc)
390412
{
391413
return block_write_full_page(page, blkdev_get_block, wbc);
@@ -556,6 +578,11 @@ blkdev_direct_write(struct kiocb *iocb, struct iov_iter *from)
556578
return written;
557579
}
558580

581+
static ssize_t blkdev_buffered_write(struct kiocb *iocb, struct iov_iter *from)
582+
{
583+
return iomap_file_buffered_write(iocb, from, &blkdev_iomap_ops);
584+
}
585+
559586
/*
560587
* Write data to the block device. Only intended for the block device itself
561588
* and the raw driver which basically is a fake block device.
@@ -605,9 +632,9 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
605632
ret = blkdev_direct_write(iocb, from);
606633
if (ret >= 0 && iov_iter_count(from))
607634
ret = direct_write_fallback(iocb, from, ret,
608-
generic_perform_write(iocb, from));
635+
blkdev_buffered_write(iocb, from));
609636
} else {
610-
ret = generic_perform_write(iocb, from);
637+
ret = blkdev_buffered_write(iocb, from);
611638
}
612639

613640
if (ret > 0)

0 commit comments

Comments
 (0)