github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-03 17:31:42 +00:00
Code Issues Projects Releases Wiki Activity

hv:Replace vioapic pointer with instance in structure vm

Browse Source 
-- rename struct vioapic --> struct acrn_vioapic
-- update 'vioapic' field in 'struct arch_vm' from pointer
   to instance
-- change vm_ioapic(vm) to inline, and move it to vm.h
-- change vioapic_init to void type

Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
Reviewed-by: Anthony Xu <anthony.xu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Mingqiang Chi 2018-08-22 17:09:41 +08:00 committed by lijinxia
parent 29dbd1084d
commit 4e8798e018
5 changed files with 48 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hypervisor/arch/x86/guest/vm.c
View File

@ -215,12 +215,8 @@ int create_vm(struct vm_description *vm_desc, struct vm **rtn_vm)
/* vpic wire_mode default is INTR */ /* vpic wire_mode default is INTR */
vm->wire_mode = VPIC_WIRE_INTR; vm->wire_mode = VPIC_WIRE_INTR;
/* Allocate full emulated vIOAPIC instance */ /* Init full emulated vIOAPIC instance */
vm->arch_vm.virt_ioapic = vioapic_init(vm); vioapic_init(vm);
if (vm->arch_vm.virt_ioapic == NULL) {
status = -ENODEV;
goto err;
}
/* Populate return VM handle */ /* Populate return VM handle */
*rtn_vm = vm; *rtn_vm = vm;
@ -236,9 +232,8 @@ int create_vm(struct vm_description *vm_desc, struct vm **rtn_vm)
return 0; return 0;
err: err:
if (vm->arch_vm.virt_ioapic != NULL) {
vioapic_cleanup(vm->arch_vm.virt_ioapic); vioapic_cleanup(vm_ioapic(vm));
}
if (vm->arch_vm.m2p != NULL) { if (vm->arch_vm.m2p != NULL) {
free(vm->arch_vm.m2p); free(vm->arch_vm.m2p);
@ -284,8 +279,8 @@ int shutdown_vm(struct vm *vm)
ptdev_release_all_entries(vm); ptdev_release_all_entries(vm);
/* cleanup and free vioapic */ /* cleanup vioapic */
vioapic_cleanup(vm->arch_vm.virt_ioapic); vioapic_cleanup(vm_ioapic(vm));
/* Destroy secure world */ /* Destroy secure world */
if (vm->sworld_control.flag.active) { if (vm->sworld_control.flag.active) {
@ -361,7 +356,7 @@ int reset_vm(struct vm *vm)
vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL; vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL;
} }
vioapic_reset(vm->arch_vm.virt_ioapic); vioapic_reset(vm_ioapic(vm));
destroy_secure_world(vm, false); destroy_secure_world(vm, false);
vm->sworld_control.flag.active = 0UL; vm->sworld_control.flag.active = 0UL;

60
hypervisor/dm/vioapic.c
View File

@ -32,23 +32,12 @@
#include <hypervisor.h> #include <hypervisor.h>
#define REDIR_ENTRIES_HW 120U /* SOS align with native ioapic */
#define RTBL_RO_BITS (uint32_t)(IOAPIC_RTE_REM_IRR | IOAPIC_RTE_DELIVS) #define RTBL_RO_BITS (uint32_t)(IOAPIC_RTE_REM_IRR | IOAPIC_RTE_DELIVS)
#define NEED_TMR_UPDATE (IOAPIC_RTE_TRGRMOD | IOAPIC_RTE_DELMOD | IOAPIC_RTE_INTVEC) #define NEED_TMR_UPDATE (IOAPIC_RTE_TRGRMOD | IOAPIC_RTE_DELMOD | IOAPIC_RTE_INTVEC)
#define ACRN_DBG_IOAPIC 6U #define ACRN_DBG_IOAPIC 6U
#define ACRN_IOAPIC_VERSION 0x11U #define ACRN_IOAPIC_VERSION 0x11U
struct vioapic {
struct vm *vm;
spinlock_t mtx;
uint32_t id;
uint32_t ioregsel;
union ioapic_rte rtbl[REDIR_ENTRIES_HW];
/* sum of pin asserts (+1) and deasserts (-1) */
int32_t acnt[REDIR_ENTRIES_HW];
};
#define VIOAPIC_LOCK(vioapic) spinlock_obtain(&((vioapic)->mtx)) #define VIOAPIC_LOCK(vioapic) spinlock_obtain(&((vioapic)->mtx))
#define VIOAPIC_UNLOCK(vioapic) spinlock_release(&((vioapic)->mtx)) #define VIOAPIC_UNLOCK(vioapic) spinlock_release(&((vioapic)->mtx))
@ -61,17 +50,11 @@ static inline const char *pinstate_str(bool asserted)
return (asserted) ? "asserted" : "deasserted"; return (asserted) ? "asserted" : "deasserted";
} }
static struct vioapic *
vm_ioapic(struct vm *vm)
{
return (struct vioapic *)vm->arch_vm.virt_ioapic;
}
/** /**
* @pre pin < vioapic_pincount(vm) * @pre pin < vioapic_pincount(vm)
*/ */
static void static void
vioapic_send_intr(struct vioapic *vioapic, uint32_t pin) vioapic_send_intr(struct acrn_vioapic *vioapic, uint32_t pin)
{ {
uint32_t vector, dest, delmode; uint32_t vector, dest, delmode;
union ioapic_rte rte; union ioapic_rte rte;
@ -107,7 +90,7 @@ vioapic_send_intr(struct vioapic *vioapic, uint32_t pin)
* @pre pin < vioapic_pincount(vm) * @pre pin < vioapic_pincount(vm)
*/ */
static void static void
vioapic_set_pinstate(struct vioapic *vioapic, uint32_t pin, bool newstate) vioapic_set_pinstate(struct acrn_vioapic *vioapic, uint32_t pin, bool newstate)
{ {
int oldcnt, newcnt; int oldcnt, newcnt;
bool needintr; bool needintr;
@ -152,7 +135,7 @@ enum irqstate {
static void static void
vioapic_set_irqstate(struct vm *vm, uint32_t irq, enum irqstate irqstate) vioapic_set_irqstate(struct vm *vm, uint32_t irq, enum irqstate irqstate)
{ {
struct vioapic *vioapic; struct acrn_vioapic *vioapic;
uint32_t pin = irq; uint32_t pin = irq;
vioapic = vm_ioapic(vm); vioapic = vm_ioapic(vm);
@ -199,7 +182,7 @@ vioapic_pulse_irq(struct vm *vm, uint32_t irq)
void void
vioapic_update_tmr(struct vcpu *vcpu) vioapic_update_tmr(struct vcpu *vcpu)
{ {
struct vioapic *vioapic; struct acrn_vioapic *vioapic;
struct acrn_vlapic *vlapic; struct acrn_vlapic *vlapic;
union ioapic_rte rte; union ioapic_rte rte;
uint32_t vector, delmode; uint32_t vector, delmode;
@ -231,7 +214,7 @@ vioapic_update_tmr(struct vcpu *vcpu)
} }
static uint32_t static uint32_t
vioapic_indirect_read(struct vioapic *vioapic, uint32_t addr) vioapic_indirect_read(struct acrn_vioapic *vioapic, uint32_t addr)
{ {
uint32_t regnum; uint32_t regnum;
uint32_t pin, pincount = vioapic_pincount(vioapic->vm); uint32_t pin, pincount = vioapic_pincount(vioapic->vm);
@ -275,7 +258,8 @@ vioapic_indirect_read(struct vioapic *vioapic, uint32_t addr)
* VIOAPIC_UNLOCK(vioapic) by caller. * VIOAPIC_UNLOCK(vioapic) by caller.
*/ */
static void static void
vioapic_indirect_write(struct vioapic *vioapic, uint32_t addr, uint32_t data) vioapic_indirect_write(struct acrn_vioapic *vioapic, uint32_t addr,
uint32_t data)
{ {
union ioapic_rte last, new; union ioapic_rte last, new;
uint64_t changed; uint64_t changed;
@ -405,7 +389,7 @@ vioapic_indirect_write(struct vioapic *vioapic, uint32_t addr, uint32_t data)
} }
static void static void
vioapic_mmio_rw(struct vioapic *vioapic, uint64_t gpa, vioapic_mmio_rw(struct acrn_vioapic *vioapic, uint64_t gpa,
uint32_t *data, bool do_read) uint32_t *data, bool do_read)
{ {
uint32_t offset; uint32_t offset;
@ -447,7 +431,7 @@ vioapic_mmio_rw(struct vioapic *vioapic, uint64_t gpa,
void void
vioapic_process_eoi(struct vm *vm, uint32_t vector) vioapic_process_eoi(struct vm *vm, uint32_t vector)
{ {
struct vioapic *vioapic; struct acrn_vioapic *vioapic;
uint32_t pin, pincount = vioapic_pincount(vm); uint32_t pin, pincount = vioapic_pincount(vm);
union ioapic_rte rte; union ioapic_rte rte;
@ -493,7 +477,7 @@ vioapic_process_eoi(struct vm *vm, uint32_t vector)
} }
void void
vioapic_reset(struct vioapic *vioapic) vioapic_reset(struct acrn_vioapic *vioapic)
{ {
uint32_t pin, pincount; uint32_t pin, pincount;
@ -506,35 +490,27 @@ vioapic_reset(struct vioapic *vioapic)
vioapic->ioregsel = 0U; vioapic->ioregsel = 0U;
} }
struct vioapic * void
vioapic_init(struct vm *vm) vioapic_init(struct vm *vm)
{ {
struct vioapic *vioapic; vm->arch_vm.vioapic.vm = vm;
spinlock_init(&(vm->arch_vm.vioapic.mtx));
vioapic = calloc(1U, sizeof(struct vioapic)); vioapic_reset(vm_ioapic(vm));
ASSERT(vioapic != NULL, "");
vioapic->vm = vm;
spinlock_init(&vioapic->mtx);
vioapic_reset(vioapic);
register_mmio_emulation_handler(vm, register_mmio_emulation_handler(vm,
vioapic_mmio_access_handler, vioapic_mmio_access_handler,
(uint64_t)VIOAPIC_BASE, (uint64_t)VIOAPIC_BASE,
(uint64_t)VIOAPIC_BASE + VIOAPIC_SIZE, (uint64_t)VIOAPIC_BASE + VIOAPIC_SIZE,
NULL); NULL);
return vioapic;
} }
void void
vioapic_cleanup(struct vioapic *vioapic) vioapic_cleanup(struct acrn_vioapic *vioapic)
{ {
unregister_mmio_emulation_handler(vioapic->vm, unregister_mmio_emulation_handler(vioapic->vm,
(uint64_t)VIOAPIC_BASE, (uint64_t)VIOAPIC_BASE,
(uint64_t)VIOAPIC_BASE + VIOAPIC_SIZE); (uint64_t)VIOAPIC_BASE + VIOAPIC_SIZE);
free(vioapic);
} }
uint32_t uint32_t
@ -551,7 +527,7 @@ int vioapic_mmio_access_handler(struct vcpu *vcpu, struct io_request *io_req,
__unused void *handler_private_data) __unused void *handler_private_data)
{ {
struct vm *vm = vcpu->vm; struct vm *vm = vcpu->vm;
struct vioapic *vioapic; struct acrn_vioapic *vioapic;
struct mmio_request *mmio = &io_req->reqs.mmio; struct mmio_request *mmio = &io_req->reqs.mmio;
uint64_t gpa = mmio->address; uint64_t gpa = mmio->address;
int ret = 0; int ret = 0;
@ -580,12 +556,12 @@ int vioapic_mmio_access_handler(struct vcpu *vcpu, struct io_request *io_req,
} }
/** /**
* @pre vm->arch_vm.virt_ioapic != NULL * @pre vm->arch_vm.vioapic != NULL
* @pre rte != NULL * @pre rte != NULL
*/ */
void vioapic_get_rte(struct vm *vm, uint32_t pin, union ioapic_rte *rte) void vioapic_get_rte(struct vm *vm, uint32_t pin, union ioapic_rte *rte)
{ {
struct vioapic *vioapic; struct acrn_vioapic *vioapic;
vioapic = vm_ioapic(vm); vioapic = vm_ioapic(vm);
*rte = vioapic->rtbl[pin]; *rte = vioapic->rtbl[pin];

19
hypervisor/include/arch/x86/guest/vioapic.h
View File

@ -32,14 +32,25 @@
#define _VIOAPIC_H_ #define _VIOAPIC_H_
#include <apicreg.h> #include <apicreg.h>
#include <vm.h>
#define VIOAPIC_BASE 0xFEC00000UL #define VIOAPIC_BASE 0xFEC00000UL
#define VIOAPIC_SIZE 4096UL #define VIOAPIC_SIZE 4096UL
struct vioapic *vioapic_init(struct vm *vm); #define REDIR_ENTRIES_HW 120U /* SOS align with native ioapic */
void vioapic_cleanup(struct vioapic *vioapic);
void vioapic_reset(struct vioapic *vioapic); struct acrn_vioapic {
struct vm *vm;
spinlock_t mtx;
uint32_t id;
uint32_t ioregsel;
union ioapic_rte rtbl[REDIR_ENTRIES_HW];
/* sum of pin asserts (+1) and deasserts (-1) */
int32_t acnt[REDIR_ENTRIES_HW];
};
void vioapic_init(struct vm *vm);
void vioapic_cleanup(struct acrn_vioapic *vioapic);
void vioapic_reset(struct acrn_vioapic *vioapic);
void vioapic_assert_irq(struct vm *vm, uint32_t irq); void vioapic_assert_irq(struct vm *vm, uint32_t irq);
void vioapic_deassert_irq(struct vm *vm, uint32_t irq); void vioapic_deassert_irq(struct vm *vm, uint32_t irq);

8
hypervisor/include/arch/x86/guest/vm.h
View File

@ -98,7 +98,7 @@ struct vm_arch {
void *tmp_pg_array; /* Page array for tmp guest paging struct */ void *tmp_pg_array; /* Page array for tmp guest paging struct */
void *iobitmap[2];/* IO bitmap page array base address for this VM */ void *iobitmap[2];/* IO bitmap page array base address for this VM */
void *msr_bitmap; /* MSR bitmap page base address for this VM */ void *msr_bitmap; /* MSR bitmap page base address for this VM */
void *virt_ioapic; /* Virtual IOAPIC base address */ struct acrn_vioapic vioapic; /* Virtual IOAPIC base address */
struct acrn_vpic vpic; /* Virtual PIC */ struct acrn_vpic vpic; /* Virtual PIC */
/** /**
* A link to the IO handler of this VM. * A link to the IO handler of this VM.
@ -255,6 +255,12 @@ vm_pic(struct vm *vm)
return (struct acrn_vpic *)&(vm->arch_vm.vpic); return (struct acrn_vpic *)&(vm->arch_vm.vpic);
} }
static inline struct acrn_vioapic *
vm_ioapic(struct vm *vm)
{
return (struct acrn_vioapic *)&(vm->arch_vm.vioapic);
}
int shutdown_vm(struct vm *vm); int shutdown_vm(struct vm *vm);
void pause_vm(struct vm *vm); void pause_vm(struct vm *vm);
void resume_vm(struct vm *vm); void resume_vm(struct vm *vm);

2
hypervisor/include/arch/x86/hv_arch.h
View File

@ -23,6 +23,7 @@
#include <host_pm.h> #include <host_pm.h>
#include <vpic.h> #include <vpic.h>
#include <vuart.h> #include <vuart.h>
#include <vioapic.h>
#include <vm.h> #include <vm.h>
#include <cpuid.h> #include <cpuid.h>
#include <mmu.h> #include <mmu.h>
@ -35,7 +36,6 @@
#include <vtd.h> #include <vtd.h>
#include <vlapic.h> #include <vlapic.h>
#include <vioapic.h>
#include <guest.h> #include <guest.h>
#include <vmexit.h> #include <vmexit.h>
#include <cpufeatures.h> #include <cpufeatures.h>