block: fix GFP_ flags confusion in bio_integrity_alloc_buf

bio_integrity_alloc_buf usage of GFP_ flags is messed up.  For one it
mixes GFP_NOFS and GFP_NOIO for neighbouring allocations, but it also
makes the allocations fail more often than needed.  That code was copied
from bio_alloc_bioset which needs to do that so that it can punt to the
rescuer workqueue, but none of that is needed for the integrity
allocations that either sits in the file system or at the very bottom
of the I/O stack.  Failing early means we'll do a fully waiting
allocation from the mempool ->alloc callback which is usually much
larger than required.

Fix this by passing a gfp_t so that the file system path can pass
GFP_NOFS and the auto-integrity code can pass GFP_NOIO, and don't
modify the allocation type except for disabling warnings.

Fixes: ec7f31b2a2d3 ("block: make bio auto-integrity deadlock safe")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://patch.msgid.link/20260624080014.1998650-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bio-integrity-auto.c b/block/bio-integrity-auto.c
index 353eed632fcc9e578e2631570aef91b4a6a6b06f..b1c733ecfd2e8cf02e9984add78e5f970fcbb36d 100644 (file)
--- a/block/bio-integrity-auto.c
+++ b/block/bio-integrity-auto.c
@@ -94,7 +94,7 @@ void bio_integrity_prep(struct bio *bio, unsigned int action)
        bio_integrity_init(bio, &bid->bip, &bid->bvec, 1);
        bid->bio = bio;
        bid->bip.bip_flags |= BIP_BLOCK_INTEGRITY;
-       bio_integrity_alloc_buf(bio, action & BI_ACT_ZERO);
+       bio_integrity_alloc_buf(bio, GFP_NOIO, action & BI_ACT_ZERO);
        if (action & BI_ACT_CHECK)
                bio_integrity_setup_default(bio);
 

diff --git a/block/bio-integrity-fs.c b/block/bio-integrity-fs.c
index 0daa42d9ead7756d404b7dc6a406bb4b1c0b1a7b..9c5fe5fa8f0dadc024531910150715ddc83e0a68 100644 (file)
--- a/block/bio-integrity-fs.c
+++ b/block/bio-integrity-fs.c
@@ -23,10 +23,10 @@ unsigned int fs_bio_integrity_alloc(struct bio *bio)
        if (!action)
                return 0;
 
-       iib = mempool_alloc(&fs_bio_integrity_pool, GFP_NOIO);
+       iib = mempool_alloc(&fs_bio_integrity_pool, GFP_NOFS);
        bio_integrity_init(bio, &iib->bip, &iib->bvec, 1);
 
-       bio_integrity_alloc_buf(bio, action & BI_ACT_ZERO);
+       bio_integrity_alloc_buf(bio, GFP_NOFS, action & BI_ACT_ZERO);
        if (action & BI_ACT_CHECK)
                bio_integrity_setup_default(bio);
        return action;

diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index e796de1a749e335b01e24a7c074fa724eaada4fc..a53b38cf8a1a27ce72557b1ca79e9289e183a316 100644 (file)
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -64,20 +64,18 @@ unsigned int __bio_integrity_action(struct bio *bio)
 }
 EXPORT_SYMBOL_GPL(__bio_integrity_action);
 
-void bio_integrity_alloc_buf(struct bio *bio, bool zero_buffer)
+void bio_integrity_alloc_buf(struct bio *bio, gfp_t gfp, bool zero_buffer)
 {
        struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);
        struct bio_integrity_payload *bip = bio_integrity(bio);
        unsigned int len = bio_integrity_bytes(bi, bio_sectors(bio));
-       gfp_t gfp = GFP_NOIO | (zero_buffer ? __GFP_ZERO : 0);
        void *buf;
 
-       buf = kmalloc(len, (gfp & ~__GFP_DIRECT_RECLAIM) |
-                       __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN);
+       buf = kmalloc(len, gfp | __GFP_NOWARN | (zero_buffer ? __GFP_ZERO : 0));
        if (unlikely(!buf)) {
                struct page *page;
 
-               page = mempool_alloc(&integrity_buf_pool, GFP_NOFS);
+               page = mempool_alloc(&integrity_buf_pool, gfp);
                if (zero_buffer)
                        memset(page_address(page), 0, len);
                bvec_set_page(&bip->bip_vec[0], page, len, 0);

diff --git a/include/linux/bio-integrity.h b/include/linux/bio-integrity.h
index af5178434ec615d556a24fc1b6eb2a20501548df..c3dda32fd803067cf90a0a2607f30639d955e72d 100644 (file)
--- a/include/linux/bio-integrity.h
+++ b/include/linux/bio-integrity.h
@@ -141,7 +141,7 @@ static inline int bio_integrity_add_page(struct bio *bio, struct page *page,
 }
 #endif /* CONFIG_BLK_DEV_INTEGRITY */
 
-void bio_integrity_alloc_buf(struct bio *bio, bool zero_buffer);
+void bio_integrity_alloc_buf(struct bio *bio, gfp_t gfp, bool zero_buffer);
 void bio_integrity_free_buf(struct bio_integrity_payload *bip);
 void bio_integrity_setup_default(struct bio *bio);