diff mbox series

[1/3] block: mark bounce buffering as incompatible with integrity

Message ID 20250131122436.1317268-2-hch@lst.de (mailing list archive)
State New
Headers show
Series [1/3] block: mark bounce buffering as incompatible with integrity | expand

Commit Message

Christoph Hellwig Jan. 31, 2025, 12:24 p.m. UTC
None of the few drivers still using the legacy block layer bounce
buffering support integrity metadata.  Explicitly mark the features as
incompatible and stop creating the slab and mempool for integrity
buffers for the bounce bio_set.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/blk-settings.c | 5 +++++
 block/bounce.c       | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

Comments

Bart Van Assche Jan. 31, 2025, 4:54 p.m. UTC | #1
On 1/31/25 4:24 AM, Christoph Hellwig wrote:
> +	if (lim->features & BLK_FEAT_BOUNCE_HIGH) {
> +		pr_warn("no bounce buffer support for integruty metadata\n");
> +		return -EINVAL;
> +	}

integruty -> integrity

Thanks,

Bart.
Martin K. Petersen Feb. 3, 2025, 7:33 p.m. UTC | #2
Christoph,

> None of the few drivers still using the legacy block layer bounce
> buffering support integrity metadata. Explicitly mark the features as
> incompatible and stop creating the slab and mempool for integrity
> buffers for the bounce bio_set.

With typo fixed.

Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
diff mbox series

Patch

diff --git a/block/blk-settings.c b/block/blk-settings.c
index db12396ff5c7..83e9d71001bd 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -117,6 +117,11 @@  static int blk_validate_integrity_limits(struct queue_limits *lim)
 		return 0;
 	}
 
+	if (lim->features & BLK_FEAT_BOUNCE_HIGH) {
+		pr_warn("no bounce buffer support for integruty metadata\n");
+		return -EINVAL;
+	}
+
 	if (!IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY)) {
 		pr_warn("integrity support disabled.\n");
 		return -EINVAL;
diff --git a/block/bounce.c b/block/bounce.c
index 0d898cd5ec49..09a9616cf209 100644
--- a/block/bounce.c
+++ b/block/bounce.c
@@ -41,8 +41,6 @@  static void init_bounce_bioset(void)
 
 	ret = bioset_init(&bounce_bio_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
 	BUG_ON(ret);
-	if (bioset_integrity_create(&bounce_bio_set, BIO_POOL_SIZE))
-		BUG_ON(1);
 
 	ret = bioset_init(&bounce_bio_split, BIO_POOL_SIZE, 0, 0);
 	BUG_ON(ret);