github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-05 10:20:55 +00:00
Code Issues Projects Releases Wiki Activity

hv: vlapic: simple vlapic_rd/wr input

Browse Source 
Remove unnecessary input parameters

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2018-03-27 21:53:49 +08:00 committed by Jack Ren
parent 57152d0f27
commit 5a47c267e3
3 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
hypervisor/arch/x86/guest/vlapic.c
View File

@ -110,10 +110,10 @@ static void *apicv_apic_access_addr;
static int static int
vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset, vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset,
uint64_t data, bool *retu); uint64_t data);
static int static int
vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset, vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset,
uint64_t *data, bool *retu); uint64_t *data);
static int static int
apicv_set_intr_ready(struct vlapic *vlapic, int vector, bool level); apicv_set_intr_ready(struct vlapic *vlapic, int vector, bool level);
@ -1095,7 +1095,7 @@ vlapic_get_cr8(struct vlapic *vlapic)
} }
static int static int
vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu) vlapic_icrlo_write_handler(struct vlapic *vlapic)
{ {
int i; int i;
bool phys; bool phys;
@ -1219,7 +1219,6 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu)
target_vcpu->vm->attr.id); target_vcpu->vm->attr.id);
schedule_vcpu(target_vcpu); schedule_vcpu(target_vcpu);
*retu = true;
return 0; return 0;
} }
} }
@ -1342,7 +1341,7 @@ vlapic_svr_write_handler(struct vlapic *vlapic)
static int static int
vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset, vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset,
uint64_t *data, bool *retu) uint64_t *data)
{ {
struct lapic *lapic = vlapic->apic_page; struct lapic *lapic = vlapic->apic_page;
int i; int i;
@ -1446,7 +1445,6 @@ vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset,
case APIC_OFFSET_RRR: case APIC_OFFSET_RRR:
default: default:
*data = 0; *data = 0;
*retu = true;
break; break;
} }
done: done:
@ -1457,7 +1455,7 @@ done:
static int static int
vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset, vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset,
uint64_t data, bool *retu) uint64_t data)
{ {
struct lapic *lapic = vlapic->apic_page; struct lapic *lapic = vlapic->apic_page;
uint32_t *regptr; uint32_t *regptr;
@ -1508,7 +1506,7 @@ vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset,
break; break;
case APIC_OFFSET_ICR_LOW: case APIC_OFFSET_ICR_LOW:
lapic->icr_lo = data; lapic->icr_lo = data;
retval = vlapic_icrlo_write_handler(vlapic, retu); retval = vlapic_icrlo_write_handler(vlapic);
break; break;
case APIC_OFFSET_ICR_HI: case APIC_OFFSET_ICR_HI:
lapic->icr_hi = data; lapic->icr_hi = data;
@ -1927,29 +1925,31 @@ static int tsc_periodic_time(uint64_t data)
} }
int int
vlapic_rdmsr(struct vcpu *vcpu, uint32_t msr, uint64_t *rval, vlapic_rdmsr(struct vcpu *vcpu, uint32_t msr, uint64_t *rval)
bool *retu)
{ {
int error; int error = 0;
uint32_t offset; uint32_t offset;
struct vlapic *vlapic; struct vlapic *vlapic;
dev_dbg(ACRN_DBG_LAPIC, "cpu[%d] rdmsr: %x", vcpu->vcpu_id, msr); dev_dbg(ACRN_DBG_LAPIC, "cpu[%d] rdmsr: %x", vcpu->vcpu_id, msr);
vlapic = vcpu->arch_vcpu.vlapic; vlapic = vcpu->arch_vcpu.vlapic;
if (msr == MSR_IA32_APIC_BASE) { switch (msr) {
case MSR_IA32_APIC_BASE:
*rval = vlapic_get_apicbase(vlapic); *rval = vlapic_get_apicbase(vlapic);
error = 0; break;
} else {
default:
offset = x2apic_msr_to_regoff(msr); offset = x2apic_msr_to_regoff(msr);
error = vlapic_read(vlapic, 0, offset, rval, retu); error = vlapic_read(vlapic, 0, offset, rval);
break;
} }
return error; return error;
} }
int int
vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t val, bool *retu) vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t val)
{ {
int error; int error;
uint32_t offset; uint32_t offset;
@ -1959,9 +1959,12 @@ vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t val, bool *retu)
vlapic = vcpu->arch_vcpu.vlapic; vlapic = vcpu->arch_vcpu.vlapic;
lapic = vlapic->apic_page; lapic = vlapic->apic_page;
if (msr == MSR_IA32_APIC_BASE) { switch (msr) {
case MSR_IA32_APIC_BASE:
error = vlapic_set_apicbase(vlapic, val); error = vlapic_set_apicbase(vlapic, val);
} else if (msr == MSR_IA32_TSC_DEADLINE) { break;
case MSR_IA32_TSC_DEADLINE:
error = 0; error = 0;
if (!VLAPIC_TSCDEADLINE(lapic->lvt_timer)) if (!VLAPIC_TSCDEADLINE(lapic->lvt_timer))
return error; return error;
@ -1981,9 +1984,12 @@ vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t val, bool *retu)
error = -1; error = -1;
} }
} }
} else { break;
default:
offset = x2apic_msr_to_regoff(msr); offset = x2apic_msr_to_regoff(msr);
error = vlapic_write(vlapic, 0, offset, val, retu); error = vlapic_write(vlapic, 0, offset, val);
break;
} }
dev_dbg(ACRN_DBG_LAPIC, "cpu[%d] wrmsr: %x val=%#x", dev_dbg(ACRN_DBG_LAPIC, "cpu[%d] wrmsr: %x val=%#x",
@ -1997,7 +2003,6 @@ vlapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size)
int error; int error;
uint64_t off; uint64_t off;
struct vlapic *vlapic; struct vlapic *vlapic;
bool arg;
off = gpa - DEFAULT_APIC_BASE; off = gpa - DEFAULT_APIC_BASE;
@ -2009,7 +2014,7 @@ vlapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size)
return -EINVAL; return -EINVAL;
vlapic = vcpu->arch_vcpu.vlapic; vlapic = vcpu->arch_vcpu.vlapic;
error = vlapic_write(vlapic, 1, off, wval, &arg); error = vlapic_write(vlapic, 1, off, wval);
return error; return error;
} }
@ -2020,7 +2025,6 @@ vlapic_mmio_read(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval,
int error; int error;
uint64_t off; uint64_t off;
struct vlapic *vlapic; struct vlapic *vlapic;
bool arg;
off = gpa - DEFAULT_APIC_BASE; off = gpa - DEFAULT_APIC_BASE;
@ -2034,7 +2038,7 @@ vlapic_mmio_read(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval,
return -EINVAL; return -EINVAL;
vlapic = vcpu->arch_vcpu.vlapic; vlapic = vcpu->arch_vcpu.vlapic;
error = vlapic_read(vlapic, 1, off, rval, &arg); error = vlapic_read(vlapic, 1, off, rval);
return error; return error;
} }
@ -2339,7 +2343,6 @@ apicv_inject_pir(struct vlapic *vlapic)
int apic_access_vmexit_handler(struct vcpu *vcpu) int apic_access_vmexit_handler(struct vcpu *vcpu)
{ {
bool ret;
int access_type, offset; int access_type, offset;
uint64_t qual; uint64_t qual;
struct vlapic *vlapic; struct vlapic *vlapic;
@ -2356,9 +2359,9 @@ int apic_access_vmexit_handler(struct vcpu *vcpu)
analyze_instruction(vcpu, &vcpu->mmio); analyze_instruction(vcpu, &vcpu->mmio);
if (access_type == 1) { if (access_type == 1) {
if (!emulate_instruction(vcpu, &vcpu->mmio)) if (!emulate_instruction(vcpu, &vcpu->mmio))
vlapic_write(vlapic, 1, offset, vcpu->mmio.value, &ret); vlapic_write(vlapic, 1, offset, vcpu->mmio.value);
} else if (access_type == 0) { } else if (access_type == 0) {
vlapic_read(vlapic, 1, offset, &vcpu->mmio.value, &ret); vlapic_read(vlapic, 1, offset, &vcpu->mmio.value);
emulate_instruction(vcpu, &vcpu->mmio); emulate_instruction(vcpu, &vcpu->mmio);
} }
@ -2397,7 +2400,6 @@ int veoi_vmexit_handler(struct vcpu *vcpu)
int apic_write_vmexit_handler(struct vcpu *vcpu) int apic_write_vmexit_handler(struct vcpu *vcpu)
{ {
bool retu;
uint64_t qual; uint64_t qual;
int error, handled, offset; int error, handled, offset;
struct vlapic *vlapic = NULL; struct vlapic *vlapic = NULL;
@ -2429,9 +2431,8 @@ int apic_write_vmexit_handler(struct vcpu *vcpu)
vlapic_esr_write_handler(vlapic); vlapic_esr_write_handler(vlapic);
break; break;
case APIC_OFFSET_ICR_LOW: case APIC_OFFSET_ICR_LOW:
retu = false; error = vlapic_icrlo_write_handler(vlapic);
error = vlapic_icrlo_write_handler(vlapic, &retu); if (error != 0)
if (error != 0 || retu)
handled = 0; handled = 0;
break; break;
case APIC_OFFSET_CMCI_LVT: case APIC_OFFSET_CMCI_LVT:

11
hypervisor/arch/x86/guest/vmsr.c
View File

@ -229,9 +229,8 @@ int rdmsr_handler(struct vcpu *vcpu)
} }
case MSR_IA32_APIC_BASE: case MSR_IA32_APIC_BASE:
{ {
bool ret;
/* Read APIC base */ /* Read APIC base */
vlapic_rdmsr(vcpu, msr, &v, &ret); vlapic_rdmsr(vcpu, msr, &v);
break; break;
} }
default: default:
@ -270,9 +269,7 @@ int wrmsr_handler(struct vcpu *vcpu)
switch (msr) { switch (msr) {
case MSR_IA32_TSC_DEADLINE: case MSR_IA32_TSC_DEADLINE:
{ {
bool ret; vlapic_wrmsr(vcpu, msr, v);
/* Write APIC base */
vlapic_wrmsr(vcpu, msr, v, &ret);
vcpu->guest_msrs[IDX_TSC_DEADLINE] = v; vcpu->guest_msrs[IDX_TSC_DEADLINE] = v;
break; break;
} }
@ -324,9 +321,7 @@ int wrmsr_handler(struct vcpu *vcpu)
} }
case MSR_IA32_APIC_BASE: case MSR_IA32_APIC_BASE:
{ {
bool ret; vlapic_wrmsr(vcpu, msr, v);
/* Write APIC base */
vlapic_wrmsr(vcpu, msr, v, &ret);
break; break;
} }
default: default:

4
hypervisor/include/arch/x86/guest/vlapic.h
View File

@ -59,8 +59,8 @@ void vlapic_intr_accepted(struct vlapic *vlapic, int vector);
struct vlapic *vm_lapic_from_vcpuid(struct vm *vm, int vcpu_id); struct vlapic *vm_lapic_from_vcpuid(struct vm *vm, int vcpu_id);
struct vlapic *vm_lapic_from_pcpuid(struct vm *vm, int pcpu_id); struct vlapic *vm_lapic_from_pcpuid(struct vm *vm, int pcpu_id);
bool vlapic_msr(uint32_t num); bool vlapic_msr(uint32_t num);
int vlapic_rdmsr(struct vcpu *vcpu, uint32_t msr, uint64_t *rval, bool *retu); int vlapic_rdmsr(struct vcpu *vcpu, uint32_t msr, uint64_t *rval);
int vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t wval, bool *retu); int vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t wval);
int vlapic_mmio_read(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval, int size); int vlapic_mmio_read(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval, int size);
int vlapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size); int vlapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size);