Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0af2917 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: check virt boundary in bio_will_gap() 



In the following patch, the way for figuring out
the last bvec will be changed with a bit cost introduced,
so return immediately if the queue doesn't have virt
boundary limit. Actually most of devices have not
this limit.

Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 7bcd79ac

include/linux/blkdev.h

+11 −5
Original line number Diff line number Diff line
@@ -1372,6 +1372,13 @@ static inline void put_dev_sector(Sector p) 
	page_cache_release(p.v);

}



static inline bool __bvec_gap_to_prev(struct request_queue *q,

				struct bio_vec *bprv, unsigned int offset)

{

	return offset ||

		((bprv->bv_offset + bprv->bv_len) & queue_virt_boundary(q));

}



/*

 * Check if adding a bio_vec after bprv with offset would create a gap in

 * the SG list. Most drivers don't care about this, but some do.
@@ -1381,17 +1388,16 @@ static inline bool bvec_gap_to_prev(struct request_queue *q, 
{

	if (!queue_virt_boundary(q))

		return false;

	return offset ||

		((bprv->bv_offset + bprv->bv_len) & queue_virt_boundary(q));

	return __bvec_gap_to_prev(q, bprv, offset);

}



static inline bool bio_will_gap(struct request_queue *q, struct bio *prev,

			 struct bio *next)

{

	if (!bio_has_data(prev))

	if (!bio_has_data(prev) || !queue_virt_boundary(q))

		return false;



	return bvec_gap_to_prev(q, &prev->bi_io_vec[prev->bi_vcnt - 1],

	return __bvec_gap_to_prev(q, &prev->bi_io_vec[prev->bi_vcnt - 1],

				  next->bi_io_vec[0].bv_offset);

}