Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: modify bio_integrity_map_user to accept iov_iter as argument

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

Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
Signed-off-by: Kanchan Joshi <joshi.k@samsung.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20241128112240.8867-4-anuj20.g@samsung.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Anuj Gupta 2024-11-28 16:52:33 +05:30 committed by Jens Axboe
parent af891b0c75
commit b1e2f5a578
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/bio-integrity.c
View File

@ -302,16 +302,15 @@ static unsigned int bvec_from_pages(struct bio_vec *bvec, struct page **pages,
return nr_bvecs; 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); struct request_queue *q = bdev_get_queue(bio->bi_bdev);
unsigned int align = blk_lim_dma_alignment_and_pad(&q->limits); unsigned int align = blk_lim_dma_alignment_and_pad(&q->limits);
struct page *stack_pages[UIO_FASTIOV], **pages = stack_pages; struct page *stack_pages[UIO_FASTIOV], **pages = stack_pages;
struct bio_vec stack_vec[UIO_FASTIOV], *bvec = stack_vec; struct bio_vec stack_vec[UIO_FASTIOV], *bvec = stack_vec;
size_t offset, bytes = iter->count;
unsigned int direction, nr_bvecs; unsigned int direction, nr_bvecs;
struct iov_iter iter;
int ret, nr_vecs; int ret, nr_vecs;
size_t offset;
bool copy; bool copy;
if (bio_integrity(bio)) if (bio_integrity(bio))
@ -324,8 +323,7 @@ int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes)
else else
direction = ITER_SOURCE; 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) if (nr_vecs > BIO_MAX_VECS)
return -E2BIG; return -E2BIG;
if (nr_vecs > UIO_FASTIOV) { 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; pages = NULL;
} }
copy = !iov_iter_is_aligned(&iter, align, align); copy = !iov_iter_is_aligned(iter, align, align);
ret = iov_iter_extract_pages(&iter, &pages, bytes, nr_vecs, 0, &offset); ret = iov_iter_extract_pages(iter, &pages, bytes, nr_vecs, 0, &offset);
if (unlikely(ret < 0)) if (unlikely(ret < 0))
goto free_bvec; goto free_bvec;

10
block/blk-integrity.c
View File

@ -115,8 +115,16 @@ EXPORT_SYMBOL(blk_rq_map_integrity_sg);
int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf, int blk_rq_integrity_map_user(struct request *rq, void __user *ubuf,
ssize_t bytes) 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) if (ret)
return ret; return ret;

5
include/linux/bio-integrity.h
View File

@ -75,7 +75,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, gfp_t gfp,
unsigned int nr); unsigned int nr);
int bio_integrity_add_page(struct bio *bio, struct page *page, unsigned int len, int bio_integrity_add_page(struct bio *bio, struct page *page, unsigned int len,
unsigned int offset); 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); void bio_integrity_unmap_user(struct bio *bio);
bool bio_integrity_prep(struct bio *bio); bool bio_integrity_prep(struct bio *bio);
void bio_integrity_advance(struct bio *bio, unsigned int bytes_done); 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, static int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
ssize_t len)
{ {
return -EINVAL; return -EINVAL;
} }