From: Greg Kroah-Hartman Date: Thu, 1 Jun 2023 09:47:04 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v5.4.245~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4320263b7953b7698e22a9a42085e3bca1efb979;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: block-fix-bio-cache-for-passthru-io.patch --- diff --git a/queue-6.1/block-fix-bio-cache-for-passthru-io.patch b/queue-6.1/block-fix-bio-cache-for-passthru-io.patch new file mode 100644 index 00000000000..210eb49d518 --- /dev/null +++ b/queue-6.1/block-fix-bio-cache-for-passthru-io.patch @@ -0,0 +1,42 @@ +From 46930b7cc7727271c9c27aac1fdc97a8645e2d00 Mon Sep 17 00:00:00 2001 +From: Anuj Gupta +Date: Tue, 23 May 2023 16:47:09 +0530 +Subject: block: fix bio-cache for passthru IO + +From: Anuj Gupta + +commit 46930b7cc7727271c9c27aac1fdc97a8645e2d00 upstream. + +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 +Signed-off-by: Kanchan Joshi +Link: https://lore.kernel.org/r/20230523111709.145676-1-anuj20.g@samsung.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + block/blk-map.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/block/blk-map.c ++++ b/block/blk-map.c +@@ -246,7 +246,7 @@ static struct bio *blk_rq_map_bio_alloc( + { + struct bio *bio; + +- if (rq->cmd_flags & REQ_POLLED) { ++ if (rq->cmd_flags & REQ_POLLED && (nr_vecs <= BIO_INLINE_VECS)) { + blk_opf_t opf = rq->cmd_flags | REQ_ALLOC_CACHE; + + bio = bio_alloc_bioset(NULL, nr_vecs, opf, gfp_mask, diff --git a/queue-6.1/series b/queue-6.1/series index c42a7271679..c6d48d2c0d0 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -35,3 +35,4 @@ octeontx2-af-add-validation-for-lmac-type.patch drm-amd-don-t-allow-s0ix-on-apus-older-than-raven.patch bluetooth-add-cmd-validity-checks-at-the-start-of-hci_sock_ioctl.patch revert-thermal-drivers-mellanox-use-generic-thermal_zone_get_trip-function.patch +block-fix-bio-cache-for-passthru-io.patch