mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen/sched: core: kill unarmed timers on sched_init_vcpu() failure
sched_init_vcpu() calls init_timer() for a vcpu's periodic_timer, singleshot_timer and poll_timer before it can fail -- these become live, linked into their target pCPU's per-cpu timer list regardless of what happens next. If the sched_alloc_udata() call further down then fails, the function frees the sched_unit via sched_free_unit() and returns 1, but never unlinks these three timers. The caller, vcpu_create(), makes this worse: on sched_init_vcpu() returning nonzero it jumps to fail_wq, skipping fail_sched and thus sched_destroy_vcpu() -- the only function on this path that calls kill_timer() on them. vcpu_destroy() then frees the vcpu, and the three timers embedded in it, while they are still linked into that shared list. This silently corrupts that list. It only shows up later, when something else touches a neighboring timer: sched_move_domain() crashed with "Assertion 'entry->prev->next == entry' failed" on a completely unrelated, valid vcpu's timer. Call sched_destroy_vcpu() in sched_init_vcpu()'s own failure branch instead of sched_free_unit(), so it doesn't depend on the caller reaching sched_destroy_vcpu() to undo what it set up itself. sched_destroy_vcpu() assumes unit->priv is set, which is not the case here, so make it only free the udata and remove the unit if unit->priv in non-NULL. Fixes:d884b10778("Domain creation/destruction cleanups.") Signed-off-by: Furkan Caliskan <frn1furkan10@gmail.com> Reviewed-by: Juergen Gross <jgross@suse.com> master commit:2565341135master date: 2026-09-01 10:02:13 +0200
This commit is contained in:
1 parent
93b05680e3
commit
839d930f4e
1 file changed
+6
-3
@@ -565,7 +565,7 @@ int sched_init_vcpu(struct vcpu *v)
|
||||
unit->priv = sched_alloc_udata(dom_scheduler(d), unit, d->sched_priv);
|
||||
if ( unit->priv == NULL )
|
||||
{
|
||||
sched_free_unit(unit, v);
|
||||
sched_destroy_vcpu(v);
|
||||
rcu_read_unlock(&sched_res_rculock);
|
||||
return 1;
|
||||
}
|
||||
@@ -845,8 +845,11 @@ void sched_destroy_vcpu(struct vcpu *v)
|
||||
{
|
||||
rcu_read_lock(&sched_res_rculock);
|
||||
|
||||
sched_remove_unit(vcpu_scheduler(v), unit);
|
||||
sched_free_udata(vcpu_scheduler(v), unit->priv);
|
||||
if ( unit->priv )
|
||||
{
|
||||
sched_remove_unit(vcpu_scheduler(v), unit);
|
||||
sched_free_udata(vcpu_scheduler(v), unit->priv);
|
||||
}
|
||||
sched_free_unit(unit, v);
|
||||
|
||||
rcu_read_unlock(&sched_res_rculock);
|
||||
|
||||