* FAILED: patch "[PATCH] dm table: fix iterate_devices based device capability checks" failed to apply to 4.19-stable tree
@ 2021-03-01 13:44 gregkh
2021-03-05 6:55 ` [PATCH 4.19.y 0/5] dm: device capability check fixes Jeffle Xu
0 siblings, 1 reply; 11+ messages in thread
From: gregkh @ 2021-03-01 13:44 UTC (permalink / raw)
To: jefflexu, snitzer; +Cc: stable
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a4c8dd9c2d0987cf542a2a0c42684c9c6d78a04e Mon Sep 17 00:00:00 2001
From: Jeffle Xu <jefflexu@linux.alibaba.com>
Date: Tue, 2 Feb 2021 11:35:28 +0800
Subject: [PATCH] dm table: fix iterate_devices based device capability checks
According to the definition of dm_iterate_devices_fn:
* This function must iterate through each section of device used by the
* target until it encounters a non-zero return code, which it then returns.
* Returns zero if no callout returned non-zero.
For some target type (e.g. dm-stripe), one call of iterate_devices() may
iterate multiple underlying devices internally, in which case a non-zero
return code returned by iterate_devices_callout_fn will stop the iteration
in advance. No iterate_devices_callout_fn should return non-zero unless
device iteration should stop.
Rename dm_table_requires_stable_pages() to dm_table_any_dev_attr() and
elevate it for reuse to stop iterating (and return non-zero) on the
first device that causes iterate_devices_callout_fn to return non-zero.
Use dm_table_any_dev_attr() to properly iterate through devices.
Rename device_is_nonrot() to device_is_rotational() and invert logic
accordingly to fix improper disposition.
Fixes: c3c4555edd10 ("dm table: clear add_random unless all devices have it set")
Fixes: 4693c9668fdc ("dm table: propagate non rotational flag")
Cc: stable@vger.kernel.org
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 4acf2342f7ad..3e211e64f348 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1295,6 +1295,46 @@ struct dm_target *dm_table_find_target(struct dm_table *t, sector_t sector)
return &t->targets[(KEYS_PER_NODE * n) + k];
}
+/*
+ * type->iterate_devices() should be called when the sanity check needs to
+ * iterate and check all underlying data devices. iterate_devices() will
+ * iterate all underlying data devices until it encounters a non-zero return
+ * code, returned by whether the input iterate_devices_callout_fn, or
+ * iterate_devices() itself internally.
+ *
+ * For some target type (e.g. dm-stripe), one call of iterate_devices() may
+ * iterate multiple underlying devices internally, in which case a non-zero
+ * return code returned by iterate_devices_callout_fn will stop the iteration
+ * in advance.
+ *
+ * Cases requiring _any_ underlying device supporting some kind of attribute,
+ * should use the iteration structure like dm_table_any_dev_attr(), or call
+ * it directly. @func should handle semantics of positive examples, e.g.
+ * capable of something.
+ *
+ * Cases requiring _all_ underlying devices supporting some kind of attribute,
+ * 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);
+ */
+static bool dm_table_any_dev_attr(struct dm_table *t,
+ iterate_devices_callout_fn func)
+{
+ struct dm_target *ti;
+ unsigned int 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, func, NULL))
+ return true;
+ }
+
+ return false;
+}
+
static int count_device(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
{
@@ -1595,12 +1635,12 @@ static int dm_table_supports_dax_write_cache(struct dm_table *t)
return false;
}
-static int device_is_nonrot(struct dm_target *ti, struct dm_dev *dev,
- sector_t start, sector_t len, void *data)
+static int device_is_rotational(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);
- return q && blk_queue_nonrot(q);
+ return q && !blk_queue_nonrot(q);
}
static int device_is_not_random(struct dm_target *ti, struct dm_dev *dev,
@@ -1611,23 +1651,6 @@ static int device_is_not_random(struct dm_target *ti, struct dm_dev *dev,
return q && !blk_queue_add_random(q);
}
-static bool dm_table_all_devices_attribute(struct dm_table *t,
- iterate_devices_callout_fn func)
-{
- 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, func, NULL))
- return false;
- }
-
- return true;
-}
-
static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
{
@@ -1779,27 +1802,6 @@ static int device_requires_stable_pages(struct dm_target *ti,
return q && blk_queue_stable_writes(q);
}
-/*
- * If any underlying device requires stable pages, a table must require
- * them as well. Only targets that support iterate_devices are considered:
- * don't want error, zero, etc to require stable pages.
- */
-static bool dm_table_requires_stable_pages(struct dm_table *t)
-{
- 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_requires_stable_pages, NULL))
- return true;
- }
-
- return false;
-}
-
void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
struct queue_limits *limits)
{
@@ -1849,10 +1851,10 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
dax_write_cache(t->md->dax_dev, true);
/* Ensure that all underlying devices are non-rotational. */
- if (dm_table_all_devices_attribute(t, device_is_nonrot))
- blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
- else
+ if (dm_table_any_dev_attr(t, device_is_rotational))
blk_queue_flag_clear(QUEUE_FLAG_NONROT, q);
+ else
+ blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
if (!dm_table_supports_write_same(t))
q->limits.max_write_same_sectors = 0;
@@ -1864,8 +1866,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
/*
* Some devices don't use blk_integrity but still want stable pages
* because they do their own checksumming.
+ * If any underlying device requires stable pages, a table must require
+ * them as well. Only targets that support iterate_devices are considered:
+ * don't want error, zero, etc to require stable pages.
*/
- if (dm_table_requires_stable_pages(t))
+ if (dm_table_any_dev_attr(t, device_requires_stable_pages))
blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, q);
else
blk_queue_flag_clear(QUEUE_FLAG_STABLE_WRITES, q);
@@ -1876,7 +1881,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
* Clear QUEUE_FLAG_ADD_RANDOM if any underlying device does not
* have it set.
*/
- if (blk_queue_add_random(q) && dm_table_all_devices_attribute(t, device_is_not_random))
+ if (blk_queue_add_random(q) && dm_table_any_dev_attr(t, device_is_not_random))
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);
/*
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4.19.y 0/5] dm: device capability check fixes
2021-03-01 13:44 FAILED: patch "[PATCH] dm table: fix iterate_devices based device capability checks" failed to apply to 4.19-stable tree gregkh
@ 2021-03-05 6:55 ` Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 1/5] dm table: fix iterate_devices based device capability checks Jeffle Xu
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Jeffle Xu @ 2021-03-05 6:55 UTC (permalink / raw)
To: gregkh, sashal; +Cc: stable, jefflexu, snitzer
- patch 1/4/5 is from upstream
- patch 2/3 is to fix the code specific to 4.4 (has been removed in upstream)
Jeffle Xu (5):
dm table: fix iterate_devices based device capability checks
dm table: fix no_sg_merge iterate_devices based device capability
checks
dm table: fix partial completion iterate_devices based device
capability checks
dm table: fix DAX iterate_devices based device capability checks
dm table: fix zoned iterate_devices based device capability checks
drivers/md/dm-table.c | 174 ++++++++++++++++++------------------------
1 file changed, 73 insertions(+), 101 deletions(-)
--
2.27.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 4.19.y 1/5] dm table: fix iterate_devices based device capability checks
2021-03-05 6:55 ` [PATCH 4.19.y 0/5] dm: device capability check fixes Jeffle Xu
@ 2021-03-05 6:55 ` Jeffle Xu
2021-03-07 15:10 ` Greg KH
2021-03-05 6:55 ` [PATCH 4.19.y 2/5] dm table: fix no_sg_merge " Jeffle Xu
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Jeffle Xu @ 2021-03-05 6:55 UTC (permalink / raw)
To: gregkh, sashal; +Cc: stable, jefflexu, snitzer
commit a4c8dd9c2d0987cf542a2a0c42684c9c6d78a04e upstream.
According to the definition of dm_iterate_devices_fn:
* This function must iterate through each section of device used by the
* target until it encounters a non-zero return code, which it then returns.
* Returns zero if no callout returned non-zero.
For some target type (e.g. dm-stripe), one call of iterate_devices() may
iterate multiple underlying devices internally, in which case a non-zero
return code returned by iterate_devices_callout_fn will stop the iteration
in advance. No iterate_devices_callout_fn should return non-zero unless
device iteration should stop.
Rename dm_table_requires_stable_pages() to dm_table_any_dev_attr() and
elevate it for reuse to stop iterating (and return non-zero) on the
first device that causes iterate_devices_callout_fn to return non-zero.
Use dm_table_any_dev_attr() to properly iterate through devices.
Rename device_is_nonrot() to device_is_rotational() and invert logic
accordingly to fix improper disposition.
Fixes: c3c4555edd10 ("dm table: clear add_random unless all devices have it set")
Fixes: 4693c9668fdc ("dm table: propagate non rotational flag")
Cc: stable@vger.kernel.org
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
---
drivers/md/dm-table.c | 97 +++++++++++++++++++++++--------------------
1 file changed, 51 insertions(+), 46 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 916433742485..686cc7c20113 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1392,6 +1392,46 @@ struct dm_target *dm_table_find_target(struct dm_table *t, sector_t sector)
return &t->targets[(KEYS_PER_NODE * n) + k];
}
+/*
+ * type->iterate_devices() should be called when the sanity check needs to
+ * iterate and check all underlying data devices. iterate_devices() will
+ * iterate all underlying data devices until it encounters a non-zero return
+ * code, returned by whether the input iterate_devices_callout_fn, or
+ * iterate_devices() itself internally.
+ *
+ * For some target type (e.g. dm-stripe), one call of iterate_devices() may
+ * iterate multiple underlying devices internally, in which case a non-zero
+ * return code returned by iterate_devices_callout_fn will stop the iteration
+ * in advance.
+ *
+ * Cases requiring _any_ underlying device supporting some kind of attribute,
+ * should use the iteration structure like dm_table_any_dev_attr(), or call
+ * it directly. @func should handle semantics of positive examples, e.g.
+ * capable of something.
+ *
+ * Cases requiring _all_ underlying devices supporting some kind of attribute,
+ * 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);
+ */
+static bool dm_table_any_dev_attr(struct dm_table *t,
+ iterate_devices_callout_fn func)
+{
+ struct dm_target *ti;
+ unsigned int 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, func, NULL))
+ return true;
+ }
+
+ return false;
+}
+
static int count_device(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
{
@@ -1708,12 +1748,12 @@ static int dm_table_supports_dax_write_cache(struct dm_table *t)
return false;
}
-static int device_is_nonrot(struct dm_target *ti, struct dm_dev *dev,
- sector_t start, sector_t len, void *data)
+static int device_is_rotational(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);
- return q && blk_queue_nonrot(q);
+ return q && !blk_queue_nonrot(q);
}
static int device_is_not_random(struct dm_target *ti, struct dm_dev *dev,
@@ -1732,23 +1772,6 @@ static int queue_supports_sg_merge(struct dm_target *ti, struct dm_dev *dev,
return q && !test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
}
-static bool dm_table_all_devices_attribute(struct dm_table *t,
- iterate_devices_callout_fn func)
-{
- 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, func, NULL))
- return false;
- }
-
- return true;
-}
-
static int device_no_partial_completion(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
{
@@ -1887,27 +1910,6 @@ static int device_requires_stable_pages(struct dm_target *ti,
return q && bdi_cap_stable_pages_required(q->backing_dev_info);
}
-/*
- * If any underlying device requires stable pages, a table must require
- * them as well. Only targets that support iterate_devices are considered:
- * don't want error, zero, etc to require stable pages.
- */
-static bool dm_table_requires_stable_pages(struct dm_table *t)
-{
- 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_requires_stable_pages, NULL))
- return true;
- }
-
- return false;
-}
-
void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
struct queue_limits *limits)
{
@@ -1948,10 +1950,10 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
dax_write_cache(t->md->dax_dev, true);
/* Ensure that all underlying devices are non-rotational. */
- if (dm_table_all_devices_attribute(t, device_is_nonrot))
- blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
- else
+ if (dm_table_any_dev_attr(t, device_is_rotational))
blk_queue_flag_clear(QUEUE_FLAG_NONROT, q);
+ else
+ blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
if (!dm_table_supports_write_same(t))
q->limits.max_write_same_sectors = 0;
@@ -1968,8 +1970,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
/*
* Some devices don't use blk_integrity but still want stable pages
* because they do their own checksumming.
+ * If any underlying device requires stable pages, a table must require
+ * them as well. Only targets that support iterate_devices are considered:
+ * don't want error, zero, etc to require stable pages.
*/
- if (dm_table_requires_stable_pages(t))
+ if (dm_table_any_dev_attr(t, device_requires_stable_pages))
q->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES;
else
q->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES;
@@ -1980,7 +1985,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
* Clear QUEUE_FLAG_ADD_RANDOM if any underlying device does not
* have it set.
*/
- if (blk_queue_add_random(q) && dm_table_all_devices_attribute(t, device_is_not_random))
+ if (blk_queue_add_random(q) && dm_table_any_dev_attr(t, device_is_not_random))
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);
}
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4.19.y 2/5] dm table: fix no_sg_merge iterate_devices based device capability checks
2021-03-05 6:55 ` [PATCH 4.19.y 0/5] dm: device capability check fixes Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 1/5] dm table: fix iterate_devices based device capability checks Jeffle Xu
@ 2021-03-05 6:55 ` Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 3/5] dm table: fix partial completion " Jeffle Xu
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Jeffle Xu @ 2021-03-05 6:55 UTC (permalink / raw)
To: gregkh, sashal; +Cc: stable, jefflexu, snitzer
Similar to commit a4c8dd9c2d09 ("dm table: fix iterate_devices based
device capability checks"), fix NO_SG_MERGE capability check and invert
logic of the corresponding iterate_devices_callout_fn so that all
devices' NO_SG_MERGE capabilities are properly checked.
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Fixes: 200612ec33e5 ("dm table: propagate QUEUE_FLAG_NO_SG_MERGE")
---
drivers/md/dm-table.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 686cc7c20113..5a94e6dc0b70 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1764,12 +1764,12 @@ static int device_is_not_random(struct dm_target *ti, struct dm_dev *dev,
return q && !blk_queue_add_random(q);
}
-static int queue_supports_sg_merge(struct dm_target *ti, struct dm_dev *dev,
- sector_t start, sector_t len, void *data)
+static int queue_no_sg_merge(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);
- return q && !test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
+ return q && test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
}
static int device_no_partial_completion(struct dm_target *ti, struct dm_dev *dev,
@@ -1960,10 +1960,10 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
if (!dm_table_supports_write_zeroes(t))
q->limits.max_write_zeroes_sectors = 0;
- if (dm_table_all_devices_attribute(t, queue_supports_sg_merge))
- blk_queue_flag_clear(QUEUE_FLAG_NO_SG_MERGE, q);
- else
+ if (dm_table_any_dev_attr(t, queue_no_sg_merge))
blk_queue_flag_set(QUEUE_FLAG_NO_SG_MERGE, q);
+ else
+ blk_queue_flag_clear(QUEUE_FLAG_NO_SG_MERGE, q);
dm_table_verify_integrity(t);
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4.19.y 3/5] dm table: fix partial completion iterate_devices based device capability checks
2021-03-05 6:55 ` [PATCH 4.19.y 0/5] dm: device capability check fixes Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 1/5] dm table: fix iterate_devices based device capability checks Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 2/5] dm table: fix no_sg_merge " Jeffle Xu
@ 2021-03-05 6:55 ` Jeffle Xu
2021-03-05 7:04 ` JeffleXu
2021-03-08 3:25 ` JeffleXu
2021-03-05 6:55 ` [PATCH 4.19.y 4/5] dm table: fix DAX " Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 5/5] dm table: fix zoned " Jeffle Xu
4 siblings, 2 replies; 11+ messages in thread
From: Jeffle Xu @ 2021-03-05 6:55 UTC (permalink / raw)
To: gregkh, sashal; +Cc: stable, jefflexu, snitzer
Similar to commit a4c8dd9c2d09 ("dm table: fix iterate_devices based
device capability checks"), fix partial completion capability check and
invert logic of the corresponding iterate_devices_callout_fn so that all
devices' partial completion capabilities are properly checked.
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Fixes: 22c11858e800 ("dm: introduce DM_TYPE_NVME_BIO_BASED")
---
drivers/md/dm-table.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 5a94e6dc0b70..1f745d371957 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1772,18 +1772,18 @@ static int queue_no_sg_merge(struct dm_target *ti, struct dm_dev *dev,
return q && test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
}
-static int device_no_partial_completion(struct dm_target *ti, struct dm_dev *dev,
+static int device_is_partial_completion(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
{
char b[BDEVNAME_SIZE];
/* For now, NVMe devices are the only devices of this class */
- return (strncmp(bdevname(dev->bdev, b), "nvme", 4) == 0);
+ return (strncmp(bdevname(dev->bdev, b), "nvme", 4) != 0);
}
static bool dm_table_does_not_support_partial_completion(struct dm_table *t)
{
- return dm_table_all_devices_attribute(t, device_no_partial_completion);
+ return !dm_table_any_dev_attr(t, device_is_partial_completion);
}
static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev,
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4.19.y 4/5] dm table: fix DAX iterate_devices based device capability checks
2021-03-05 6:55 ` [PATCH 4.19.y 0/5] dm: device capability check fixes Jeffle Xu
` (2 preceding siblings ...)
2021-03-05 6:55 ` [PATCH 4.19.y 3/5] dm table: fix partial completion " Jeffle Xu
@ 2021-03-05 6:55 ` Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 5/5] dm table: fix zoned " Jeffle Xu
4 siblings, 0 replies; 11+ messages in thread
From: Jeffle Xu @ 2021-03-05 6:55 UTC (permalink / raw)
To: gregkh, sashal; +Cc: stable, jefflexu, snitzer
commit 57ba3e506c30a84b1ba1dd77ddd9f2be9d472e98 upstream.
Fix dm_table_supports_dax() and invert logic of both
iterate_devices_callout_fn so that all devices' DAX capabilities are
properly checked.
Fixes: 545ed20e6df6 ("dm: add infrastructure for DAX support")
Cc: stable@vger.kernel.org
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
[jeffle: no dax synchronous]
---
drivers/md/dm-table.c | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 1f745d371957..ca0b936300ca 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -891,10 +891,10 @@ void dm_table_set_type(struct dm_table *t, enum dm_queue_mode type)
}
EXPORT_SYMBOL_GPL(dm_table_set_type);
-static int device_supports_dax(struct dm_target *ti, struct dm_dev *dev,
+static int device_not_dax_capable(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
{
- return bdev_dax_supported(dev->bdev, PAGE_SIZE);
+ return !bdev_dax_supported(dev->bdev, PAGE_SIZE);
}
static bool dm_table_supports_dax(struct dm_table *t)
@@ -910,7 +910,7 @@ static bool dm_table_supports_dax(struct dm_table *t)
return false;
if (!ti->type->iterate_devices ||
- !ti->type->iterate_devices(ti, device_supports_dax, NULL))
+ ti->type->iterate_devices(ti, device_not_dax_capable, NULL))
return false;
}
@@ -1731,23 +1731,6 @@ static int device_dax_write_cache_enabled(struct dm_target *ti,
return false;
}
-static int dm_table_supports_dax_write_cache(struct dm_table *t)
-{
- 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_dax_write_cache_enabled, NULL))
- return true;
- }
-
- return false;
-}
-
static int device_is_rotational(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data)
{
@@ -1946,7 +1929,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
else
blk_queue_flag_clear(QUEUE_FLAG_DAX, q);
- if (dm_table_supports_dax_write_cache(t))
+ if (dm_table_any_dev_attr(t, device_dax_write_cache_enabled))
dax_write_cache(t->md->dax_dev, true);
/* Ensure that all underlying devices are non-rotational. */
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4.19.y 5/5] dm table: fix zoned iterate_devices based device capability checks
2021-03-05 6:55 ` [PATCH 4.19.y 0/5] dm: device capability check fixes Jeffle Xu
` (3 preceding siblings ...)
2021-03-05 6:55 ` [PATCH 4.19.y 4/5] dm table: fix DAX " Jeffle Xu
@ 2021-03-05 6:55 ` Jeffle Xu
4 siblings, 0 replies; 11+ messages in thread
From: Jeffle Xu @ 2021-03-05 6:55 UTC (permalink / raw)
To: gregkh, sashal; +Cc: stable, jefflexu, snitzer
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 and partial completion check]
---
drivers/md/dm-table.c | 52 +++++++++++++++----------------------------
1 file changed, 18 insertions(+), 34 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index ca0b936300ca..71d3fdbce50a 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1413,10 +1413,10 @@ struct dm_target *dm_table_find_target(struct dm_table *t, sector_t sector)
* 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;
@@ -1425,7 +1425,7 @@ static bool dm_table_any_dev_attr(struct dm_table *t,
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;
}
@@ -1468,13 +1468,13 @@ bool dm_table_has_no_data_devices(struct dm_table *table)
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,
@@ -1491,37 +1491,20 @@ static bool dm_table_supports_zoned_model(struct dm_table *t,
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,
@@ -1541,7 +1524,7 @@ static int validate_hardware_zoned_model(struct dm_table *table,
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;
@@ -1766,7 +1749,7 @@ static int device_is_partial_completion(struct dm_target *ti, struct dm_dev *dev
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,
@@ -1929,11 +1912,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
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);
@@ -1943,7 +1926,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
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))
blk_queue_flag_set(QUEUE_FLAG_NO_SG_MERGE, q);
else
blk_queue_flag_clear(QUEUE_FLAG_NO_SG_MERGE, q);
@@ -1957,7 +1940,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
* 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;
@@ -1968,7 +1951,8 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
* 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);
}
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 4.19.y 3/5] dm table: fix partial completion iterate_devices based device capability checks
2021-03-05 6:55 ` [PATCH 4.19.y 3/5] dm table: fix partial completion " Jeffle Xu
@ 2021-03-05 7:04 ` JeffleXu
2021-03-08 3:25 ` JeffleXu
1 sibling, 0 replies; 11+ messages in thread
From: JeffleXu @ 2021-03-05 7:04 UTC (permalink / raw)
To: gregkh, sashal; +Cc: stable, snitzer
On 3/5/21 2:55 PM, Jeffle Xu wrote:
> Similar to commit a4c8dd9c2d09 ("dm table: fix iterate_devices based
> device capability checks"), fix partial completion capability check and
> invert logic of the corresponding iterate_devices_callout_fn so that all
> devices' partial completion capabilities are properly checked.
>
> Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
> Fixes: 22c11858e800 ("dm: introduce DM_TYPE_NVME_BIO_BASED")
Similarly, the code this patch fixes, i.e., commit 22c11858e800 ("dm:
introduce DM_TYPE_NVME_BIO_BASED"), was removed since commit
9c37de297f65 ("dm: remove special-casing of bio-based immutable
singleton target on NVMe") in v5.10. Thus the code base doesn't exist in
the latest master branch.
It needs Mike's review.
--
Thanks,
Jeffle
> ---
> drivers/md/dm-table.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
> index 5a94e6dc0b70..1f745d371957 100644
> --- a/drivers/md/dm-table.c
> +++ b/drivers/md/dm-table.c
> @@ -1772,18 +1772,18 @@ static int queue_no_sg_merge(struct dm_target *ti, struct dm_dev *dev,
> return q && test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
> }
>
> -static int device_no_partial_completion(struct dm_target *ti, struct dm_dev *dev,
> +static int device_is_partial_completion(struct dm_target *ti, struct dm_dev *dev,
> sector_t start, sector_t len, void *data)
> {
> char b[BDEVNAME_SIZE];
>
> /* For now, NVMe devices are the only devices of this class */
> - return (strncmp(bdevname(dev->bdev, b), "nvme", 4) == 0);
> + return (strncmp(bdevname(dev->bdev, b), "nvme", 4) != 0);
> }
>
> static bool dm_table_does_not_support_partial_completion(struct dm_table *t)
> {
> - return dm_table_all_devices_attribute(t, device_no_partial_completion);
> + return !dm_table_any_dev_attr(t, device_is_partial_completion);
> }
>
> static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev,
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4.19.y 1/5] dm table: fix iterate_devices based device capability checks
2021-03-05 6:55 ` [PATCH 4.19.y 1/5] dm table: fix iterate_devices based device capability checks Jeffle Xu
@ 2021-03-07 15:10 ` Greg KH
0 siblings, 0 replies; 11+ messages in thread
From: Greg KH @ 2021-03-07 15:10 UTC (permalink / raw)
To: Jeffle Xu; +Cc: sashal, stable, snitzer
On Fri, Mar 05, 2021 at 02:55:22PM +0800, Jeffle Xu wrote:
> commit a4c8dd9c2d0987cf542a2a0c42684c9c6d78a04e upstream.
>
> According to the definition of dm_iterate_devices_fn:
> * This function must iterate through each section of device used by the
> * target until it encounters a non-zero return code, which it then returns.
> * Returns zero if no callout returned non-zero.
>
> For some target type (e.g. dm-stripe), one call of iterate_devices() may
> iterate multiple underlying devices internally, in which case a non-zero
> return code returned by iterate_devices_callout_fn will stop the iteration
> in advance. No iterate_devices_callout_fn should return non-zero unless
> device iteration should stop.
>
> Rename dm_table_requires_stable_pages() to dm_table_any_dev_attr() and
> elevate it for reuse to stop iterating (and return non-zero) on the
> first device that causes iterate_devices_callout_fn to return non-zero.
> Use dm_table_any_dev_attr() to properly iterate through devices.
>
> Rename device_is_nonrot() to device_is_rotational() and invert logic
> accordingly to fix improper disposition.
>
> Fixes: c3c4555edd10 ("dm table: clear add_random unless all devices have it set")
> Fixes: 4693c9668fdc ("dm table: propagate non rotational flag")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
> ---
> drivers/md/dm-table.c | 97 +++++++++++++++++++++++--------------------
> 1 file changed, 51 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
> index 916433742485..686cc7c20113 100644
> --- a/drivers/md/dm-table.c
> +++ b/drivers/md/dm-table.c
> @@ -1392,6 +1392,46 @@ struct dm_target *dm_table_find_target(struct dm_table *t, sector_t sector)
> return &t->targets[(KEYS_PER_NODE * n) + k];
> }
>
> +/*
> + * type->iterate_devices() should be called when the sanity check needs to
> + * iterate and check all underlying data devices. iterate_devices() will
> + * iterate all underlying data devices until it encounters a non-zero return
> + * code, returned by whether the input iterate_devices_callout_fn, or
> + * iterate_devices() itself internally.
> + *
> + * For some target type (e.g. dm-stripe), one call of iterate_devices() may
> + * iterate multiple underlying devices internally, in which case a non-zero
> + * return code returned by iterate_devices_callout_fn will stop the iteration
> + * in advance.
> + *
> + * Cases requiring _any_ underlying device supporting some kind of attribute,
> + * should use the iteration structure like dm_table_any_dev_attr(), or call
> + * it directly. @func should handle semantics of positive examples, e.g.
> + * capable of something.
> + *
> + * Cases requiring _all_ underlying devices supporting some kind of attribute,
> + * 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);
> + */
> +static bool dm_table_any_dev_attr(struct dm_table *t,
> + iterate_devices_callout_fn func)
> +{
> + struct dm_target *ti;
> + unsigned int 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, func, NULL))
> + return true;
> + }
> +
> + return false;
> +}
> +
> static int count_device(struct dm_target *ti, struct dm_dev *dev,
> sector_t start, sector_t len, void *data)
> {
> @@ -1708,12 +1748,12 @@ static int dm_table_supports_dax_write_cache(struct dm_table *t)
> return false;
> }
>
> -static int device_is_nonrot(struct dm_target *ti, struct dm_dev *dev,
> - sector_t start, sector_t len, void *data)
> +static int device_is_rotational(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);
>
> - return q && blk_queue_nonrot(q);
> + return q && !blk_queue_nonrot(q);
> }
>
> static int device_is_not_random(struct dm_target *ti, struct dm_dev *dev,
> @@ -1732,23 +1772,6 @@ static int queue_supports_sg_merge(struct dm_target *ti, struct dm_dev *dev,
> return q && !test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
> }
>
> -static bool dm_table_all_devices_attribute(struct dm_table *t,
> - iterate_devices_callout_fn func)
> -{
> - 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, func, NULL))
> - return false;
> - }
> -
> - return true;
> -}
> -
> static int device_no_partial_completion(struct dm_target *ti, struct dm_dev *dev,
> sector_t start, sector_t len, void *data)
> {
> @@ -1887,27 +1910,6 @@ static int device_requires_stable_pages(struct dm_target *ti,
> return q && bdi_cap_stable_pages_required(q->backing_dev_info);
> }
>
> -/*
> - * If any underlying device requires stable pages, a table must require
> - * them as well. Only targets that support iterate_devices are considered:
> - * don't want error, zero, etc to require stable pages.
> - */
> -static bool dm_table_requires_stable_pages(struct dm_table *t)
> -{
> - 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_requires_stable_pages, NULL))
> - return true;
> - }
> -
> - return false;
> -}
> -
> void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
> struct queue_limits *limits)
> {
> @@ -1948,10 +1950,10 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
> dax_write_cache(t->md->dax_dev, true);
>
> /* Ensure that all underlying devices are non-rotational. */
> - if (dm_table_all_devices_attribute(t, device_is_nonrot))
> - blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
> - else
> + if (dm_table_any_dev_attr(t, device_is_rotational))
> blk_queue_flag_clear(QUEUE_FLAG_NONROT, q);
> + else
> + blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
>
> if (!dm_table_supports_write_same(t))
> q->limits.max_write_same_sectors = 0;
> @@ -1968,8 +1970,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
> /*
> * Some devices don't use blk_integrity but still want stable pages
> * because they do their own checksumming.
> + * If any underlying device requires stable pages, a table must require
> + * them as well. Only targets that support iterate_devices are considered:
> + * don't want error, zero, etc to require stable pages.
> */
> - if (dm_table_requires_stable_pages(t))
> + if (dm_table_any_dev_attr(t, device_requires_stable_pages))
> q->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES;
> else
> q->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES;
> @@ -1980,7 +1985,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
> * Clear QUEUE_FLAG_ADD_RANDOM if any underlying device does not
> * have it set.
> */
> - if (blk_queue_add_random(q) && dm_table_all_devices_attribute(t, device_is_not_random))
> + if (blk_queue_add_random(q) && dm_table_any_dev_attr(t, device_is_not_random))
> blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);
> }
>
> --
> 2.27.0
>
Breaks the build :(
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4.19.y 3/5] dm table: fix partial completion iterate_devices based device capability checks
2021-03-05 6:55 ` [PATCH 4.19.y 3/5] dm table: fix partial completion " Jeffle Xu
2021-03-05 7:04 ` JeffleXu
@ 2021-03-08 3:25 ` JeffleXu
2021-03-08 14:52 ` JeffleXu
1 sibling, 1 reply; 11+ messages in thread
From: JeffleXu @ 2021-03-08 3:25 UTC (permalink / raw)
To: Mike Snitzer; +Cc: stable, Greg KH, sashal
Hi, Mike,
Would you please spare some time to review the following patches for
stable tree?
- [1] for 4.19.y
- [2] for 5.4.y
While backporting [3] for stable tree, there's some extra code specific
to stable tree needs to be fixed, see [4] for the background info.
[1] https://www.spinics.net/lists/stable/msg448749.html
[2] https://www.spinics.net/lists/stable/msg448754.html
[3]
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.12-rc2&id=a4c8dd9c2d0987cf542a2a0c42684c9c6d78a04e
[4] https://www.spinics.net/lists/stable/msg448760.html
Thanks,
Jeffle
On 3/5/21 2:55 PM, Jeffle Xu wrote:
> Similar to commit a4c8dd9c2d09 ("dm table: fix iterate_devices based
> device capability checks"), fix partial completion capability check and
> invert logic of the corresponding iterate_devices_callout_fn so that all
> devices' partial completion capabilities are properly checked.
>
> Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
> Fixes: 22c11858e800 ("dm: introduce DM_TYPE_NVME_BIO_BASED")
> ---
> drivers/md/dm-table.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
> index 5a94e6dc0b70..1f745d371957 100644
> --- a/drivers/md/dm-table.c
> +++ b/drivers/md/dm-table.c
> @@ -1772,18 +1772,18 @@ static int queue_no_sg_merge(struct dm_target *ti, struct dm_dev *dev,
> return q && test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
> }
>
> -static int device_no_partial_completion(struct dm_target *ti, struct dm_dev *dev,
> +static int device_is_partial_completion(struct dm_target *ti, struct dm_dev *dev,
> sector_t start, sector_t len, void *data)
> {
> char b[BDEVNAME_SIZE];
>
> /* For now, NVMe devices are the only devices of this class */
> - return (strncmp(bdevname(dev->bdev, b), "nvme", 4) == 0);
> + return (strncmp(bdevname(dev->bdev, b), "nvme", 4) != 0);
> }
>
> static bool dm_table_does_not_support_partial_completion(struct dm_table *t)
> {
> - return dm_table_all_devices_attribute(t, device_no_partial_completion);
> + return !dm_table_any_dev_attr(t, device_is_partial_completion);
> }
>
> static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev,
>
--
Thanks,
Jeffle
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4.19.y 3/5] dm table: fix partial completion iterate_devices based device capability checks
2021-03-08 3:25 ` JeffleXu
@ 2021-03-08 14:52 ` JeffleXu
0 siblings, 0 replies; 11+ messages in thread
From: JeffleXu @ 2021-03-08 14:52 UTC (permalink / raw)
To: Mike Snitzer; +Cc: stable, Greg KH, sashal
On 3/8/21 11:25 AM, JeffleXu wrote:
> Hi, Mike,
>
> Would you please spare some time to review the following patches for
> stable tree?
>
> - [1] for 4.19.y
> - [2] for 5.4.y
>
> While backporting [3] for stable tree, there's some extra code specific
> to stable tree needs to be fixed, see [4] for the background info.
>
> [1] https://www.spinics.net/lists/stable/msg448749.html
> [2] https://www.spinics.net/lists/stable/msg448754.html
> [3]
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v5.12-rc2&id=a4c8dd9c2d0987cf542a2a0c42684c9c6d78a04e
> [4] https://www.spinics.net/lists/stable/msg448760.html
>
>
Also hold on until I send a new version. Sorry for the noise.
Thanks,
Jeffle
>
>
> On 3/5/21 2:55 PM, Jeffle Xu wrote:
>> Similar to commit a4c8dd9c2d09 ("dm table: fix iterate_devices based
>> device capability checks"), fix partial completion capability check and
>> invert logic of the corresponding iterate_devices_callout_fn so that all
>> devices' partial completion capabilities are properly checked.
>>
>> Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
>> Fixes: 22c11858e800 ("dm: introduce DM_TYPE_NVME_BIO_BASED")
>> ---
>> drivers/md/dm-table.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
>> index 5a94e6dc0b70..1f745d371957 100644
>> --- a/drivers/md/dm-table.c
>> +++ b/drivers/md/dm-table.c
>> @@ -1772,18 +1772,18 @@ static int queue_no_sg_merge(struct dm_target *ti, struct dm_dev *dev,
>> return q && test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
>> }
>>
>> -static int device_no_partial_completion(struct dm_target *ti, struct dm_dev *dev,
>> +static int device_is_partial_completion(struct dm_target *ti, struct dm_dev *dev,
>> sector_t start, sector_t len, void *data)
>> {
>> char b[BDEVNAME_SIZE];
>>
>> /* For now, NVMe devices are the only devices of this class */
>> - return (strncmp(bdevname(dev->bdev, b), "nvme", 4) == 0);
>> + return (strncmp(bdevname(dev->bdev, b), "nvme", 4) != 0);
>> }
>>
>> static bool dm_table_does_not_support_partial_completion(struct dm_table *t)
>> {
>> - return dm_table_all_devices_attribute(t, device_no_partial_completion);
>> + return !dm_table_any_dev_attr(t, device_is_partial_completion);
>> }
>>
>> static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev,
>>
>
--
Thanks,
Jeffle
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-03-08 14:53 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-01 13:44 FAILED: patch "[PATCH] dm table: fix iterate_devices based device capability checks" failed to apply to 4.19-stable tree gregkh
2021-03-05 6:55 ` [PATCH 4.19.y 0/5] dm: device capability check fixes Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 1/5] dm table: fix iterate_devices based device capability checks Jeffle Xu
2021-03-07 15:10 ` Greg KH
2021-03-05 6:55 ` [PATCH 4.19.y 2/5] dm table: fix no_sg_merge " Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 3/5] dm table: fix partial completion " Jeffle Xu
2021-03-05 7:04 ` JeffleXu
2021-03-08 3:25 ` JeffleXu
2021-03-08 14:52 ` JeffleXu
2021-03-05 6:55 ` [PATCH 4.19.y 4/5] dm table: fix DAX " Jeffle Xu
2021-03-05 6:55 ` [PATCH 4.19.y 5/5] dm table: fix zoned " Jeffle Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.