github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 23:13:26 +00:00
Code Issues Projects Releases Wiki Activity

ucode: refine acrn_update_ucode with copy_from_gva

Browse Source 
using copy_from_gva to refine function acrn_update_ucode

v2:
- inject #PF if copy_from_gva meet -EFAULT
- remove VCPU_RETAIN_RIP when inject #PF
- refine MACRO GET_DATA_SIZE

Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Jason Chen CJ 2018-05-24 12:52:11 +08:00 committed by lijinxia
parent 7aa3391d81
commit 51528d4a81
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,28 +23,28 @@ uint64_t get_microcode_version(void)
* According to SDM vol 3 Table 9-7. If data_size field of uCode * According to SDM vol 3 Table 9-7. If data_size field of uCode
* header is zero, the ucode length is 2000 * header is zero, the ucode length is 2000
*/ */
#define GET_DATA_SIZE(hdptr) \ #define UCODE_GET_DATA_SIZE(uhdr) \
((hdptr)->data_size ? ((hdptr)->data_size) : 2000) (uhdr.data_size ? uhdr.data_size : 2000)
void acrn_update_ucode(struct vcpu *vcpu, uint64_t v) void acrn_update_ucode(struct vcpu *vcpu, uint64_t v)
{ {
uint64_t hva, gpa, gva; uint64_t gva;
struct ucode_header *uhdr; struct ucode_header uhdr;
int data_size, data_page_num; int data_size, data_page_num;
uint8_t *ucode_ptr, *ptr; uint8_t *ucode_ptr, *ptr;
int chunk_size; int err;
int error = 0;
uint32_t err_code; uint32_t err_code;
gva = v - sizeof(struct ucode_header); gva = v - sizeof(struct ucode_header);
err_code = 0; err_code = 0;
error = vm_gva2gpa(vcpu, gva, &gpa, &err_code); err = copy_from_gva(vcpu, &uhdr, gva, sizeof(uhdr), &err_code);
if (error) if (err == -EFAULT) {
vcpu_inject_pf(vcpu, gva, err_code);
return;
} else if (err < 0)
return; return;
uhdr = (struct ucode_header *)GPA2HVA(vcpu->vm, gpa); data_size = UCODE_GET_DATA_SIZE(uhdr) + sizeof(struct ucode_header);
data_size = GET_DATA_SIZE(uhdr) + sizeof(struct ucode_header);
data_page_num = data_page_num =
(data_size + CPU_PAGE_SIZE - 1) >> CPU_PAGE_SHIFT; (data_size + CPU_PAGE_SIZE - 1) >> CPU_PAGE_SHIFT;
@ -52,28 +52,13 @@ void acrn_update_ucode(struct vcpu *vcpu, uint64_t v)
if (ptr == NULL) if (ptr == NULL)
return; return;
hva = (uint64_t)uhdr; err_code = 0;
while (true) { err = copy_from_gva(vcpu, ucode_ptr, gva, data_size, &err_code);
chunk_size = CPU_PAGE_SIZE - (hva & (CPU_PAGE_SIZE - 1)); if (err == -EFAULT) {
chunk_size = (chunk_size < data_size) ? chunk_size : data_size; vcpu_inject_pf(vcpu, gva, err_code);
return;
memcpy_s(ucode_ptr, chunk_size, (uint8_t *)hva, chunk_size); } else if (err < 0)
return;
data_size -= chunk_size;
if (data_size <= 0)
break;
ucode_ptr += chunk_size;
gva += chunk_size;
err_code = 0;
error = vm_gva2gpa(vcpu, gva, &gpa, &err_code);
if (error) {
free(ucode_ptr);
return;
}
hva = (uint64_t)GPA2HVA(vcpu->vm, gpa);
}
msr_write(MSR_IA32_BIOS_UPDT_TRIG, msr_write(MSR_IA32_BIOS_UPDT_TRIG,
(uint64_t)ptr + sizeof(struct ucode_header)); (uint64_t)ptr + sizeof(struct ucode_header));