| Message ID | 20230523111709.145676-1-anuj20.g@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: fix bio-cache for passthru IO | expand |
On Tue, May 23, 2023 at 04:47:09PM +0530, Anuj Gupta wrote:
> + if (rq->cmd_flags & REQ_ALLOC_CACHE && (nr_vecs <= BIO_INLINE_VECS)) {
The inner braces are superflous.
On Tue, 23 May 2023 16:47:09 +0530, Anuj Gupta wrote: > commit <8af870aa5b847> ("block: enable bio caching use for passthru IO") > introduced bio-cache for passthru IO. In case when nr_vecs are greater > than BIO_INLINE_VECS, bio and bvecs are allocated from mempool (instead > of percpu cache) and REQ_ALLOC_CACHE is cleared. This causes the side > effect of not freeing bio/bvecs into mempool on completion. > > This patch lets the passthru IO fallback to allocation using bio_kmalloc > when nr_vecs are greater than BIO_INLINE_VECS. The corresponding bio > is freed during call to blk_mq_map_bio_put during completion. > > [...] Applied, thanks! [1/1] block: fix bio-cache for passthru IO (no commit info) Best regards,
diff --git a/block/blk-map.c b/block/blk-map.c index 9137d16cecdc..9c03e641d32c 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -247,7 +247,7 @@ static struct bio *blk_rq_map_bio_alloc(struct request *rq, { struct bio *bio; - if (rq->cmd_flags & REQ_ALLOC_CACHE) { + if (rq->cmd_flags & REQ_ALLOC_CACHE && (nr_vecs <= BIO_INLINE_VECS)) { bio = bio_alloc_bioset(NULL, nr_vecs, rq->cmd_flags, gfp_mask, &fs_bio_set); if (!bio)
commit <8af870aa5b847> ("block: enable bio caching use for passthru IO") introduced bio-cache for passthru IO. In case when nr_vecs are greater than BIO_INLINE_VECS, bio and bvecs are allocated from mempool (instead of percpu cache) and REQ_ALLOC_CACHE is cleared. This causes the side effect of not freeing bio/bvecs into mempool on completion. This patch lets the passthru IO fallback to allocation using bio_kmalloc when nr_vecs are greater than BIO_INLINE_VECS. The corresponding bio is freed during call to blk_mq_map_bio_put during completion. Cc: stable@vger.kernel.org # 6.1 fixes <8af870aa5b847> ("block: enable bio caching use for passthru IO") Signed-off-by: Anuj Gupta <anuj20.g@samsung.com> Signed-off-by: Kanchan Joshi <joshi.k@samsung.com> --- block/blk-map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)