These routines are first called via CPU_UP_PREPARE notifier by the BSP
and then by the booting ASP from vmx_cpu_up()/_svm_cpu_up().
Avoid the unnecessary second call.
Signed-off-by: Boris Ostrovsky <boris.ostrov...@oracle.com>
Reported-by: Andrew Cooper <andrew.coop...@citrix.com>
---
xen/arch/x86/hvm/svm/svm.c | 2 +-
xen/arch/x86/hvm/vmx/vmcs.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 0dc9442..3e7b9fc 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -1538,7 +1538,7 @@ static int _svm_cpu_up(bool bsp)
return -EINVAL;
}
- if ( (rc = svm_cpu_up_prepare(cpu)) != 0 )
+ if ( bsp && (rc = svm_cpu_up_prepare(cpu)) != 0 )
return rc;
write_efer(read_efer() | EFER_SVME);
diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index 7854802..801e32b 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -652,7 +652,7 @@ int vmx_cpu_up(void)
INIT_LIST_HEAD(&this_cpu(active_vmcs_list));
- if ( (rc = vmx_cpu_up_prepare(cpu)) != 0 )
+ if ( (cpu == 0) && (rc = vmx_cpu_up_prepare(cpu)) != 0 )
return rc;
switch ( __vmxon(this_cpu(vmxon_region)) )
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
