On Wed, Sep 04, 2024 at 08:26:01AM -0700, Keith Busch wrote:
> From: Keith Busch <kbusch@xxxxxxxxxx>
>
> The segments are already packed to the queue limits when adding them to
> the bio,
I can't really parse this. I guess this talks about
bio_integrity_add_page trying to append the payload to the last
vector when possible?
> -int blk_rq_count_integrity_sg(struct request_queue *q, struct bio *bio)
> +int blk_rq_count_integrity_segs(struct bio *bio)
> {
> - struct bio_vec iv, ivprv = { NULL };
> unsigned int segments = 0;
> - unsigned int seg_size = 0;
> - struct bvec_iter iter;
> - int prev = 0;
> -
> - bio_for_each_integrity_vec(iv, bio, iter) {
>
> - if (prev) {
> - if (!biovec_phys_mergeable(q, &ivprv, &iv))
> - goto new_segment;
> - if (seg_size + iv.bv_len > queue_max_segment_size(q))
> - goto new_segment;
> -
> - seg_size += iv.bv_len;
> - } else {
> -new_segment:
> - segments++;
> - seg_size = iv.bv_len;
Q: for the data path the caller submitted bio_vecs can be larger
than the max segment size, and given that the metadata API tries
to follow that in general, I'd assume we could also get metadata
segments larger than the segment size in theory, in which case
we'd need to split a bvec into multiple segments, similar to what
bvec_split_segs does. Do we need similar handling for metadata?
Or are we going to say that metadata must e.g. always be smaller
than PAGE_SIZE as max_segment_sizse must be >= PAGE_SIZE?
> + for_each_bio(bio)
> + segments += bio->bi_integrity->bip_vcnt;
If a bio was cloned bip_vcnt isn't the correct value here,
we'll need to use the iter to count the segments.
> bio->bi_next = NULL;
> - nr_integrity_segs = blk_rq_count_integrity_sg(q, bio);
> + nr_integrity_segs = blk_rq_count_integrity_segs(bio);
> bio->bi_next = next;
And instead of playing the magic with the bio chain here, I'd have
a low-level helper to count the bio segments here.
>
> if (req->nr_integrity_segments + nr_integrity_segs >
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 3ed5181c75610..79cc66275f1cd 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -2548,7 +2548,7 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio,
> blk_rq_bio_prep(rq, bio, nr_segs);
> #if defined(CONFIG_BLK_DEV_INTEGRITY)
> if (bio->bi_opf & REQ_INTEGRITY)
> - rq->nr_integrity_segments = blk_rq_count_integrity_sg(rq->q, bio);
> + rq->nr_integrity_segments = blk_rq_count_integrity_segs(bio);
And here I'm actually pretty sure this is always a single bio and not
a chain either.
