Commit 494188df authored by Luo Meng's avatar Luo Meng Committed by Zheng Zengkai
Browse files

dm-thin: Resume failed in FAIL mode 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5P05D


CVE: NA

--------------------------------

When thinpool is suspended and sets fail_io, resume will report error
as below:
device-mapper: resume ioctl on vg-thinpool  failed: Invalid argument

Thinpool also can't be removed if bio is in 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().

Fixes: da105ed5 (dm thin metadata: introduce dm_pool_abort_metadata)
Signed-off-by: default avatarLuo Meng <luomeng12@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 41283328

drivers/md/dm-thin.c

+13 −4
Original line number Diff line number Diff line
@@ -3566,20 +3566,29 @@ 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);



	return 0;

out:

	/*

	 * When thinpool is PM_FAIL, it cannot be rebuilt if

	 * bio is in deferred list. Therefor need to return 0 and

	 * call pool_resume() to flush IO.

	 */

	if (r && get_pool_mode(pool) == PM_FAIL)

		r = 0;



	return r;

}



static void pool_suspend_active_thins(struct pool *pool)