Commit fe8f4ca7 authored by Anuj Gupta's avatar Anuj Gupta Committed by Jens Axboe
Browse files

block: modify bio_integrity_map_user to accept iov_iter as argument 



This patch refactors bio_integrity_map_user to accept iov_iter as
argument. This is a prep patch.

Signed-off-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Signed-off-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20241128112240.8867-4-anuj20.g@samsung.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 03114197

block/bio-integrity.c

+5 −7
Original line number Diff line number Diff line
@@ -302,16 +302,15 @@ static unsigned int bvec_from_pages(struct bio_vec *bvec, struct page **pages, 
	return nr_bvecs;

}



int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes)

int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)

{

	struct request_queue *q = bdev_get_queue(bio->bi_bdev);

	unsigned int align = blk_lim_dma_alignment_and_pad(&q->limits);

	struct page *stack_pages[UIO_FASTIOV], **pages = stack_pages;

	struct bio_vec stack_vec[UIO_FASTIOV], *bvec = stack_vec;

	size_t offset, bytes = iter->count;

	unsigned int direction, nr_bvecs;

	struct iov_iter iter;

	int ret, nr_vecs;

	size_t offset;

	bool copy;



	if (bio_integrity(bio))
@@ -324,8 +323,7 @@ int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes) 
	else

		direction = ITER_SOURCE;



	iov_iter_ubuf(&iter, direction, ubuf, bytes);

	nr_vecs = iov_iter_npages(&iter, BIO_MAX_VECS + 1);

	nr_vecs = iov_iter_npages(iter, BIO_MAX_VECS + 1);

	if (nr_vecs > BIO_MAX_VECS)

		return -E2BIG;

	if (nr_vecs > UIO_FASTIOV) {
@@ -335,8 +333,8 @@ int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes) 
		pages = NULL;

	}



	copy = !iov_iter_is_aligned(&iter, align, align);

	ret = iov_iter_extract_pages(&iter, &pages, bytes, nr_vecs, 0, &offset);

	copy = !iov_iter_is_aligned(iter, align, align);

	ret = iov_iter_extract_pages(iter, &pages, bytes, nr_vecs, 0, &offset);

	if (unlikely(ret < 0))

		goto free_bvec;

block/blk-integrity.c

+9 −1
Original line number Diff line number Diff line
@@ -115,8 +115,16 @@ EXPORT_SYMBOL(blk_rq_map_integrity_sg); 
int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf,

			      ssize_t bytes)

{

	int ret = bio_integrity_map_user(rq->bio, ubuf, bytes);

	int ret;

	struct iov_iter iter;

	unsigned int direction;



	if (op_is_write(req_op(rq)))

		direction = ITER_DEST;

	else

		direction = ITER_SOURCE;

	iov_iter_ubuf(&iter, direction, ubuf, bytes);

	ret = bio_integrity_map_user(rq->bio, &iter);

	if (ret)

		return ret;

include/linux/bio-integrity.h

+2 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, gfp_t gfp, 
		unsigned int nr);

int bio_integrity_add_page(struct bio *bio, struct page *page, unsigned int len,

		unsigned int offset);

int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t len);

int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter);

void bio_integrity_unmap_user(struct bio *bio);

bool bio_integrity_prep(struct bio *bio);

void bio_integrity_advance(struct bio *bio, unsigned int bytes_done);
@@ -101,8 +101,7 @@ static inline void bioset_integrity_free(struct bio_set *bs) 
{

}



static inline int bio_integrity_map_user(struct bio *bio, void __user *ubuf,

					 ssize_t len)

static int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)

{

	return -EINVAL;

}