Skip to content

Commit eed0574

Browse files
Dongli ZhangBoris Ostrovsky
authored andcommitted
xen: delay xen_hvm_init_time_ops() if kdump is boot on vcpu>=32
The sched_clock() can be used very early since commit 857baa8 ("sched/clock: Enable sched clock early"). In addition, with commit 38669ba ("x86/xen/time: Output xen sched_clock time from 0"), kdump kernel in Xen HVM guest may panic at very early stage when accessing &__this_cpu_read(xen_vcpu)->time as in below: setup_arch() -> init_hypervisor_platform() -> x86_init.hyper.init_platform = xen_hvm_guest_init() -> xen_hvm_init_time_ops() -> xen_clocksource_read() -> src = &__this_cpu_read(xen_vcpu)->time; This is because Xen HVM supports at most MAX_VIRT_CPUS=32 'vcpu_info' embedded inside 'shared_info' during early stage until xen_vcpu_setup() is used to allocate/relocate 'vcpu_info' for boot cpu at arbitrary address. However, when Xen HVM guest panic on vcpu >= 32, since xen_vcpu_info_reset(0) would set per_cpu(xen_vcpu, cpu) = NULL when vcpu >= 32, xen_clocksource_read() on vcpu >= 32 would panic. This patch calls xen_hvm_init_time_ops() again later in xen_hvm_smp_prepare_boot_cpu() after the 'vcpu_info' for boot vcpu is registered when the boot vcpu is >= 32. This issue can be reproduced on purpose via below command at the guest side when kdump/kexec is enabled: "taskset -c 33 echo c > /proc/sysrq-trigger" The bugfix for PVM is not implemented due to the lack of testing environment. [boris: xen_hvm_init_time_ops() returns on errors instead of jumping to end] Cc: Joe Jin <[email protected]> Signed-off-by: Dongli Zhang <[email protected]> Reviewed-by: Boris Ostrovsky <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Boris Ostrovsky <[email protected]>
1 parent b537bf4 commit eed0574

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

arch/x86/xen/smp_hvm.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ static void __init xen_hvm_smp_prepare_boot_cpu(void)
1919
*/
2020
xen_vcpu_setup(0);
2121

22+
/*
23+
* Called again in case the kernel boots on vcpu >= MAX_VIRT_CPUS.
24+
* Refer to comments in xen_hvm_init_time_ops().
25+
*/
26+
xen_hvm_init_time_ops();
27+
2228
/*
2329
* The alternative logic (which patches the unlock/lock) runs before
2430
* the smp bootup up code is activated. Hence we need to set this up

arch/x86/xen/time.c

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,11 @@ static void xen_hvm_setup_cpu_clockevents(void)
558558

559559
void __init xen_hvm_init_time_ops(void)
560560
{
561+
static bool hvm_time_initialized;
562+
563+
if (hvm_time_initialized)
564+
return;
565+
561566
/*
562567
* vector callback is needed otherwise we cannot receive interrupts
563568
* on cpu > 0 and at this point we don't know how many cpus are
@@ -567,7 +572,22 @@ void __init xen_hvm_init_time_ops(void)
567572
return;
568573

569574
if (!xen_feature(XENFEAT_hvm_safe_pvclock)) {
570-
pr_info("Xen doesn't support pvclock on HVM, disable pv timer");
575+
pr_info_once("Xen doesn't support pvclock on HVM, disable pv timer");
576+
return;
577+
}
578+
579+
/*
580+
* Only MAX_VIRT_CPUS 'vcpu_info' are embedded inside 'shared_info'.
581+
* The __this_cpu_read(xen_vcpu) is still NULL when Xen HVM guest
582+
* boots on vcpu >= MAX_VIRT_CPUS (e.g., kexec), To access
583+
* __this_cpu_read(xen_vcpu) via xen_clocksource_read() will panic.
584+
*
585+
* The xen_hvm_init_time_ops() should be called again later after
586+
* __this_cpu_read(xen_vcpu) is available.
587+
*/
588+
if (!__this_cpu_read(xen_vcpu)) {
589+
pr_info("Delay xen_init_time_common() as kernel is running on vcpu=%d\n",
590+
xen_vcpu_nr(0));
571591
return;
572592
}
573593

@@ -577,6 +597,8 @@ void __init xen_hvm_init_time_ops(void)
577597
x86_cpuinit.setup_percpu_clockev = xen_hvm_setup_cpu_clockevents;
578598

579599
x86_platform.set_wallclock = xen_set_wallclock;
600+
601+
hvm_time_initialized = true;
580602
}
581603
#endif
582604

0 commit comments

Comments
 (0)