| From foo@baz Wed Mar 10 01:10:44 PM CET 2021 |
| From: Jeffle Xu <jefflexu@linux.alibaba.com> |
| Date: Tue, 9 Mar 2021 11:27:45 +0800 |
| Subject: dm table: fix zoned iterate_devices based device capability checks |
| To: snitzer@redhat.com, gregkh@linuxfoundation.org, sashal@kernel.org |
| Cc: stable@vger.kernel.org, jefflexu@linux.alibaba.com |
| Message-ID: <20210309032745.106175-4-jefflexu@linux.alibaba.com> |
| |
| From: Jeffle Xu <jefflexu@linux.alibaba.com> |
| |
| 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 <jefflexu@linux.alibaba.com> |
| Signed-off-by: Mike Snitzer <snitzer@redhat.com> |
| [jeffle: also convert no_sg_merge check] |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| 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 |
| @@ -1372,10 +1372,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; |
| @@ -1384,7 +1384,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; |
| } |
| |
| @@ -1427,13 +1427,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, |
| @@ -1450,37 +1450,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, |
| @@ -1500,7 +1483,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; |
| @@ -1837,11 +1820,11 @@ void dm_table_set_restrictions(struct dm |
| else |
| queue_flag_clear_unlocked(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)) |
| queue_flag_clear_unlocked(QUEUE_FLAG_NONROT, q); |
| else |
| queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q); |
| @@ -1851,7 +1834,7 @@ void dm_table_set_restrictions(struct dm |
| if (!dm_table_supports_write_zeroes(t)) |
| q->limits.max_write_zeroes_sectors = 0; |
| |
| - if (dm_table_any_dev_attr(t, queue_no_sg_merge)) |
| + if (dm_table_any_dev_attr(t, queue_no_sg_merge, NULL)) |
| queue_flag_set_unlocked(QUEUE_FLAG_NO_SG_MERGE, q); |
| else |
| queue_flag_clear_unlocked(QUEUE_FLAG_NO_SG_MERGE, q); |
| @@ -1865,7 +1848,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; |
| @@ -1876,7 +1859,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)) |
| queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, q); |
| |
| /* |