Commit d486bbec authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

xfs: simplify xfs_rw_bdev 



Delegate to bdev_rw_virt when operating on non-vmalloc memory and use
bio_add_vmalloc_chunk to insulate xfs from the details of adding vmalloc
memory to a bio.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20250507120451.4000627-17-hch@lst.de


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

fs/xfs/xfs_bio_io.c

+12 −18
Original line number Diff line number Diff line
@@ -18,42 +18,36 @@ xfs_rw_bdev( 
	enum req_op		op)



{

	unsigned int		is_vmalloc = is_vmalloc_addr(data);

	unsigned int		left = count;

	unsigned int		done = 0, added;

	int			error;

	struct bio		*bio;



	if (is_vmalloc && op == REQ_OP_WRITE)

		flush_kernel_vmap_range(data, count);

	op |= REQ_META | REQ_SYNC;

	if (!is_vmalloc_addr(data))

		return bdev_rw_virt(bdev, sector, data, count, op);



	bio = bio_alloc(bdev, bio_max_vecs(left), op | REQ_META | REQ_SYNC,

			GFP_KERNEL);

	bio = bio_alloc(bdev, bio_max_vecs(count), op, GFP_KERNEL);

	bio->bi_iter.bi_sector = sector;



	do {

		struct page	*page = kmem_to_page(data);

		unsigned int	off = offset_in_page(data);

		unsigned int	len = min_t(unsigned, left, PAGE_SIZE - off);



		while (bio_add_page(bio, page, len, off) != len) {

		added = bio_add_vmalloc_chunk(bio, data + done, count - done);

		if (!added) {

			struct bio	*prev = bio;



			bio = bio_alloc(prev->bi_bdev, bio_max_vecs(left),

			bio = bio_alloc(prev->bi_bdev,

					bio_max_vecs(count - done),

					prev->bi_opf, GFP_KERNEL);

			bio->bi_iter.bi_sector = bio_end_sector(prev);

			bio_chain(prev, bio);



			submit_bio(prev);

		}



		data += len;

		left -= len;

	} while (left > 0);

		done += added;

	} while (done < count);



	error = submit_bio_wait(bio);

	bio_put(bio);



	if (is_vmalloc && op == REQ_OP_READ)

	if (op == REQ_OP_READ)

		invalidate_kernel_vmap_range(data, count);

	return error;

}