elevator: restore old io scheduler on failure in elevator_switch
cover elevator: restore old io scheduler on failure in elevator_switch
Hi!
These two patches bring back the fallback feature in elevator_switch if switching to the new io scheduler failed.
elevator_switch contains the fallback logic in sq era, but it was removed when moving to mq (commit: a1ce35fa49852db60fc6e268038530be533c5b15), leaving the document mismatched with the behavior. As far as I can see, restoring the old io scheduler is more reasonable than just leaving the scheduler none, hence there is the series.
However, now it's hard to keep the old io scheduler untouched. We can only re-initialize the old scheduler if we want to restore it, and the statistics the old scheduler collected would be lost. Besides, the restoration itself might fail too. I have no idea whether the two problems matter. Any comments are welcomed.
Jinlong Chen (2):
elevator: add a helper for applying scheduler to request_queue
elevator: restore the old io scheduler if failed to switch to the new
one
block/elevator.c | 49 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 9 deletions(-)
Signature · 1 line
2.31.1
RFC PATCH 1/2 elevator: add a helper for applying scheduler to request_queue
Prepare for supporting fallback in elevator_switch.
--- block/elevator.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
block/elevator.c +16 -6
@@ -649,6 +649,21 @@ void elevator_init_mq(struct request_queue *q)elevator_put (e); } +static int __elevator_apply (struct request_queue *q,struct elevator_type *e) +{ +int ret; + + ret =blk_mq_init_sched (q, e); +if (ret) +return ret; + + ret =elv_register_queue (q, true); +if (ret) +elevator_exit (q); + +return ret; +} +/* * switch to new_e io scheduler. be careful not to introduce deadlocks - * we don't free the old io scheduler, before we have allocated what we
@@ -669,15 +684,10 @@ int elevator_switch(struct request_queue *q, struct elevator_type *new_e)elevator_exit (q); } - ret =blk_mq_init_sched (q, new_e); + ret =__elevator_apply (q, new_e);if (ret) goto out_unfreeze; - ret =elv_register_queue (q, true); -if (ret) { -elevator_exit (q); - goto out_unfreeze; - }blk_add_trace_msg (q,"elv switch: %s" , new_e->elevator_name); out_unfreeze:
Signature · 1 line
2.31.1
RFC PATCH 2/2 elevator: restore the old io scheduler if failed to switch to the new one
In reply to Jinlong ChenIf we failed to switch to the new io scheduler, we should try to restore the old one instead of just switching to none.
This also makes elevator_switch match its document.
--- block/elevator.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
block/elevator.c +25 -4
@@ -672,6 +672,7 @@ static int __elevator_apply(struct request_queue *q, struct elevator_type *e)*/ int elevator_switch (struct request_queue *q,struct elevator_type *new_e) { +struct elevator_type *old_e =NULL ;int ret;lockdep_assert_held (&q->sysfs_lock);
@@ -680,17 +681,37 @@ int elevator_switch(struct request_queue *q, struct elevator_type *new_e)blk_mq_quiesce_queue (q);if (q->elevator) { + old_e = q->elevator->type; +/* +* Keep a reference so we can fallback on failure. +*/ +__elevator_get (old_e);elv_unregister_queue (q);elevator_exit (q); } ret =__elevator_apply (q, new_e); -if (ret) - goto out_unfreeze; +if (likely (!ret)) { +blk_add_trace_msg (q,"elv switch: %s" , new_e->elevator_name); + }else if (old_e) { +int err; + + err =__elevator_apply (q, old_e); +if (unlikely (err)) { +blk_add_trace_msg (q, +"elv switch failed: %s (%d), fallback failed: %s (%d)" , + new_e->elevator_name, ret, old_e->elevator_name, err + ); + } + } -blk_add_trace_msg (q,"elv switch: %s" , new_e->elevator_name); +if (old_e) { +/* +* Done, release the reference we kept. +*/ +elevator_put (old_e); + } -out_unfreeze:blk_mq_unquiesce_queue (q);blk_mq_unfreeze_queue (q);return ret;
Signature · 1 line
2.31.1
Quoted 5 lines · Jinlong Chen
elevator_switchcontains the fallback logic in sq era, but it was removed when moving to mq (commit:a1ce35fa49852db60fc6e268038530be533c5b15), leaving the document mismatched with the behavior. As far as I can see, restoring the old io scheduler is more reasonable than just leaving the scheduler none, hence there is the series.
What failure scenariou can you think off where switching to the intended schedule fails, but switching back to the previous one will succeed?
Quoted 9 lines · Jinlong Chen
Quoted 5 lines
elevator_switchcontains the fallback logic in sq era, but it was removed when moving to mq (commit:a1ce35fa49852db60fc6e268038530be533c5b15), leaving the document mismatched with the behavior. As far as I can see, restoring the old io scheduler is more reasonable than just leaving the scheduler none, hence there is the series.What failure scenariou can you think off where switching to the intended schedule fails, but switching back to the previous one will succeed?
Mostly failures specific to the intended io scheduler, like consuming more resources than the old one that the system can not afford. But sure it's rare, so do you think I should just correct the outdated document?
Thanks!
Jinlong Chen
Quoted 3 lines · Jinlong Chen
Mostly failures specific to the intended io scheduler, like consuming more resources than the old one that the system can not afford. But sure it's rare, so do you think I should just correct the outdated document?
I'd be tempted to just documented the behavior, because I think the chances are high that if switching to one schedule will fail that switching back to the old one will fail as well. I've done a quick audit of all three schedulers, and unless I missed something there are no other failure cases except for running out of memory.
Maybe a printk to document that switching the scheduler failed are we aren't using any scheduler now might be useful, though.
Quoted 5 lines · Jinlong Chen
Quoted 3 lines
Mostly failures specific to the intended io scheduler, like consuming more resources than the old one that the system can not afford. But sure it's rare, so do you think I should just correct the outdated document?
Quoted 8 lines
I'd be tempted to just documented the behavior, because I think the chances are high that if switching to one schedule will fail that switching back to the old one will fail as well. I've done a quick audit of all three schedulers, and unless I missed something there are no other failure cases except for running out of memory.
Maybe a printk to document that switching the scheduler failed are we aren't using any scheduler now might be useful, though.
Ok, then I'll send two patches with the document updated and the printk added.
Thanks!
Jinlong Chen