drivers/md/dm-raid1.c: Fix inconsistent mirroring after interrupted recovery
PATCH 1/1 drivers/md/dm-raid1.c: Fix inconsistent mirroring after interrupted recovery
Hi,
dm-mirror has potential data corruption problem:
while on-disk log shows that all disk contents are in-sync, actual contents of the disks are not synchronized. This problem occurs if initial recovery (synching) is interrupted and resumed.
Attached patch fixes this problem.
Please consider to apply.
Background:
rh_dec() changes the region state from RH_NOSYNC (out-of-sync) to RH_CLEAN (in-sync), which results in the corresponding bit of clean_bits being set.
This is harmful if on-disk log is used and the map is removed/suspended before the initial sync is completed. The clean_bits is written down to the on-disk log at the map removal, and, upon resume, it's read and copied to sync_bits. Since the recovery process refers to the sync_bits to find a region to be recovered, the region whose state was changed from RH_NOSYNC to RH_CLEAN is no longer recovered.
If you haven't applied dm-raid1-read-balancing.patch proposed in dm-devel sometimes ago, the contents of the mirrored disk just corrupt silently.
If you have, balanced read may get bogus data from out-of-sync disks.
The patch keeps RH_NOSYNC state unchanged.
It will be changed to RH_RECOVERING when recovery starts and get reclaimed when the recovery completes. So it doesn't leak the region hash entry.
Thanks,
Jun'ichi "Nick" Nomura
Keep RH_NOSYNC state unchanged when I/O on the region completes.
rh_dec() changes the region state from RH_NOSYNC (out-of-sync) to RH_CLEAN (in-sync), which results in the corresponding bit of clean_bits being set.
This is harmful if on-disk log is used and the map is removed/suspended before the initial sync is completed. The clean_bits is written down to the on-disk log at the map removal, and, upon resume, it's read and copied to sync_bits. Since the recovery process refers to the sync_bits to find a region to be recovered, the region whose state was changed from RH_NOSYNC to RH_CLEAN is no longer recovered.
If you haven't applied dm-raid1-read-balancing.patch proposed in dm-devel sometimes ago, the contents of the mirrored disk just corrupt silently.
If you have, balanced read may get bogus data from out-of-sync disks.
The RH_NOSYNC region will be changed to RH_RECOVERING when recovery starts on the region and get reclaimed when the recovery completes.
So it doesn't leak the region hash entry.
drivers/md/dm-raid1.c +13 -1
@@ -414,9 +414,21 @@ static void rh_dec(struct region_hash *rspin_lock_irqsave (&rh->region_lock, flags);if (atomic_dec_and_test (®->pending)) { +/* +* There is no pending I/O for this region. +* We can move the region to corresponding list for next action. +* At this point, the region is not yet connected to any list. +* +* If the state is RH_NOSYNC, the region should be kept off +* from clean list. +* The hash entry for RH_NOSYNC will remain in memory +* until the region is recovered or the map is reloaded. +*/ + +/* do nothing for RH_NOSYNC */ if (reg->state ==RH_RECOVERING ) {list_add_tail (®->list, &rh->quiesced_regions); - }else { + }else if (reg->state ==RH_DIRTY ) { reg->state =RH_CLEAN ;list_add (®->list, &rh->clean_regions); }