openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/kvm/vmx: Use native read/write_cr2() 

read/write_cr2() go throuh the paravirt XXL indirection, but nested VMX in
a XEN_PV guest is not supported.

Use the native variants.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Message-Id: <20200708195322.344731916@linutronix.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Thomas Gleixner 2020-07-08 21:52:00 +02:00 committed by Paolo Bonzini
parent c3f08ed150
commit 2245d39886
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kvm/vmx/vmx.c
View File

@ -6686,13 +6686,13 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu,
else if (static_branch_unlikely(&mds_user_clear)) else if (static_branch_unlikely(&mds_user_clear))
mds_clear_cpu_buffers(); mds_clear_cpu_buffers();
if (vcpu->arch.cr2 != read_cr2()) if (vcpu->arch.cr2 != native_read_cr2())
write_cr2(vcpu->arch.cr2); native_write_cr2(vcpu->arch.cr2);
vmx->fail = __vmx_vcpu_run(vmx, (unsigned long *)&vcpu->arch.regs, vmx->fail = __vmx_vcpu_run(vmx, (unsigned long *)&vcpu->arch.regs,
vmx->loaded_vmcs->launched); vmx->loaded_vmcs->launched);
vcpu->arch.cr2 = read_cr2(); vcpu->arch.cr2 = native_read_cr2();
/* /*
* VMEXIT disables interrupts (host state), but tracing and lockdep * VMEXIT disables interrupts (host state), but tracing and lockdep