Skip to content

Commit

Permalink
fs, block: copy_file_range for def_blk_ops for direct block device.
Browse files Browse the repository at this point in the history
For direct block device opened with O_DIRECT, use copy_file_range to
issue device copy offload, and fallback to generic_copy_file_range incase
device copy offload capability is absent.
Modify checks to allow bdevs to use copy_file_range.

Suggested-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
Signed-off-by: Nitesh Shetty <nj.shetty@samsung.com>
  • Loading branch information
nj-shetty authored and intel-lab-lkp committed Mar 29, 2023
1 parent ba285db commit 61819d2
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 2 deletions.
22 changes: 22 additions & 0 deletions block/blk-lib.c
Expand Up @@ -475,6 +475,28 @@ static inline bool blk_check_copy_offload(struct request_queue *q_in,
return blk_queue_copy(q_in) && blk_queue_copy(q_out);
}

int blkdev_copy_offload(struct block_device *bdev_in, loff_t pos_in,
struct block_device *bdev_out, loff_t pos_out, size_t len,
cio_iodone_t end_io, void *private, gfp_t gfp_mask)
{
struct request_queue *in_q = bdev_get_queue(bdev_in);
struct request_queue *out_q = bdev_get_queue(bdev_out);
int ret = -EINVAL;
bool offload = false;

ret = blk_copy_sanity_check(bdev_in, pos_in, bdev_out, pos_out, len);
if (ret)
return ret;

offload = blk_check_copy_offload(in_q, out_q);
if (offload)
ret = __blk_copy_offload(bdev_in, pos_in, bdev_out, pos_out,
len, end_io, private, gfp_mask);

return ret;
}
EXPORT_SYMBOL_GPL(blkdev_copy_offload);

/*
* @bdev_in: source block device
* @pos_in: source offset
Expand Down
20 changes: 20 additions & 0 deletions block/fops.c
Expand Up @@ -611,6 +611,25 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to)
return ret;
}

static ssize_t blkdev_copy_file_range(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out,
size_t len, unsigned int flags)
{
struct block_device *in_bdev = I_BDEV(bdev_file_inode(file_in));
struct block_device *out_bdev = I_BDEV(bdev_file_inode(file_out));
int comp_len = 0;

if ((file_in->f_iocb_flags & IOCB_DIRECT) &&
(file_out->f_iocb_flags & IOCB_DIRECT))
comp_len = blkdev_copy_offload(in_bdev, pos_in, out_bdev,
pos_out, len, NULL, NULL, GFP_KERNEL);
if (comp_len != len)
comp_len = generic_copy_file_range(file_in, pos_in + comp_len,
file_out, pos_out + comp_len, len - comp_len, flags);

return comp_len;
}

#define BLKDEV_FALLOC_FL_SUPPORTED \
(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \
FALLOC_FL_ZERO_RANGE | FALLOC_FL_NO_HIDE_STALE)
Expand Down Expand Up @@ -694,6 +713,7 @@ const struct file_operations def_blk_fops = {
.splice_read = generic_file_splice_read,
.splice_write = iter_file_splice_write,
.fallocate = blkdev_fallocate,
.copy_file_range = blkdev_copy_file_range,
};

static __init int blkdev_init(void)
Expand Down
11 changes: 9 additions & 2 deletions fs/read_write.c
Expand Up @@ -20,6 +20,7 @@
#include <linux/compat.h>
#include <linux/mount.h>
#include <linux/fs.h>
#include <linux/blkdev.h>
#include "internal.h"

#include <linux/uaccess.h>
Expand Down Expand Up @@ -1448,7 +1449,11 @@ static int generic_copy_file_checks(struct file *file_in, loff_t pos_in,
return -EOVERFLOW;

/* Shorten the copy to EOF */
size_in = i_size_read(inode_in);
if (S_ISBLK(inode_in->i_mode))
size_in = bdev_nr_bytes(I_BDEV(file_in->f_mapping->host));
else
size_in = i_size_read(inode_in);

if (pos_in >= size_in)
count = 0;
else
Expand Down Expand Up @@ -1709,7 +1714,9 @@ int generic_file_rw_checks(struct file *file_in, struct file *file_out)
/* Don't copy dirs, pipes, sockets... */
if (S_ISDIR(inode_in->i_mode) || S_ISDIR(inode_out->i_mode))
return -EISDIR;
if (!S_ISREG(inode_in->i_mode) || !S_ISREG(inode_out->i_mode))

if ((!S_ISREG(inode_in->i_mode) || !S_ISREG(inode_out->i_mode)) &&
(!S_ISBLK(inode_in->i_mode) || !S_ISBLK(inode_out->i_mode)))
return -EINVAL;

if (!(file_in->f_mode & FMODE_READ) ||
Expand Down
3 changes: 3 additions & 0 deletions include/linux/blkdev.h
Expand Up @@ -1057,6 +1057,9 @@ int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector,
int blkdev_issue_copy(struct block_device *bdev_in, loff_t pos_in,
struct block_device *bdev_out, loff_t pos_out, size_t len,
cio_iodone_t end_io, void *private, gfp_t gfp_mask);
int blkdev_copy_offload(struct block_device *bdev_in, loff_t pos_in,
struct block_device *bdev_out, loff_t pos_out, size_t len,
cio_iodone_t end_io, void *private, gfp_t gfp_mask);
struct bio *bio_map_kern(struct request_queue *q, void *data, unsigned int len,
gfp_t gfp_mask);
void bio_map_kern_endio(struct bio *bio);
Expand Down

0 comments on commit 61819d2

Please sign in to comment.