Commit b146b839 authored by KarimAllah Ahmed's avatar KarimAllah Ahmed Committed by Paolo Bonzini

X86/nVMX: handle_vmptrld: Use kvm_vcpu_map when copying VMCS12 from guest memory

Use kvm_vcpu_map to the map the VMCS12 from guest memory because
kvm_vcpu_gpa_to_page() and kmap() will only work for guest memory that has
a "struct page".
Signed-off-by: default avatarKarimAllah Ahmed <karahmed@amazon.de>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e45adf66
...@@ -4593,11 +4593,10 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu) ...@@ -4593,11 +4593,10 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)
return 1; return 1;
if (vmx->nested.current_vmptr != vmptr) { if (vmx->nested.current_vmptr != vmptr) {
struct kvm_host_map map;
struct vmcs12 *new_vmcs12; struct vmcs12 *new_vmcs12;
struct page *page;
page = kvm_vcpu_gpa_to_page(vcpu, vmptr); if (kvm_vcpu_map(vcpu, gpa_to_gfn(vmptr), &map)) {
if (is_error_page(page)) {
/* /*
* Reads from an unbacked page return all 1s, * Reads from an unbacked page return all 1s,
* which means that the 32 bits located at the * which means that the 32 bits located at the
...@@ -4607,12 +4606,13 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu) ...@@ -4607,12 +4606,13 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)
return nested_vmx_failValid(vcpu, return nested_vmx_failValid(vcpu,
VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID); VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID);
} }
new_vmcs12 = kmap(page);
new_vmcs12 = map.hva;
if (new_vmcs12->hdr.revision_id != VMCS12_REVISION || if (new_vmcs12->hdr.revision_id != VMCS12_REVISION ||
(new_vmcs12->hdr.shadow_vmcs && (new_vmcs12->hdr.shadow_vmcs &&
!nested_cpu_has_vmx_shadow_vmcs(vcpu))) { !nested_cpu_has_vmx_shadow_vmcs(vcpu))) {
kunmap(page); kvm_vcpu_unmap(vcpu, &map, false);
kvm_release_page_clean(page);
return nested_vmx_failValid(vcpu, return nested_vmx_failValid(vcpu,
VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID); VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID);
} }
...@@ -4624,8 +4624,7 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu) ...@@ -4624,8 +4624,7 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)
* cached. * cached.
*/ */
memcpy(vmx->nested.cached_vmcs12, new_vmcs12, VMCS12_SIZE); memcpy(vmx->nested.cached_vmcs12, new_vmcs12, VMCS12_SIZE);
kunmap(page); kvm_vcpu_unmap(vcpu, &map, false);
kvm_release_page_clean(page);
set_current_vmptr(vmx, vmptr); set_current_vmptr(vmx, vmptr);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment