Skip to content

Commit 2e38a37

Browse files
liu-song-6shligit
authored andcommitted
md/r5cache: disable write back for degraded array
write-back cache in degraded mode introduces corner cases to the array. Although we try to cover all these corner cases, it is safer to just disable write-back cache when the array is in degraded mode. In this patch, we disable writeback cache for degraded mode: 1. On device failure, if the array enters degraded mode, raid5_error() will submit async job r5c_disable_writeback_async to disable writeback; 2. In r5c_journal_mode_store(), it is invalid to enable writeback in degraded mode; 3. In r5c_try_caching_write(), stripes with s->failed>0 will be handled in write-through mode. Signed-off-by: Song Liu <[email protected]> Signed-off-by: Shaohua Li <[email protected]>
1 parent 07e8336 commit 2e38a37

File tree

3 files changed

+56
-7
lines changed

3 files changed

+56
-7
lines changed

drivers/md/raid5-cache.c

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ struct r5l_log {
162162

163163
/* to submit async io_units, to fulfill ordering of flush */
164164
struct work_struct deferred_io_work;
165+
/* to disable write back during in degraded mode */
166+
struct work_struct disable_writeback_work;
165167
};
166168

167169
/*
@@ -611,6 +613,21 @@ static void r5l_submit_io_async(struct work_struct *work)
611613
r5l_do_submit_io(log, io);
612614
}
613615

616+
static void r5c_disable_writeback_async(struct work_struct *work)
617+
{
618+
struct r5l_log *log = container_of(work, struct r5l_log,
619+
disable_writeback_work);
620+
struct mddev *mddev = log->rdev->mddev;
621+
622+
if (log->r5c_journal_mode == R5C_JOURNAL_MODE_WRITE_THROUGH)
623+
return;
624+
pr_info("md/raid:%s: Disabling writeback cache for degraded array.\n",
625+
mdname(mddev));
626+
mddev_suspend(mddev);
627+
log->r5c_journal_mode = R5C_JOURNAL_MODE_WRITE_THROUGH;
628+
mddev_resume(mddev);
629+
}
630+
614631
static void r5l_submit_current_io(struct r5l_log *log)
615632
{
616633
struct r5l_io_unit *io = log->current_io;
@@ -2269,6 +2286,10 @@ static ssize_t r5c_journal_mode_store(struct mddev *mddev,
22692286
val > R5C_JOURNAL_MODE_WRITE_BACK)
22702287
return -EINVAL;
22712288

2289+
if (raid5_calc_degraded(conf) > 0 &&
2290+
val == R5C_JOURNAL_MODE_WRITE_BACK)
2291+
return -EINVAL;
2292+
22722293
mddev_suspend(mddev);
22732294
conf->log->r5c_journal_mode = val;
22742295
mddev_resume(mddev);
@@ -2323,6 +2344,16 @@ int r5c_try_caching_write(struct r5conf *conf,
23232344
set_bit(STRIPE_R5C_CACHING, &sh->state);
23242345
}
23252346

2347+
/*
2348+
* When run in degraded mode, array is set to write-through mode.
2349+
* This check helps drain pending write safely in the transition to
2350+
* write-through mode.
2351+
*/
2352+
if (s->failed) {
2353+
r5c_make_stripe_write_out(sh);
2354+
return -EAGAIN;
2355+
}
2356+
23262357
for (i = disks; i--; ) {
23272358
dev = &sh->dev[i];
23282359
/* if non-overwrite, use writing-out phase */
@@ -2579,6 +2610,19 @@ static int r5l_load_log(struct r5l_log *log)
25792610
return ret;
25802611
}
25812612

