md: don't update recovery_cp when curr_resync is ACTIVE
authorHou Tao <houtao1@huawei.com>
Tue, 31 Jan 2023 07:07:19 +0000 (15:07 +0800)
committerSong Liu <song@kernel.org>
Wed, 1 Feb 2023 16:32:57 +0000 (08:32 -0800)
commit1d1f25bfda432a6b61bd0205d426226bbbd73504
treedab11f8cf103ad615c2c80ae172a5a89e54d5514
parente152a05fa054170c05f1d5e04e93e2e75ea11405
md: don't update recovery_cp when curr_resync is ACTIVE

Don't update recovery_cp when curr_resync is MD_RESYNC_ACTIVE, otherwise
md may skip the resync of the first 3 sectors if the resync procedure is
interrupted before the first calling of ->sync_request() as shown below:

md_do_sync thread          control thread
  // setup resync
  mddev->recovery_cp = 0
  j = 0
  mddev->curr_resync = MD_RESYNC_ACTIVE

                             // e.g., set array as idle
                             set_bit(MD_RECOVERY_INTR, &&mddev_recovery)
  // resync loop
  // check INTR before calling sync_request
  !test_bit(MD_RECOVERY_INTR, &mddev->recovery

  // resync interrupted
  // update recovery_cp from 0 to 3
  // the resync of three 3 sectors will be skipped
  mddev->recovery_cp = 3

Fixes: eac58d08d493 ("md: Use enum for overloaded magic numbers used by mddev->curr_resync")
Cc: stable@vger.kernel.org # 6.0+
Signed-off-by: Hou Tao <houtao1@huawei.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Song Liu <song@kernel.org>
drivers/md/md.c