Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xen: Enable interrupts when calling _cond_resched()

xen_maybe_preempt_hcall() is called from the exception entry point
xen_do_hypervisor_callback with interrupts disabled.

_cond_resched() evades the might_sleep() check in cond_resched() which
would have caught that and schedule_debug() unfortunately lacks a check
for irqs_disabled().

Enable interrupts around the call and use cond_resched() to catch future
issues.

Fixes: fdfd811ddde3 ("x86/xen: allow privcmd hypercalls to be preempted")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/878skypjrh.fsf@nanos.tec.linutronix.de
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

authored by

Thomas Gleixner and committed by
Boris Ostrovsky
8645e56a 9038ec99

+3 -1
+3 -1
drivers/xen/preempt.c
··· 33 33 * cpu. 34 34 */ 35 35 __this_cpu_write(xen_in_preemptible_hcall, false); 36 - _cond_resched(); 36 + local_irq_enable(); 37 + cond_resched(); 38 + local_irq_disable(); 37 39 __this_cpu_write(xen_in_preemptible_hcall, true); 38 40 } 39 41 }