2613+
void r5c_update_on_rdev_error(struct mddev *mddev)
2614+
{
2615+
struct r5conf *conf = mddev->private;
2616+
struct r5l_log *log = conf->log;
2617+
2618+
if (!log)
2619+
return;
2620+
2621+
if (raid5_calc_degraded(conf) > 0 &&
2622+
conf->log->r5c_journal_mode == R5C_JOURNAL_MODE_WRITE_BACK)
2623+
schedule_work(&log->disable_writeback_work);
2624+
}
2625+
25822626
int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
25832627
{
25842628
struct request_queue *q = bdev_get_queue(rdev->bdev);
@@ -2651,6 +2695,7 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
26512695
spin_lock_init(&log->no_space_stripes_lock);
26522696

26532697
INIT_WORK(&log->deferred_io_work, r5l_submit_io_async);
2698+
INIT_WORK(&log->disable_writeback_work, r5c_disable_writeback_async);
26542699

26552700
log->r5c_journal_mode = R5C_JOURNAL_MODE_WRITE_THROUGH;
26562701
INIT_LIST_HEAD(&log->stripe_in_journal_list);
@@ -2683,6 +2728,7 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
26832728

26842729
void r5l_exit_log(struct r5l_log *log)
26852730
{
2731+
flush_work(&log->disable_writeback_work);
26862732
md_unregister_thread(&log->reclaim_thread);
26872733
mempool_destroy(log->meta_pool);
26882734
bioset_free(log->bs);

drivers/md/raid5.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ static struct stripe_head *__find_stripe(struct r5conf *conf, sector_t sector,
556556
* of the two sections, and some non-in_sync devices may
557557
* be insync in the section most affected by failed devices.
558558
*/
559-
static int calc_degraded(struct r5conf *conf)
559+
int raid5_calc_degraded(struct r5conf *conf)
560560
{
561561
int degraded, degraded2;
562562
int i;
@@ -619,7 +619,7 @@ static int has_failed(struct r5conf *conf)
619619
if (conf->mddev->reshape_position == MaxSector)
620620
return conf->mddev->degraded > conf->max_degraded;
621621

622-
degraded = calc_degraded(conf);
622+
degraded = raid5_calc_degraded(conf);
623623
if (degraded > conf->max_degraded)
624624
return 1;
625625
return 0;
@@ -2555,7 +2555,7 @@ static void raid5_error(struct mddev *mddev, struct md_rdev *rdev)
25552555

25562556
spin_lock_irqsave(&conf->device_lock, flags);
25572557
clear_bit(In_sync, &rdev->flags);
2558-
mddev->degraded = calc_degraded(conf);
2558+
mddev->degraded = raid5_calc_degraded(conf);
25592559
spin_unlock_irqrestore(&conf->device_lock, flags);
25602560
set_bit(MD_RECOVERY_INTR, &mddev->recovery);
25612561

@@ -2569,6 +2569,7 @@ static void raid5_error(struct mddev *mddev, struct md_rdev *rdev)
25692569
bdevname(rdev->bdev, b),
25702570
mdname(mddev),
25712571
conf->raid_disks - mddev->degraded);
2572+
r5c_update_on_rdev_error(mddev);
25722573
}
25732574

25742575
/*
@@ -7091,7 +7092,7 @@ static int raid5_run(struct mddev *mddev)
70917092
/*
70927093
* 0 for a fully functional array, 1 or 2 for a degraded array.
70937094
*/
7094-
mddev->degraded = calc_degraded(conf);
7095+
mddev->degraded = raid5_calc_degraded(conf);
70957096

70967097
if (has_failed(conf)) {
70977098
pr_crit("md/raid:%s: not enough operational devices (%d/%d failed)\n",
@@ -7338,7 +7339,7 @@ static int raid5_spare_active(struct mddev *mddev)
73387339
}
73397340
}
73407341
spin_lock_irqsave(&conf->device_lock, flags);
7341-
mddev->degraded = calc_degraded(conf);
7342+
mddev->degraded = raid5_calc_degraded(conf);
73427343
spin_unlock_irqrestore(&conf->device_lock, flags);
73437344
print_raid5_conf(conf);
73447345
return count;
@@ -7698,7 +7699,7 @@ static int raid5_start_reshape(struct mddev *mddev)
76987699
* pre and post number of devices.
76997700
*/
77007701
spin_lock_irqsave(&conf->device_lock, flags);
7701-
mddev->degraded = calc_degraded(conf);
7702+
mddev->degraded = raid5_calc_degraded(conf);
77027703
spin_unlock_irqrestore(&conf->device_lock, flags);
77037704
}
77047705
mddev->raid_disks = conf->raid_disks;
@@ -7786,7 +7787,7 @@ static void raid5_finish_reshape(struct mddev *mddev)
77867787
} else {
77877788
int d;
77887789
spin_lock_irq(&conf->device_lock);
7789-
mddev->degraded = calc_degraded(conf);
7790+
mddev->degraded = raid5_calc_degraded(conf);
77907791
spin_unlock_irq(&conf->device_lock);
77917792
for (d = conf->raid_disks ;
77927793
d < conf->raid_disks - mddev->delta_disks;

drivers/md/raid5.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,7 @@ extern sector_t raid5_compute_sector(struct r5conf *conf, sector_t r_sector,
758758
extern struct stripe_head *
759759
raid5_get_active_stripe(struct r5conf *conf, sector_t sector,
760760
int previous, int noblock, int noquiesce);
761+
extern int raid5_calc_degraded(struct r5conf *conf);
761762
extern int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev);
762763
extern void r5l_exit_log(struct r5l_log *log);
763764
extern int r5l_write_stripe(struct r5l_log *log, struct stripe_head *head_sh);
@@ -786,4 +787,5 @@ extern void r5c_flush_cache(struct r5conf *conf, int num);
786787
extern void r5c_check_stripe_cache_usage(struct r5conf *conf);
787788
extern void r5c_check_cached_full_stripe(struct r5conf *conf);
788789
extern struct md_sysfs_entry r5c_journal_mode;
790+
extern void r5c_update_on_rdev_error(struct mddev *mddev);
789791
#endif

0 commit comments

Comments
 (0)