PI fixes
Hi all,
this series has two unrelated PI/metadata fixes that came up during a little testing surge.
Diffstat:
block/bio-integrity-auto.c | 2 +- block/bio-integrity-fs.c | 4 ++-- block/bio-integrity.c | 9 ++++----- include/linux/bio-integrity.h | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-)
PATCH 1/2 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.
--- block/bio-integrity-auto.c | 2 +- block/bio-integrity-fs.c | 4 ++-- block/bio-integrity.c | 8 +++----- include/linux/bio-integrity.h | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-)
block/bio-integrity-auto.c +1 -1
@@ -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);
block/bio-integrity-fs.c +2 -2
@@ -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;
block/bio-integrity.c +3 -5
@@ -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 );
include/linux/bio-integrity.h +1 -1
@@ -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);
Signature · 1 line
2.53.0
PATCH 2/2 block: handle REQ_OP_ZONE_APPEND in __bio_integrity_action
In reply to Christoph HellwigOtherwise zone append commands will miss their integrity data. While this works "fine" for auto-PI, it break file system PI and non-PI metadata.
With this fix 512-byte block PI and non-PI metadata work fine on native and emulated Zone Append. 4k block size PI works fine with the "block: fix integrity offset/length conversions" series from Caleb Sander Mateos.
--- block/bio-integrity.c | 1 + 1 file changed, 1 insertion(+)
block/bio-integrity.c +1 -0
@@ -38,6 +38,7 @@ unsigned int __bio_integrity_action(struct bio *bio) }return BI_ACT_BUFFER |BI_ACT_CHECK ;case REQ_OP_WRITE : +case REQ_OP_ZONE_APPEND :/* * Flush masquerading as write? */
Signature · 1 line
2.53.0