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

block: remove bio_add_zone_append_page 



This is only used by the nvmet zns passthrough code, which can trivially
just use bio_add_pc_page and do the sanity check for the max zone append
limit itself.

All future zoned file systems should follow the btrfs lead and let the
upper layers fill up bios unlimited by hardware constraints and split
them to the limits in the I/O submission handler.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20241030051859.280923-3-hch@lst.de


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

block/bio.c

+0 −33
Original line number Diff line number Diff line
@@ -1064,39 +1064,6 @@ int bio_add_pc_page(struct request_queue *q, struct bio *bio, 
}

EXPORT_SYMBOL(bio_add_pc_page);



/**

 * bio_add_zone_append_page - attempt to add page to zone-append bio

 * @bio: destination bio

 * @page: page to add

 * @len: vec entry length

 * @offset: vec entry offset

 *

 * Attempt to add a page to the bio_vec maplist of a bio that will be submitted

 * for a zone-append request. This can fail for a number of reasons, such as the

 * bio being full or the target block device is not a zoned block device or

 * other limitations of the target block device. The target block device must

 * allow bio's up to PAGE_SIZE, so it is always possible to add a single page

 * to an empty bio.

 *

 * Returns: number of bytes added to the bio, or 0 in case of a failure.

 */

int bio_add_zone_append_page(struct bio *bio, struct page *page,

			     unsigned int len, unsigned int offset)

{

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

	bool same_page = false;



	if (WARN_ON_ONCE(bio_op(bio) != REQ_OP_ZONE_APPEND))

		return 0;



	if (WARN_ON_ONCE(!bdev_is_zoned(bio->bi_bdev)))

		return 0;



	return bio_add_hw_page(q, bio, page, len, offset,

			       queue_max_zone_append_sectors(q), &same_page);

}

EXPORT_SYMBOL_GPL(bio_add_zone_append_page);



/**

 * __bio_add_page - add page(s) to a bio in a new segment

 * @bio: destination bio

drivers/nvme/target/zns.c

+13 −8
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ void nvmet_bdev_execute_zone_append(struct nvmet_req *req) 
	u16 status = NVME_SC_SUCCESS;

	unsigned int total_len = 0;

	struct scatterlist *sg;

	u32 data_len = nvmet_rw_data_len(req);

	struct bio *bio;

	int sg_cnt;
@@ -544,6 +545,13 @@ void nvmet_bdev_execute_zone_append(struct nvmet_req *req) 
	if (!nvmet_check_transfer_len(req, nvmet_rw_data_len(req)))

		return;



	if (data_len >

	    bdev_max_zone_append_sectors(req->ns->bdev) << SECTOR_SHIFT) {

		req->error_loc = offsetof(struct nvme_rw_command, length);

		status = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;

		goto out;

	}



	if (!req->sg_cnt) {

		nvmet_req_complete(req, 0);

		return;
@@ -576,20 +584,17 @@ void nvmet_bdev_execute_zone_append(struct nvmet_req *req) 
		bio->bi_opf |= REQ_FUA;



	for_each_sg(req->sg, sg, req->sg_cnt, sg_cnt) {

		struct page *p = sg_page(sg);

		unsigned int l = sg->length;

		unsigned int o = sg->offset;

		unsigned int ret;

		unsigned int len = sg->length;



		ret = bio_add_zone_append_page(bio, p, l, o);

		if (ret != sg->length) {

		if (bio_add_pc_page(bdev_get_queue(bio->bi_bdev), bio,

				sg_page(sg), len, sg->offset) != len) {

			status = NVME_SC_INTERNAL;

			goto out_put_bio;

		}

		total_len += sg->length;

		total_len += len;

	}



	if (total_len != nvmet_rw_data_len(req)) {

	if (total_len != data_len) {

		status = NVME_SC_INTERNAL | NVME_STATUS_DNR;

		goto out_put_bio;

	}

include/linux/bio.h

+0 −2
Original line number Diff line number Diff line
@@ -418,8 +418,6 @@ bool __must_check bio_add_folio(struct bio *bio, struct folio *folio, 
				size_t len, size_t off);

extern int bio_add_pc_page(struct request_queue *, struct bio *, struct page *,

			   unsigned int, unsigned int);

int bio_add_zone_append_page(struct bio *bio, struct page *page,

			     unsigned int len, unsigned int offset);

void __bio_add_page(struct bio *bio, struct page *page,

		unsigned int len, unsigned int off);

void bio_add_folio_nofail(struct bio *bio, struct folio *folio, size_t len,