raid1: include bio_end_io_list in nr_queued to prevent freeze_array hang
authorNate Dailey <nate.dailey@stratus.com>
Mon, 29 Feb 2016 15:43:58 +0000 (10:43 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 30 Apr 2016 22:05:19 +0000 (00:05 +0200)
commit11266d296f0376640b67a28847e613961159d907
treeeeeaded70c748b2b435aaaef601e55137891f662
parent64731eb996c201464143d6ee701c3ff2e95c1a2c
raid1: include bio_end_io_list in nr_queued to prevent freeze_array hang

commit ccfc7bf1f09d6190ef86693ddc761d5fe3fa47cb upstream.

If raid1d is handling a mix of read and write errors, handle_read_error's
call to freeze_array can get stuck.

This can happen because, though the bio_end_io_list is initially drained,
writes can be added to it via handle_write_finished as the retry_list
is processed. These writes contribute to nr_pending but are not included
in nr_queued.

If a later entry on the retry_list triggers a call to handle_read_error,
freeze array hangs waiting for nr_pending == nr_queued+extra. The writes
on the bio_end_io_list aren't included in nr_queued so the condition will
never be satisfied.

To prevent the hang, include bio_end_io_list writes in nr_queued.

There's probably a better way to handle decrementing nr_queued, but this
seemed like the safest way to avoid breaking surrounding code.

I'm happy to supply the script I used to repro this hang.

Fixes: 55ce74d4bfe1b(md/raid1: ensure device failure recorded before write request returns.)
Signed-off-by: Nate Dailey <nate.dailey@stratus.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/md/raid1.c