diff mbox series

[1/2] block: Clear zone limits for a non-zoned stacked queue

Message ID 20240222131724.1803520-1-dlemoal@kernel.org (mailing list archive)
State New, archived
Headers show
Series [1/2] block: Clear zone limits for a non-zoned stacked queue | expand

Commit Message

Damien Le Moal Feb. 22, 2024, 1:17 p.m. UTC
Device mapper may create a non-zoned mapped device out of a zoned device
(e.g., the dm-zoned target). In such case, some queue limit such as the
max_zone_append_sectors and zone_write_granularity endup being non zero
values for a block device that is not zoned. Avoid this by clearing
these limits in blk_stack_limits() when the stacked zoned limit is
false.

Fixes: 3093a479727b ("block: inherit the zoned characteristics in blk_stack_limits")
Cc: stable@vger.kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---
 block/blk-settings.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Jens Axboe Feb. 22, 2024, 5:35 p.m. UTC | #1
On Thu, 22 Feb 2024 22:17:23 +0900, Damien Le Moal wrote:
> Device mapper may create a non-zoned mapped device out of a zoned device
> (e.g., the dm-zoned target). In such case, some queue limit such as the
> max_zone_append_sectors and zone_write_granularity endup being non zero
> values for a block device that is not zoned. Avoid this by clearing
> these limits in blk_stack_limits() when the stacked zoned limit is
> false.
> 
> [...]

Applied, thanks!

[1/2] block: Clear zone limits for a non-zoned stacked queue
      commit: c8f6f88d25929ad2f290b428efcae3b526f3eab0
[2/2] block: Do not include rbtree.h in blk-zoned.c
      commit: 522d73526f8d4519eefc693204bb474391e60f2b

Best regards,
diff mbox series

Patch

diff --git a/block/blk-settings.c b/block/blk-settings.c
index 06ea91e51b8b..5adadce08408 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -689,6 +689,10 @@  int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
 	t->zone_write_granularity = max(t->zone_write_granularity,
 					b->zone_write_granularity);
 	t->zoned = max(t->zoned, b->zoned);
+	if (!t->zoned) {
+		t->zone_write_granularity = 0;
+		t->max_zone_append_sectors = 0;
+	}
 	return ret;
 }
 EXPORT_SYMBOL(blk_stack_limits);