github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-01-04 15:14:27 +00:00
Code Issues Projects Releases Wiki Activity

hv: get correct fault address for copy_to/from_gva

Browse Source 
When doing copy_to/from_gva, it's possible the guest no page
happens on none-first page. In this case, we need get correct
fault address from gva2gpa.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
Acked-by: Eddie Dong <Eddie.dong@intel.com>
This commit is contained in:
Yin Fengwei
2018-08-07 11:36:06 +08:00
committed by lijinxia
parent 55105dbdeb
commit 63fe48c27f
6 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hypervisor/arch/x86/guest/ucode.c
View File

@@ -27,7 +27,7 @@ uint64_t get_microcode_version(void)
((uhdr.data_size != 0U) ? uhdr.data_size : 2000U)
void acrn_update_ucode(struct vcpu *vcpu, uint64_t v)
{
uint64_t gva;
uint64_t gva, fault_addr;
struct ucode_header uhdr;
uint32_t data_page_num;
size_t data_size;
@@ -38,10 +38,11 @@ void acrn_update_ucode(struct vcpu *vcpu, uint64_t v)
gva = v - sizeof(struct ucode_header);
err_code = 0U;
err = copy_from_gva(vcpu, &uhdr, gva, sizeof(uhdr), &err_code);
err = copy_from_gva(vcpu, &uhdr, gva, sizeof(uhdr), &err_code,
&fault_addr);
if (err < 0) {
if (err == -EFAULT) {
vcpu_inject_pf(vcpu, gva, err_code);
vcpu_inject_pf(vcpu, fault_addr, err_code);
}
return;
}
@@ -56,10 +57,11 @@ void acrn_update_ucode(struct vcpu *vcpu, uint64_t v)
}
err_code = 0U;
err = copy_from_gva(vcpu, ucode_ptr, gva, data_size, &err_code);
err = copy_from_gva(vcpu, ucode_ptr, gva, data_size, &err_code,
&fault_addr);
if (err < 0) {
if (err == -EFAULT) {
vcpu_inject_pf(vcpu, gva, err_code);
vcpu_inject_pf(vcpu, fault_addr, err_code);
}
return;
}