* [PATCH] [v2] dm raid: fix mddev unlocking in raid_ctr() error paths
@ 2021-09-06 4:16 ` Dinghao Liu
0 siblings, 0 replies; 3+ messages in thread
From: Dinghao Liu @ 2021-09-06 4:16 UTC (permalink / raw
To: dinghao.liu, kjlu
Cc: Heinz Mauelshagen, Alasdair Kergon, Mike Snitzer, dm-devel,
linux-kernel
mddev_unlock() is called on all paths after we call mddev_lock_nointr(),
except for three error handling paths, which may cause a deadlock.
Fixes: 9dbd1aa3a81c ("dm raid: add reshaping support to the target")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
---
Changelog:
v2: - Simplify the error handling paths.
---
drivers/md/dm-raid.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index d9ef52159a22..741bab00e922 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3249,14 +3249,12 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
rs->md.in_sync = 0; /* Assume already marked dirty */
if (r) {
ti->error = "Failed to run raid array";
- mddev_unlock(&rs->md);
- goto bad;
+ goto bad_unlock;
}
r = md_start(&rs->md);
if (r) {
ti->error = "Failed to start raid array";
- mddev_unlock(&rs->md);
goto bad_md_start;
}
@@ -3265,7 +3263,6 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
r = r5c_journal_mode_set(&rs->md, rs->journal_dev.mode);
if (r) {
ti->error = "Failed to set raid4/5/6 journal mode";
- mddev_unlock(&rs->md);
goto bad_journal_mode_set;
}
}
@@ -3304,10 +3301,12 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
mddev_unlock(&rs->md);
return 0;
+bad_unlock:
bad_md_start:
bad_journal_mode_set:
bad_stripe_cache:
bad_check_reshape:
+ mddev_unlock(&rs->md);
md_stop(&rs->md);
bad:
raid_set_free(rs);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [dm-devel] [PATCH] [v2] dm raid: fix mddev unlocking in raid_ctr() error paths
@ 2021-09-06 4:16 ` Dinghao Liu
0 siblings, 0 replies; 3+ messages in thread
From: Dinghao Liu @ 2021-09-06 4:16 UTC (permalink / raw
To: dinghao.liu, kjlu
Cc: Heinz Mauelshagen, dm-devel, Mike Snitzer, Alasdair Kergon,
linux-kernel
mddev_unlock() is called on all paths after we call mddev_lock_nointr(),
except for three error handling paths, which may cause a deadlock.
Fixes: 9dbd1aa3a81c ("dm raid: add reshaping support to the target")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
---
Changelog:
v2: - Simplify the error handling paths.
---
drivers/md/dm-raid.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index d9ef52159a22..741bab00e922 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3249,14 +3249,12 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
rs->md.in_sync = 0; /* Assume already marked dirty */
if (r) {
ti->error = "Failed to run raid array";
- mddev_unlock(&rs->md);
- goto bad;
+ goto bad_unlock;
}
r = md_start(&rs->md);
if (r) {
ti->error = "Failed to start raid array";
- mddev_unlock(&rs->md);
goto bad_md_start;
}
@@ -3265,7 +3263,6 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
r = r5c_journal_mode_set(&rs->md, rs->journal_dev.mode);
if (r) {
ti->error = "Failed to set raid4/5/6 journal mode";
- mddev_unlock(&rs->md);
goto bad_journal_mode_set;
}
}
@@ -3304,10 +3301,12 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
mddev_unlock(&rs->md);
return 0;
+bad_unlock:
bad_md_start:
bad_journal_mode_set:
bad_stripe_cache:
bad_check_reshape:
+ mddev_unlock(&rs->md);
md_stop(&rs->md);
bad:
raid_set_free(rs);
--
2.17.1
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [dm-devel] [PATCH] [v2] dm raid: fix mddev unlocking in raid_ctr() error paths
2021-09-06 4:16 ` [dm-devel] " Dinghao Liu
(?)
@ 2021-09-06 12:43 ` Heinz Mauelshagen
-1 siblings, 0 replies; 3+ messages in thread
From: Heinz Mauelshagen @ 2021-09-06 12:43 UTC (permalink / raw
To: Dinghao Liu; +Cc: dm-devel, kjlu, Mike Snitzer, Alasdair Kergon, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 2123 bytes --]
Thanks for the updated patch, acked.
-- lvmguy
On Mon, Sep 6, 2021 at 6:17 AM Dinghao Liu <dinghao.liu@zju.edu.cn> wrote:
> mddev_unlock() is called on all paths after we call mddev_lock_nointr(),
> except for three error handling paths, which may cause a deadlock.
>
> Fixes: 9dbd1aa3a81c ("dm raid: add reshaping support to the target")
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
> ---
>
> Changelog:
>
> v2: - Simplify the error handling paths.
> ---
> drivers/md/dm-raid.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
> index d9ef52159a22..741bab00e922 100644
> --- a/drivers/md/dm-raid.c
> +++ b/drivers/md/dm-raid.c
> @@ -3249,14 +3249,12 @@ static int raid_ctr(struct dm_target *ti, unsigned
> int argc, char **argv)
> rs->md.in_sync = 0; /* Assume already marked dirty */
> if (r) {
> ti->error = "Failed to run raid array";
> - mddev_unlock(&rs->md);
> - goto bad;
> + goto bad_unlock;
> }
>
> r = md_start(&rs->md);
> if (r) {
> ti->error = "Failed to start raid array";
> - mddev_unlock(&rs->md);
> goto bad_md_start;
> }
>
> @@ -3265,7 +3263,6 @@ static int raid_ctr(struct dm_target *ti, unsigned
> int argc, char **argv)
> r = r5c_journal_mode_set(&rs->md, rs->journal_dev.mode);
> if (r) {
> ti->error = "Failed to set raid4/5/6 journal mode";
> - mddev_unlock(&rs->md);
> goto bad_journal_mode_set;
> }
> }
> @@ -3304,10 +3301,12 @@ static int raid_ctr(struct dm_target *ti, unsigned
> int argc, char **argv)
> mddev_unlock(&rs->md);
> return 0;
>
> +bad_unlock:
> bad_md_start:
> bad_journal_mode_set:
> bad_stripe_cache:
> bad_check_reshape:
> + mddev_unlock(&rs->md);
> md_stop(&rs->md);
> bad:
> raid_set_free(rs);
> --
> 2.17.1
>
>
[-- Attachment #1.2: Type: text/html, Size: 3017 bytes --]
[-- Attachment #2: Type: text/plain, Size: 97 bytes --]
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-06 12:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-06 4:16 [PATCH] [v2] dm raid: fix mddev unlocking in raid_ctr() error paths Dinghao Liu
2021-09-06 4:16 ` [dm-devel] " Dinghao Liu
2021-09-06 12:43 ` Heinz Mauelshagen
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.