md/raid1: release pending accounting for an I/O only after write-behind is also finished
PATCH 1/1 md/raid1: release pending accounting for an I/O only after write-behind is also finished
When using RAID1 and write-behind, md can deadlock when errors occur. With write-behind, r1bio structs can be accounted by raid1 as queued but not counted as pending. The pending count is dropped when the original bio is returned complete but write-behind for the r1bio may still be active.
This breaks the accounting used in some conditions to know when the raid1 md device has reached an idle state. It can result in calls to freeze_array deadlocking. freeze_array will never complete from a negative "unqueued" value being calculated due to a queued count larger than the pending count.
To properly account for write-behind, move the call to allow_barrier from call_bio_endio to raid_end_bio_io. When using write-behind, md can call call_bio_endio before all write-behind I/O is complete. Using raid_end_bio_io for the point to call allow_barrier will release the pending count at a point where all I/O for an r1bio, even write-behind, is done.
---
raid1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/md/raid1.c +7 -6
@@ -279,22 +279,17 @@ static void reschedule_retry(struct r1bio *r1_bio)static void call_bio_endio (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; -struct r1conf *conf = r1_bio->mddev->private;if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) bio->bi_status =BLK_STS_IOERR ;bio_endio (bio); -/* -* Wake up any possible resync thread that waits for the device -* to go idle. -*/ -allow_barrier (conf, r1_bio->sector); }static void raid_end_bio_io (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; +struct r1conf *conf = r1_bio->mddev->private;/* if nobody has done the final endio yet, do it now */ if (!test_and_set_bit (R1BIO_Returned, &r1_bio->state)) {
@@ -305,6 +300,12 @@ static void raid_end_bio_io(struct r1bio *r1_bio)call_bio_endio (r1_bio); } +/* +* Wake up any possible resync thread that waits for the device +* to go idle. All I/Os, even write-behind writes, are done. +*/ +allow_barrier (conf, r1_bio->sector); +free_r1bio (r1_bio); }
Song Liu
maintainerQuoted 35 lines · David Jeffery
When using RAID1 and write-behind, md can deadlock when errors occur. With write-behind, r1bio structs can be accounted by raid1 as queued but not counted as pending. The pending count is dropped when the original bio is returned complete but write-behind for the r1bio may still be active.
This breaks the accounting used in some conditions to know when the raid1 md device has reached an idle state. It can result in calls to
freeze_arraydeadlocking.freeze_arraywill never complete from a negative "unqueued" value being calculated due to a queued count larger than the pending count.To properly account for write-behind, move the call to
allow_barrierfromcall_bio_endiotoraid_end_bio_io. When using write-behind, md can callcall_bio_endiobefore all write-behind I/O is complete. Usingraid_end_bio_iofor the point to callallow_barrierwill release the pending count at a point where all I/O for an r1bio, even write-behind, is done.Signed-off-by David Jeffery <[email protected]>---
raid1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)drivers/md/raid1.c +0
-1@@ -279,22 +279,17 @@ static void reschedule_retry(struct r1bio *r1_bio)static void call_bio_endio (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; -struct r1conf *conf = r1_bio->mddev->private;
drivers/md/raid1.c static void reschedule_retry(struct r1bio *r1_bio) · line 292
Quoted 10 lines
drivers/md/raid1.c +0
-5if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) bio->bi_status =BLK_STS_IOERR ;bio_endio (bio); -/* -* Wake up any possible resync thread that waits for the device -* to go idle. -*/ -allow_barrier (conf, r1_bio->sector);
raid1_end_write_request() also calls call_bio_endio(). Do we need to fix that?
Do we need to backport this to stable?
Thanks,
Song
Quoted 23 lines
drivers/md/raid1.c +7
-0}static void raid_end_bio_io (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; +struct r1conf *conf = r1_bio->mddev->private;/* if nobody has done the final endio yet, do it now */ if (!test_and_set_bit (R1BIO_Returned, &r1_bio->state)) {@@ -305,6 +300,12 @@ static void raid_end_bio_io(struct r1bio *r1_bio)call_bio_endio (r1_bio); } +/* +* Wake up any possible resync thread that waits for the device +* to go idle. All I/Os, even write-behind writes, are done. +*/ +allow_barrier (conf, r1_bio->sector); +free_r1bio (r1_bio); }
Quoted 41 lines · Song Liu
Quoted 39 lines · David Jeffery
When using RAID1 and write-behind, md can deadlock when errors occur. With write-behind, r1bio structs can be accounted by raid1 as queued but not counted as pending. The pending count is dropped when the original bio is returned complete but write-behind for the r1bio may still be active.
This breaks the accounting used in some conditions to know when the raid1 md device has reached an idle state. It can result in calls to
freeze_arraydeadlocking.freeze_arraywill never complete from a negative "unqueued" value being calculated due to a queued count larger than the pending count.To properly account for write-behind, move the call to
allow_barrierfromcall_bio_endiotoraid_end_bio_io. When using write-behind, md can callcall_bio_endiobefore all write-behind I/O is complete. Usingraid_end_bio_iofor the point to callallow_barrierwill release the pending count at a point where all I/O for an r1bio, even write-behind, is done.Signed-off-by David Jeffery <[email protected]>---
raid1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)drivers/md/raid1.c +0
-1@@ -279,22 +279,17 @@ static void reschedule_retry(struct r1bio *r1_bio)static void call_bio_endio (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; -struct r1conf *conf = r1_bio->mddev->private;if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) bio->bi_status =BLK_STS_IOERR ;
Quoted 9 lines
drivers/md/raid1.c static void reschedule_retry(struct r1bio *r1_bio) · line 292
Quoted 6 lines
drivers/md/raid1.c +0
-5bio_endio (bio); -/* -* Wake up any possible resync thread that waits for the device -* to go idle. -*/ -allow_barrier (conf, r1_bio->sector);
raid1_end_write_request()also callscall_bio_endio(). Do we need to fix that?
This basically is the problem the patch is fixing. We don't want allow_barrier() being called when call_bio_endio() is called directly from raid1_end_write_request(). Write-behind can still be active here so it was dropping the pending accounting too early. We only want it called when all I/O for the r1bio is complete, which shifting the allow_barrier() call to raid_end_bio_io() does.
Quoted 1 line
Do we need to backport this to stable?
Pros:
It's a small patch
Fixes an ugly deadlock which hangs md if it happens.
Cons:
Affects a feature most users don't use
The bug appears to have existed for years with little notice
I consider it rather borderline to being stable-worthy.
Quoted 3 lines
Thanks,
Song
Regards,
David Jeffery
Quoted 24 lines
Quoted 23 lines
drivers/md/raid1.c +7
-0}static void raid_end_bio_io (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; +struct r1conf *conf = r1_bio->mddev->private;/* if nobody has done the final endio yet, do it now */ if (!test_and_set_bit (R1BIO_Returned, &r1_bio->state)) {@@ -305,6 +300,12 @@ static void raid_end_bio_io(struct r1bio *r1_bio)call_bio_endio (r1_bio); } +/* +* Wake up any possible resync thread that waits for the device +* to go idle. All I/Os, even write-behind writes, are done. +*/ +allow_barrier (conf, r1_bio->sector); +free_r1bio (r1_bio); }
Song Liu
maintainerQuoted 53 lines · David Jeffery
Quoted 41 lines · Song Liu
Quoted 39 lines · David Jeffery
When using RAID1 and write-behind, md can deadlock when errors occur. With write-behind, r1bio structs can be accounted by raid1 as queued but not counted as pending. The pending count is dropped when the original bio is returned complete but write-behind for the r1bio may still be active.
This breaks the accounting used in some conditions to know when the raid1 md device has reached an idle state. It can result in calls to
freeze_arraydeadlocking.freeze_arraywill never complete from a negative "unqueued" value being calculated due to a queued count larger than the pending count.To properly account for write-behind, move the call to
allow_barrierfromcall_bio_endiotoraid_end_bio_io. When using write-behind, md can callcall_bio_endiobefore all write-behind I/O is complete. Usingraid_end_bio_iofor the point to callallow_barrierwill release the pending count at a point where all I/O for an r1bio, even write-behind, is done.Signed-off-by David Jeffery <[email protected]>---
raid1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)drivers/md/raid1.c +0
-1@@ -279,22 +279,17 @@ static void reschedule_retry(struct r1bio *r1_bio)static void call_bio_endio (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; -struct r1conf *conf = r1_bio->mddev->private;if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) bio->bi_status =BLK_STS_IOERR ;Quoted 9 lines
drivers/md/raid1.c static void reschedule_retry(struct r1bio *r1_bio) · line 292
Quoted 6 lines
drivers/md/raid1.c +0
-5bio_endio (bio); -/* -* Wake up any possible resync thread that waits for the device -* to go idle. -*/ -allow_barrier (conf, r1_bio->sector);
raid1_end_write_request()also callscall_bio_endio(). Do we need to fix that?
Quoted 6 lines
This basically is the problem the patch is fixing. We don't want
allow_barrier()being called whencall_bio_endio()is called directly fromraid1_end_write_request(). Write-behind can still be active here so it was dropping the pending accounting too early. We only want it called when all I/O for the r1bio is complete, which shifting theallow_barrier()call toraid_end_bio_io()does.
Thanks for the explanation. This looks good to me. I will process it after the merge window.
I will also re-evaluate whether we need it for stable.
Thanks again,
Song
Quoted 55 lines · Song Liu
Quoted 48 lines · David Jeffery
Quoted 39 lines · Song Liu
Quoted 38 lines · David Jeffery
When using RAID1 and write-behind, md can deadlock when errors occur. With write-behind, r1bio structs can be accounted by raid1 as queued but not counted as pending. The pending count is dropped when the original bio is returned complete but write-behind for the r1bio may still be active.
This breaks the accounting used in some conditions to know when the raid1 md device has reached an idle state. It can result in calls to
freeze_arraydeadlocking.freeze_arraywill never complete from a negative "unqueued" value being calculated due to a queued count larger than the pending count.To properly account for write-behind, move the call to
allow_barrierfromcall_bio_endiotoraid_end_bio_io. When using write-behind, md can callcall_bio_endiobefore all write-behind I/O is complete. Usingraid_end_bio_iofor the point to callallow_barrierwill release the pending count at a point where all I/O for an r1bio, even write-behind, is done.Signed-off-by David Jeffery <[email protected]>---
raid1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)drivers/md/raid1.c +0
-1@@ -279,22 +279,17 @@ static void reschedule_retry(struct r1bio *r1_bio)static void call_bio_endio (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; -struct r1conf *conf = r1_bio->mddev->private;if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) bio->bi_status =BLK_STS_IOERR ;Quoted 8 lines
drivers/md/raid1.c static void reschedule_retry(struct r1bio *r1_bio) · line 292
Quoted 6 lines
drivers/md/raid1.c +0
-5bio_endio (bio); -/* -* Wake up any possible resync thread that waits for the device -* to go idle. -*/ -allow_barrier (conf, r1_bio->sector);
raid1_end_write_request()also callscall_bio_endio(). Do we need to fix that?Quoted 6 lines
This basically is the problem the patch is fixing. We don't want
allow_barrier()being called whencall_bio_endio()is called directly fromraid1_end_write_request(). Write-behind can still be active here so it was dropping the pending accounting too early. We only want it called when all I/O for the r1bio is complete, which shifting theallow_barrier()call toraid_end_bio_io()does.
Quoted 8 lines
Thanks for the explanation. This looks good to me. I will process it after the merge window.
I will also re-evaluate whether we need it for stable.
Thanks again,
Song
Hello Song,
Did you pull in this patch after the merge window?
I don't see it in your tree.
Thanks, Nigel
Song Liu
maintainerQuoted 63 lines · Nigel Croxon
Quoted 60 lines · Song Liu
Quoted 48 lines · David Jeffery
Quoted 39 lines · Song Liu
Quoted 38 lines · David Jeffery
When using RAID1 and write-behind, md can deadlock when errors occur. With write-behind, r1bio structs can be accounted by raid1 as queued but not counted as pending. The pending count is dropped when the original bio is returned complete but write-behind for the r1bio may still be active.
This breaks the accounting used in some conditions to know when the raid1 md device has reached an idle state. It can result in calls to
freeze_arraydeadlocking.freeze_arraywill never complete from a negative "unqueued" value being calculated due to a queued count larger than the pending count.To properly account for write-behind, move the call to
allow_barrierfromcall_bio_endiotoraid_end_bio_io. When using write-behind, md can callcall_bio_endiobefore all write-behind I/O is complete. Usingraid_end_bio_iofor the point to callallow_barrierwill release the pending count at a point where all I/O for an r1bio, even write-behind, is done.Signed-off-by David Jeffery <[email protected]>---
raid1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)drivers/md/raid1.c +0
-1@@ -279,22 +279,17 @@ static void reschedule_retry(struct r1bio *r1_bio)static void call_bio_endio (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; -struct r1conf *conf = r1_bio->mddev->private;if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) bio->bi_status =BLK_STS_IOERR ;Quoted 8 lines
drivers/md/raid1.c static void reschedule_retry(struct r1bio *r1_bio) · line 292
Quoted 6 lines
drivers/md/raid1.c +0
-5bio_endio (bio); -/* -* Wake up any possible resync thread that waits for the device -* to go idle. -*/ -allow_barrier (conf, r1_bio->sector);
raid1_end_write_request()also callscall_bio_endio(). Do we need to fix that?Quoted 6 lines
This basically is the problem the patch is fixing. We don't want
allow_barrier()being called whencall_bio_endio()is called directly fromraid1_end_write_request(). Write-behind can still be active here so it was dropping the pending accounting too early. We only want it called when all I/O for the r1bio is complete, which shifting theallow_barrier()call toraid_end_bio_io()does.Thanks for the explanation. This looks good to me. I will process it after the merge window.
I will also re-evaluate whether we need it for stable.
Quoted 8 lines
Quoted 3 lines
Thanks again,
SongHello Song,
Did you pull in this patch after the merge window?
I don't see it in your tree.
I am really sorry I missed this one.
Just applied it to md-next.
Thanks,
Song
Quoted 56 lines · David Jeffery
When using RAID1 and write-behind, md can deadlock when errors occur. With write-behind, r1bio structs can be accounted by raid1 as queued but not counted as pending. The pending count is dropped when the original bio is returned complete but write-behind for the r1bio may still be active.
This breaks the accounting used in some conditions to know when the raid1 md device has reached an idle state. It can result in calls to
freeze_arraydeadlocking.freeze_arraywill never complete from a negative "unqueued" value being calculated due to a queued count larger than the pending count.To properly account for write-behind, move the call to
allow_barrierfromcall_bio_endiotoraid_end_bio_io. When using write-behind, md can callcall_bio_endiobefore all write-behind I/O is complete. Usingraid_end_bio_iofor the point to callallow_barrierwill release the pending count at a point where all I/O for an r1bio, even write-behind, is done.Signed-off-by David Jeffery <[email protected]>---
raid1.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)drivers/md/raid1.c +1
-6@@ -279,22 +279,17 @@ static void reschedule_retry(struct r1bio *r1_bio)static void call_bio_endio (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; -struct r1conf *conf = r1_bio->mddev->private;if (!test_bit (R1BIO_Uptodate, &r1_bio->state)) bio->bi_status =BLK_STS_IOERR ;bio_endio (bio); -/* -* Wake up any possible resync thread that waits for the device -* to go idle. -*/ -allow_barrier (conf, r1_bio->sector); }static void raid_end_bio_io (struct r1bio *r1_bio) {struct bio *bio = r1_bio->master_bio; +struct r1conf *conf = r1_bio->mddev->private;/* if nobody has done the final endio yet, do it now */ if (!test_and_set_bit (R1BIO_Returned, &r1_bio->state)) {@@ -305,6 +300,12 @@ static void raid_end_bio_io(struct r1bio *r1_bio)call_bio_endio (r1_bio);
drivers/md/raid1.c static void raid_end_bio_io(struct r1bio *r1_bio) · line 311
Quoted 10 lines
drivers/md/raid1.c +6
-0} +/* +* Wake up any possible resync thread that waits for the device +* to go idle. All I/Os, even write-behind writes, are done. +*/ +allow_barrier (conf, r1_bio->sector); +free_r1bio (r1_bio); }
Actually, it reverts part of change in d2eb35acfdccbe2a3622ed6cc441a5482148423b, not sure if it is better to move the call of allow_barrier back to free_r1bio, just FYI.
Thanks,
Guoqing