Commit d3c61219 authored Nov 30, 2022 by Luo Meng Committed by Greg Kroah-Hartman Jan 18, 2023

dm thin: resume even if in FAIL mode



[ Upstream commit 19eb1650afeb1aa86151f61900e9e5f1de5d8d02 ]

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: da105ed5 ("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: Sasha Levin <sashal@kernel.org>

parent cbe6dd01

drivers/md/dm-thin.c

+12 −4

Original line number	Diff line number	Diff line
		@@ -3549,20 +3549,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)