From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Fri, 30 May 2025 14:50:32 +0000 (-0400)
Subject: dm-table: check BLK_FEAT_ATOMIC_WRITES inside limits_lock
X-Git-Tag: v6.16-rc1~56^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85f6d5b729eaace1549f1dcc284d9865f2c3ec02;p=thirdparty%2Flinux.git

dm-table: check BLK_FEAT_ATOMIC_WRITES inside limits_lock

dm_set_device_limits() should check q->limits.features for
BLK_FEAT_ATOMIC_WRITES while holding q->limits_lock, like it does for
the rest of the queue limits.

Fixes: b7c18b17a173 ("dm-table: Set BLK_FEAT_ATOMIC_WRITES for target queue limits")
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
---

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 57573e8b5aa97..9f95f77687ef1 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -430,13 +430,13 @@ static int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
 		return 0;
 	}
 
+	mutex_lock(&q->limits_lock);
 	/*
 	 * BLK_FEAT_ATOMIC_WRITES is not inherited from the bottom device in
 	 * blk_stack_limits(), so do it manually.
 	 */
 	limits->features |= (q->limits.features & BLK_FEAT_ATOMIC_WRITES);
 
-	mutex_lock(&q->limits_lock);
 	if (blk_stack_limits(limits, &q->limits,
 			get_start_sect(bdev) + start) < 0)
 		DMWARN("%s: adding target device %pg caused an alignment inconsistency: "