dm thin: resume even if in FAIL mode

commit 19eb1650afeb1aa86151f61900e9e5f1de5d8d02 upstream.

If a thinpool set fail_io while suspending, resume will fail with:
 device-mapper: resume ioctl on vg-thinpool  failed: Invalid argument

The thin-pool also can't be removed if an in-flight bio is in the
deferred list.

This can be easily reproduced using:

  echo "offline" > /sys/block/sda/device/state
  dd if=/dev/zero of=/dev/mapper/thin bs=4K count=1
  dmsetup suspend /dev/mapper/pool
  mkfs.ext4 /dev/mapper/thin
  dmsetup resume /dev/mapper/pool

The root cause is maybe_resize_data_dev() will check fail_io and return
error before called dm_resume.

Fix this by adding FAIL mode check at the end of pool_preresume().

Cc: stable@vger.kernel.org
Fixes: da105ed5fd7e ("dm thin metadata: introduce dm_pool_abort_metadata")
Signed-off-by: Luo Meng <luomeng12@huawei.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index e76c96c760a9b5629fcd60fed99a1229cc3e3dda..c3ba30b403212875b25725aac3ff66135afd5c36 100644 (file)
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -3540,20 +3540,28 @@ static int pool_preresume(struct dm_target *ti)
         */
        r = bind_control_target(pool, ti);
        if (r)
-               return r;
+               goto out;
 
        r = maybe_resize_data_dev(ti, &need_commit1);
        if (r)
-               return r;
+               goto out;
 
        r = maybe_resize_metadata_dev(ti, &need_commit2);
        if (r)
-               return r;
+               goto out;
 
        if (need_commit1 || need_commit2)
                (void) commit(pool);
+out:
+       /*
+        * When a thin-pool is PM_FAIL, it cannot be rebuilt if
+        * bio is in deferred list. Therefore need to return 0
+        * to allow pool_resume() to flush IO.
+        */
+       if (r && get_pool_mode(pool) == PM_FAIL)
+               r = 0;
 
-       return 0;
+       return r;
 }
 
 static void pool_suspend_active_thins(struct pool *pool)