Check that the size of PI data correspond to device integrity profile and data size. Add PI data to device BIO. Signed-off-by: Alexander V. Buev <a.buev@xxxxxxxxx> --- block/fops.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/block/fops.c b/block/fops.c index b90742595317..d89fa7d99635 100644 --- a/block/fops.c +++ b/block/fops.c @@ -16,6 +16,7 @@ #include <linux/suspend.h> #include <linux/fs.h> #include <linux/module.h> +#include <linux/blk-integrity.h> #include "blk.h" static inline struct inode *bdev_file_inode(struct file *file) @@ -51,6 +52,19 @@ static bool blkdev_dio_unaligned(struct block_device *bdev, loff_t pos, #define DIO_INLINE_BIO_VECS 4 +static int __bio_integrity_add_iovec(struct bio *bio, struct iov_iter *pi_iter) +{ + struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev); + unsigned int pi_len = bio_integrity_bytes(bi, bio->bi_iter.bi_size >> SECTOR_SHIFT); + size_t iter_count = pi_iter->count-pi_len; + int ret; + + iov_iter_truncate(pi_iter, pi_len); + ret = bio_integrity_add_iovec(bio, pi_iter); + iov_iter_reexpand(pi_iter, iter_count); + return ret; +} + static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, unsigned int nr_pages) { @@ -94,6 +108,15 @@ static ssize_t __blkdev_direct_IO_simple(struct kiocb *iocb, if (iocb->ki_flags & IOCB_NOWAIT) bio.bi_opf |= REQ_NOWAIT; + if (iocb->ki_flags & IOCB_USE_PI) { + ret = __bio_integrity_add_iovec(&bio, (struct iov_iter *)iocb->private); + WRITE_ONCE(iocb->private, NULL); + if (ret) { + bio_release_pages(&bio, should_dirty); + goto out; + } + } + submit_bio_wait(&bio); bio_release_pages(&bio, should_dirty); @@ -178,6 +201,7 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, blk_opf_t opf = is_read ? REQ_OP_READ : dio_bio_write_op(iocb); loff_t pos = iocb->ki_pos; int ret = 0; + struct iov_iter *pi_iter = 0; if (blkdev_dio_unaligned(bdev, pos, iter)) return -EINVAL; @@ -235,6 +259,19 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, pos += bio->bi_iter.bi_size; nr_pages = bio_iov_vecs_to_alloc(iter, BIO_MAX_VECS); + + if (iocb->ki_flags & IOCB_USE_PI) { + if (!pi_iter) + pi_iter = (struct iov_iter *)iocb->private; + ret = __bio_integrity_add_iovec(bio, pi_iter); + WRITE_ONCE(iocb->private, NULL); + if (unlikely(ret)) { + bio->bi_status = BLK_STS_IOERR; + bio_endio(bio); + break; + } + } + if (!nr_pages) { submit_bio(bio); break; @@ -343,6 +380,16 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb, task_io_account_write(bio->bi_iter.bi_size); } + if (iocb->ki_flags & IOCB_USE_PI) { + ret = __bio_integrity_add_iovec(bio, (struct iov_iter *)iocb->private); + WRITE_ONCE(iocb->private, NULL); + if (ret) { + bio->bi_status = BLK_STS_IOERR; + bio_endio(bio); + return -EIOCBQUEUED; + } + } + if (iocb->ki_flags & IOCB_HIPRI) { bio->bi_opf |= REQ_POLLED | REQ_NOWAIT; submit_bio(bio); @@ -355,6 +402,31 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb, return -EIOCBQUEUED; } +static inline int +blkdev_check_pi(struct block_device *bdev, size_t data_size, size_t pi_size) +{ + struct blk_integrity *bi = bdev_get_integrity(bdev); + unsigned int intervals; + + if (unlikely(!(bi && bi->tuple_size && + bi->flags & BLK_INTEGRITY_DEVICE_CAPABLE))) { + pr_err("Device %d:%d is not integrity capable", + MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev)); + return -EINVAL; + } + + intervals = bio_integrity_intervals(bi, data_size >> SECTOR_SHIFT); + if (unlikely(intervals * bi->tuple_size > pi_size)) { + pr_err("Device %d:%d integrity & data size mismatch", + MAJOR(bdev->bd_dev), MINOR(bdev->bd_dev)); + pr_err("data=%zu integrity=%zu intervals=%u tuple=%u", + data_size, pi_size, + intervals, bi->tuple_size); + return -EINVAL; + } + return 0; +} + static ssize_t blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter) { unsigned int nr_pages; @@ -362,6 +434,14 @@ static ssize_t blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter) if (!iov_iter_count(iter)) return 0; + if (iocb->ki_flags & IOCB_USE_PI) { + struct block_device *bdev = iocb->ki_filp->private_data; + struct iov_iter *pi_iter = iocb->private; + + if (blkdev_check_pi(bdev, iter->count, pi_iter->count)) + return -EINVAL; + } + nr_pages = bio_iov_vecs_to_alloc(iter, BIO_MAX_VECS + 1); if (likely(nr_pages <= BIO_MAX_VECS)) { if (is_sync_kiocb(iocb)) -- 2.30.2