From: Greg Kroah-Hartman Date: Tue, 9 Mar 2021 11:52:05 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v4.4.261~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ad45f0808962957b67484b8197828b8d7c10d77;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: dm-table-fix-zoned-iterate_devices-based-device-capability-checks.patch --- diff --git a/queue-5.4/dm-table-fix-zoned-iterate_devices-based-device-capability-checks.patch b/queue-5.4/dm-table-fix-zoned-iterate_devices-based-device-capability-checks.patch new file mode 100644 index 00000000000..31bc1244820 --- /dev/null +++ b/queue-5.4/dm-table-fix-zoned-iterate_devices-based-device-capability-checks.patch @@ -0,0 +1,162 @@ +From 24f6b6036c9eec21191646930ad42808e6180510 Mon Sep 17 00:00:00 2001 +From: Jeffle Xu +Date: Mon, 8 Feb 2021 22:46:38 -0500 +Subject: dm table: fix zoned iterate_devices based device capability checks + +From: Jeffle Xu + +commit 24f6b6036c9eec21191646930ad42808e6180510 upstream. + +Fix dm_table_supports_zoned_model() and invert logic of both +iterate_devices_callout_fn so that all devices' zoned capabilities are +properly checked. + +Add one more parameter to dm_table_any_dev_attr(), which is actually +used as the @data parameter of iterate_devices_callout_fn, so that +dm_table_matches_zone_sectors() can be replaced by +dm_table_any_dev_attr(). + +Fixes: dd88d313bef02 ("dm table: add zoned block devices validation") +Cc: stable@vger.kernel.org +Signed-off-by: Jeffle Xu +Signed-off-by: Mike Snitzer +[jeffle: also convert partial completion check] +Signed-off-by: Greg Kroah-Hartman +--- + drivers/md/dm-table.c | 50 +++++++++++++++++--------------------------------- + 1 file changed, 17 insertions(+), 33 deletions(-) + +--- a/drivers/md/dm-table.c ++++ b/drivers/md/dm-table.c +@@ -1397,10 +1397,10 @@ struct dm_target *dm_table_find_target(s + * should use the iteration structure like dm_table_supports_nowait() or + * dm_table_supports_discards(). Or introduce dm_table_all_devs_attr() that + * uses an @anti_func that handle semantics of counter examples, e.g. not +- * capable of something. So: return !dm_table_any_dev_attr(t, anti_func); ++ * capable of something. So: return !dm_table_any_dev_attr(t, anti_func, data); + */ + static bool dm_table_any_dev_attr(struct dm_table *t, +- iterate_devices_callout_fn func) ++ iterate_devices_callout_fn func, void *data) + { + struct dm_target *ti; + unsigned int i; +@@ -1409,7 +1409,7 @@ static bool dm_table_any_dev_attr(struct + ti = dm_table_get_target(t, i); + + if (ti->type->iterate_devices && +- ti->type->iterate_devices(ti, func, NULL)) ++ ti->type->iterate_devices(ti, func, data)) + return true; + } + +@@ -1452,13 +1452,13 @@ bool dm_table_has_no_data_devices(struct + return true; + } + +-static int device_is_zoned_model(struct dm_target *ti, struct dm_dev *dev, +- sector_t start, sector_t len, void *data) ++static int device_not_zoned_model(struct dm_target *ti, struct dm_dev *dev, ++ sector_t start, sector_t len, void *data) + { + struct request_queue *q = bdev_get_queue(dev->bdev); + enum blk_zoned_model *zoned_model = data; + +- return q && blk_queue_zoned_model(q) == *zoned_model; ++ return !q || blk_queue_zoned_model(q) != *zoned_model; + } + + static bool dm_table_supports_zoned_model(struct dm_table *t, +@@ -1475,37 +1475,20 @@ static bool dm_table_supports_zoned_mode + return false; + + if (!ti->type->iterate_devices || +- !ti->type->iterate_devices(ti, device_is_zoned_model, &zoned_model)) ++ ti->type->iterate_devices(ti, device_not_zoned_model, &zoned_model)) + return false; + } + + return true; + } + +-static int device_matches_zone_sectors(struct dm_target *ti, struct dm_dev *dev, +- sector_t start, sector_t len, void *data) ++static int device_not_matches_zone_sectors(struct dm_target *ti, struct dm_dev *dev, ++ sector_t start, sector_t len, void *data) + { + struct request_queue *q = bdev_get_queue(dev->bdev); + unsigned int *zone_sectors = data; + +- return q && blk_queue_zone_sectors(q) == *zone_sectors; +-} +- +-static bool dm_table_matches_zone_sectors(struct dm_table *t, +- unsigned int zone_sectors) +-{ +- struct dm_target *ti; +- unsigned i; +- +- for (i = 0; i < dm_table_get_num_targets(t); i++) { +- ti = dm_table_get_target(t, i); +- +- if (!ti->type->iterate_devices || +- !ti->type->iterate_devices(ti, device_matches_zone_sectors, &zone_sectors)) +- return false; +- } +- +- return true; ++ return !q || blk_queue_zone_sectors(q) != *zone_sectors; + } + + static int validate_hardware_zoned_model(struct dm_table *table, +@@ -1525,7 +1508,7 @@ static int validate_hardware_zoned_model + if (!zone_sectors || !is_power_of_2(zone_sectors)) + return -EINVAL; + +- if (!dm_table_matches_zone_sectors(table, zone_sectors)) { ++ if (dm_table_any_dev_attr(table, device_not_matches_zone_sectors, &zone_sectors)) { + DMERR("%s: zone sectors is not consistent across all devices", + dm_device_name(table->md)); + return -EINVAL; +@@ -1742,7 +1725,7 @@ static int device_is_partial_completion( + + static bool dm_table_does_not_support_partial_completion(struct dm_table *t) + { +- return !dm_table_any_dev_attr(t, device_is_partial_completion); ++ return !dm_table_any_dev_attr(t, device_is_partial_completion, NULL); + } + + static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev, +@@ -1909,11 +1892,11 @@ void dm_table_set_restrictions(struct dm + else + blk_queue_flag_clear(QUEUE_FLAG_DAX, q); + +- if (dm_table_any_dev_attr(t, device_dax_write_cache_enabled)) ++ if (dm_table_any_dev_attr(t, device_dax_write_cache_enabled, NULL)) + dax_write_cache(t->md->dax_dev, true); + + /* Ensure that all underlying devices are non-rotational. */ +- if (dm_table_any_dev_attr(t, device_is_rotational)) ++ if (dm_table_any_dev_attr(t, device_is_rotational, NULL)) + blk_queue_flag_clear(QUEUE_FLAG_NONROT, q); + else + blk_queue_flag_set(QUEUE_FLAG_NONROT, q); +@@ -1932,7 +1915,7 @@ void dm_table_set_restrictions(struct dm + * them as well. Only targets that support iterate_devices are considered: + * don't want error, zero, etc to require stable pages. + */ +- if (dm_table_any_dev_attr(t, device_requires_stable_pages)) ++ if (dm_table_any_dev_attr(t, device_requires_stable_pages, NULL)) + q->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES; + else + q->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES; +@@ -1943,7 +1926,8 @@ void dm_table_set_restrictions(struct dm + * Clear QUEUE_FLAG_ADD_RANDOM if any underlying device does not + * have it set. + */ +- if (blk_queue_add_random(q) && dm_table_any_dev_attr(t, device_is_not_random)) ++ if (blk_queue_add_random(q) && ++ dm_table_any_dev_attr(t, device_is_not_random, NULL)) + blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q); + + /* diff --git a/queue-5.4/series b/queue-5.4/series index 9467ef3e47f..f73b78b5f17 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,3 +1,4 @@ net-dsa-add-gro-support-via-gro_cells.patch dm-table-fix-iterate_devices-based-device-capability-checks.patch dm-table-fix-dax-iterate_devices-based-device-capability-checks.patch +dm-table-fix-zoned-iterate_devices-based-device-capability-checks.patch