github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-31 15:30:56 +00:00
Code Issues Projects Releases Wiki Activity

HV: treewide: give names to unnamed structs/unions

Browse Source 
According to the syntax defined in C99, each struct/union field must have an
identifier. This patch adds names to the previously unnamed fields for C99
compatibility.

Here is a summary of the names (marked with a pair of *stars*) added.

struct trusty_mem:

    union {
        struct {
            struct key_info key_info;
            struct trusty_startup_param startup_param;
        } *data*;
        uint8_t page[CPU_PAGE_SIZE];
    } first_page;

struct ptdev_remapping_info:

    union {
        struct ptdev_msi_info msi;
        struct ptdev_intx_info intx;
    } *ptdev_intr_info*;

union code_segment_descriptor:

    uint64_t value;
    struct {
        union {
            ...
        } low32;
        union {
            ...
        } high32;
    } *fields*;

    similar changes are made to the following structures.
    * union data_segment_descriptor,
    * union system_segment_descriptor,
    * union tss_64_descriptor, and
    * union idt_64_descriptor

struct trace_entry:

    union {
        struct {
            uint32_t a, b, c, d;
        } *fields_32*;
        struct {
            uint8_t a1, a2, a3, a4;
            uint8_t b1, b2, b3, b4;
            uint8_t c1, c2, c3, c4;
            uint8_t d1, d2, d3, d4;
        } *fields_8*;
        struct {
            uint64_t e;
            uint64_t f;
        } *fields_64*;
        char str[16];
    } *payload*;

Signed-off-by: Junjie Mao <junjie.mao@intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
This commit is contained in:
Junjie Mao 2018-05-28 23:22:49 +08:00 committed by lijinxia
parent ef3cb5ba1c
commit 004d2e2696
7 changed files with 129 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
hypervisor/arch/x86/assign.c
View File

@ -77,10 +77,10 @@ entry_id(struct ptdev_remapping_info *entry)
uint32_t id; uint32_t id;
if (entry->type == PTDEV_INTR_INTX) if (entry->type == PTDEV_INTR_INTX)
id = entry_id_from_intx(entry->intx.phys_pin); id = entry_id_from_intx(entry->ptdev_intr_info.intx.phys_pin);
else else
id = entry_id_from_msix(entry->phys_bdf, id = entry_id_from_msix(entry->phys_bdf,
entry->msi.msix_entry_index); entry->ptdev_intr_info.msi.msix_entry_index);
return id; return id;
} }
@ -138,7 +138,8 @@ _lookup_entry_by_vmsi(struct vm *vm, uint16_t vbdf, int32_t index)
if ((entry->type == PTDEV_INTR_MSI) if ((entry->type == PTDEV_INTR_MSI)
&& (entry->vm == vm) && (entry->vm == vm)
&& (entry->virt_bdf == vbdf) && (entry->virt_bdf == vbdf)
&& (entry->msi.msix_entry_index == index)) && (entry->ptdev_intr_info.msi.msix_entry_index
== index))
return entry; return entry;
} }
@ -169,8 +170,8 @@ _lookup_entry_by_vintx(struct vm *vm, uint8_t vpin,
entry_node); entry_node);
if ((entry->type == PTDEV_INTR_INTX) if ((entry->type == PTDEV_INTR_INTX)
&& (entry->vm == vm) && (entry->vm == vm)
&& (entry->intx.virt_pin == vpin) && (entry->ptdev_intr_info.intx.virt_pin == vpin)
&& (entry->intx.vpin_src == vpin_src)) && (entry->ptdev_intr_info.intx.vpin_src == vpin_src))
return entry; return entry;
} }
@ -299,12 +300,13 @@ ptdev_update_irq_handler(struct vm *vm, struct ptdev_remapping_info *entry)
} }
/* update irq handler for IOAPIC */ /* update irq handler for IOAPIC */
if ((entry->type == PTDEV_INTR_INTX) if ((entry->type == PTDEV_INTR_INTX)
&& (entry->intx.vpin_src == PTDEV_VPIN_IOAPIC)) { && (entry->ptdev_intr_info.intx.vpin_src
== PTDEV_VPIN_IOAPIC)) {
uint64_t rte; uint64_t rte;
bool trigger_lvl = false; bool trigger_lvl = false;
/* VPIN_IOAPIC src means we have vioapic enabled */ /* VPIN_IOAPIC src means we have vioapic enabled */
vioapic_get_rte(vm, entry->intx.virt_pin, &rte); vioapic_get_rte(vm, entry->ptdev_intr_info.intx.virt_pin, &rte);
if ((rte & IOAPIC_RTE_TRGRMOD) == IOAPIC_RTE_TRGRLVL) if ((rte & IOAPIC_RTE_TRGRMOD) == IOAPIC_RTE_TRGRLVL)
trigger_lvl = true; trigger_lvl = true;
@ -315,11 +317,12 @@ ptdev_update_irq_handler(struct vm *vm, struct ptdev_remapping_info *entry)
} }
/* update irq handler for PIC */ /* update irq handler for PIC */
if ((entry->type == PTDEV_INTR_INTX) && (phys_irq < NR_LEGACY_IRQ) if ((entry->type == PTDEV_INTR_INTX) && (phys_irq < NR_LEGACY_IRQ)
&& (entry->intx.vpin_src == PTDEV_VPIN_PIC)) { && (entry->ptdev_intr_info.intx.vpin_src == PTDEV_VPIN_PIC)) {
enum vpic_trigger trigger; enum vpic_trigger trigger;
/* VPIN_PIC src means we have vpic enabled */ /* VPIN_PIC src means we have vpic enabled */
vpic_get_irq_trigger(vm, entry->intx.virt_pin, &trigger); vpic_get_irq_trigger(vm,
entry->ptdev_intr_info.intx.virt_pin, &trigger);
if (trigger == LEVEL_TRIGGER) if (trigger == LEVEL_TRIGGER)
update_irq_handler(phys_irq, common_dev_handler_level); update_irq_handler(phys_irq, common_dev_handler_level);
else else
@ -413,12 +416,12 @@ static uint64_t ptdev_build_physical_rte(struct vm *vm,
int phys_irq = dev_to_irq(entry->node); int phys_irq = dev_to_irq(entry->node);
int vector = dev_to_vector(entry->node); int vector = dev_to_vector(entry->node);
if (entry->intx.vpin_src == PTDEV_VPIN_IOAPIC) { if (entry->ptdev_intr_info.intx.vpin_src == PTDEV_VPIN_IOAPIC) {
uint64_t vdmask, pdmask; uint64_t vdmask, pdmask;
uint32_t dest, low, high, delmode; uint32_t dest, low, high, delmode;
bool phys; bool phys;
vioapic_get_rte(vm, entry->intx.virt_pin, &rte); vioapic_get_rte(vm, entry->ptdev_intr_info.intx.virt_pin, &rte);
low = rte; low = rte;
high = rte >> 32; high = rte >> 32;
@ -456,7 +459,8 @@ static uint64_t ptdev_build_physical_rte(struct vm *vm,
ioapic_get_rte(phys_irq, &physical_rte); ioapic_get_rte(phys_irq, &physical_rte);
rte = physical_rte; rte = physical_rte;
rte &= ~IOAPIC_RTE_TRGRMOD; rte &= ~IOAPIC_RTE_TRGRMOD;
vpic_get_irq_trigger(vm, entry->intx.virt_pin, &trigger); vpic_get_irq_trigger(vm,
entry->ptdev_intr_info.intx.virt_pin, &trigger);
if (trigger == LEVEL_TRIGGER) if (trigger == LEVEL_TRIGGER)
rte |= IOAPIC_RTE_TRGRLVL; rte |= IOAPIC_RTE_TRGRLVL;
@ -492,14 +496,15 @@ add_msix_remapping(struct vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
entry = alloc_entry(vm, PTDEV_INTR_MSI); entry = alloc_entry(vm, PTDEV_INTR_MSI);
entry->virt_bdf = virt_bdf; entry->virt_bdf = virt_bdf;
entry->phys_bdf = phys_bdf; entry->phys_bdf = phys_bdf;
entry->msi.msix_entry_index = msix_entry_index; entry->ptdev_intr_info.msi.msix_entry_index = msix_entry_index;
} else if ((entry->vm != vm) && is_vm0(entry->vm)) { } else if ((entry->vm != vm) && is_vm0(entry->vm)) {
entry->vm = vm; entry->vm = vm;
entry->virt_bdf = virt_bdf; entry->virt_bdf = virt_bdf;
} else if ((entry->vm != vm) && !is_vm0(entry->vm)) { } else if ((entry->vm != vm) && !is_vm0(entry->vm)) {
pr_err("MSIX pbdf%x idx=%d already in vm%d with vbdf%x, not " pr_err("MSIX pbdf%x idx=%d already in vm%d with vbdf%x, not "
"able to add into vm%d with vbdf%x", entry->phys_bdf, "able to add into vm%d with vbdf%x", entry->phys_bdf,
entry->msi.msix_entry_index, entry->vm->attr.id, entry->ptdev_intr_info.msi.msix_entry_index,
entry->vm->attr.id,
entry->virt_bdf, vm->attr.id, virt_bdf); entry->virt_bdf, vm->attr.id, virt_bdf);
ASSERT(0, "msix entry pbdf%x idx%d already in vm%d", ASSERT(0, "msix entry pbdf%x idx%d already in vm%d",
phys_bdf, msix_entry_index, entry->vm->attr.id); phys_bdf, msix_entry_index, entry->vm->attr.id);
@ -565,17 +570,19 @@ add_intx_remapping(struct vm *vm, uint8_t virt_pin,
return &invalid_entry; return &invalid_entry;
} }
entry = alloc_entry(vm, PTDEV_INTR_INTX); entry = alloc_entry(vm, PTDEV_INTR_INTX);
entry->intx.phys_pin = phys_pin; entry->ptdev_intr_info.intx.phys_pin = phys_pin;
entry->intx.virt_pin = virt_pin; entry->ptdev_intr_info.intx.virt_pin = virt_pin;
entry->intx.vpin_src = vpin_src; entry->ptdev_intr_info.intx.vpin_src = vpin_src;
} else if ((entry->vm != vm) && is_vm0(entry->vm)) { } else if ((entry->vm != vm) && is_vm0(entry->vm)) {
entry->vm = vm; entry->vm = vm;
entry->intx.virt_pin = virt_pin; entry->ptdev_intr_info.intx.virt_pin = virt_pin;
entry->intx.vpin_src = vpin_src; entry->ptdev_intr_info.intx.vpin_src = vpin_src;
} else if ((entry->vm != vm) && !is_vm0(entry->vm)) { } else if ((entry->vm != vm) && !is_vm0(entry->vm)) {
pr_err("INTX pin%d already in vm%d with vpin%d, not able to " pr_err("INTX pin%d already in vm%d with vpin%d, not able to "
"add into vm%d with vpin%d", entry->intx.phys_pin, "add into vm%d with vpin%d",
entry->vm->attr.id, entry->intx.virt_pin, entry->ptdev_intr_info.intx.phys_pin,
entry->vm->attr.id,
entry->ptdev_intr_info.intx.virt_pin,
vm->attr.id, virt_pin); vm->attr.id, virt_pin);
ASSERT(0, "intx entry pin%d already vm%d", ASSERT(0, "intx entry pin%d already vm%d",
phys_pin, entry->vm->attr.id); phys_pin, entry->vm->attr.id);
@ -617,10 +624,12 @@ void remove_intx_remapping(struct vm *vm, uint8_t virt_pin, bool pic_pin)
ptdev_deactivate_entry(entry); ptdev_deactivate_entry(entry);
dev_dbg(ACRN_DBG_IRQ, dev_dbg(ACRN_DBG_IRQ,
"deactive %s intx entry:ppin=%d, pirq=%d ", "deactive %s intx entry:ppin=%d, pirq=%d ",
entry->intx.vpin_src == PTDEV_VPIN_PIC ? entry->ptdev_intr_info.intx.vpin_src == PTDEV_VPIN_PIC ?
"vPIC" : "vIOAPIC", entry->intx.phys_pin, phys_irq); "vPIC" : "vIOAPIC",
entry->ptdev_intr_info.intx.phys_pin, phys_irq);
dev_dbg(ACRN_DBG_IRQ, "from vm%d vpin=%d\n", dev_dbg(ACRN_DBG_IRQ, "from vm%d vpin=%d\n",
entry->vm->attr.id, entry->intx.virt_pin); entry->vm->attr.id,
entry->ptdev_intr_info.intx.virt_pin);
} }
release_entry(entry); release_entry(entry);
@ -632,21 +641,23 @@ END:
static void ptdev_intr_handle_irq(struct vm *vm, static void ptdev_intr_handle_irq(struct vm *vm,
struct ptdev_remapping_info *entry) struct ptdev_remapping_info *entry)
{ {
switch (entry->intx.vpin_src) { switch (entry->ptdev_intr_info.intx.vpin_src) {
case PTDEV_VPIN_IOAPIC: case PTDEV_VPIN_IOAPIC:
{ {
uint64_t rte; uint64_t rte;
bool trigger_lvl = false; bool trigger_lvl = false;
/* VPIN_IOAPIC src means we have vioapic enabled */ /* VPIN_IOAPIC src means we have vioapic enabled */
vioapic_get_rte(vm, entry->intx.virt_pin, &rte); vioapic_get_rte(vm, entry->ptdev_intr_info.intx.virt_pin, &rte);
if ((rte & IOAPIC_RTE_TRGRMOD) == IOAPIC_RTE_TRGRLVL) if ((rte & IOAPIC_RTE_TRGRMOD) == IOAPIC_RTE_TRGRLVL)
trigger_lvl = true; trigger_lvl = true;
if (trigger_lvl) if (trigger_lvl)
vioapic_assert_irq(vm, entry->intx.virt_pin); vioapic_assert_irq(vm,
entry->ptdev_intr_info.intx.virt_pin);
else else
vioapic_pulse_irq(vm, entry->intx.virt_pin); vioapic_pulse_irq(vm,
entry->ptdev_intr_info.intx.virt_pin);
dev_dbg(ACRN_DBG_PTIRQ, dev_dbg(ACRN_DBG_PTIRQ,
"dev-assign: irq=0x%x assert vr: 0x%x vRTE=0x%x", "dev-assign: irq=0x%x assert vr: 0x%x vRTE=0x%x",
@ -659,11 +670,14 @@ static void ptdev_intr_handle_irq(struct vm *vm,
enum vpic_trigger trigger; enum vpic_trigger trigger;
/* VPIN_PIC src means we have vpic enabled */ /* VPIN_PIC src means we have vpic enabled */
vpic_get_irq_trigger(vm, entry->intx.virt_pin, &trigger); vpic_get_irq_trigger(vm,
entry->ptdev_intr_info.intx.virt_pin, &trigger);
if (trigger == LEVEL_TRIGGER) if (trigger == LEVEL_TRIGGER)
vpic_assert_irq(vm, entry->intx.virt_pin); vpic_assert_irq(vm,
entry->ptdev_intr_info.intx.virt_pin);
else else
vpic_pulse_irq(vm, entry->intx.virt_pin); vpic_pulse_irq(vm,
entry->ptdev_intr_info.intx.virt_pin);
break; break;
} }
default: default:
@ -694,16 +708,18 @@ void ptdev_softirq(__unused int cpu)
ptdev_intr_handle_irq(vm, entry); ptdev_intr_handle_irq(vm, entry);
else { else {
/* TODO: msi destmode check required */ /* TODO: msi destmode check required */
vlapic_intr_msi(vm, entry->msi.vmsi_addr, vlapic_intr_msi(vm,
entry->msi.vmsi_data); entry->ptdev_intr_info.msi.vmsi_addr,
entry->ptdev_intr_info.msi.vmsi_data);
dev_dbg(ACRN_DBG_PTIRQ, dev_dbg(ACRN_DBG_PTIRQ,
"dev-assign: irq=0x%x MSI VR: 0x%x-0x%x", "dev-assign: irq=0x%x MSI VR: 0x%x-0x%x",
dev_to_irq(entry->node), dev_to_irq(entry->node),
entry->msi.virt_vector, entry->ptdev_intr_info.msi.virt_vector,
irq_to_vector(dev_to_irq(entry->node))); irq_to_vector(dev_to_irq(entry->node)));
dev_dbg(ACRN_DBG_PTIRQ, dev_dbg(ACRN_DBG_PTIRQ,
" vmsi_addr: 0x%x vmsi_data: 0x%x", " vmsi_addr: 0x%x vmsi_data: 0x%x",
entry->msi.vmsi_addr, entry->msi.vmsi_data); entry->ptdev_intr_info.msi.vmsi_addr,
entry->ptdev_intr_info.msi.vmsi_data);
} }
} }
} }
@ -719,7 +735,7 @@ void ptdev_intx_ack(struct vm *vm, int virt_pin,
if (!entry) if (!entry)
return; return;
phys_pin = entry->intx.phys_pin; phys_pin = entry->ptdev_intr_info.intx.phys_pin;
phys_irq = pin_to_irq(phys_pin); phys_irq = pin_to_irq(phys_pin);
if (!irq_is_gsi(phys_irq)) if (!irq_is_gsi(phys_irq))
return; return;
@ -727,7 +743,7 @@ void ptdev_intx_ack(struct vm *vm, int virt_pin,
/* NOTE: only Level trigger will process EOI/ACK and if we got here /* NOTE: only Level trigger will process EOI/ACK and if we got here
* means we have this vioapic or vpic or both enabled * means we have this vioapic or vpic or both enabled
*/ */
switch (entry->intx.vpin_src) { switch (entry->ptdev_intr_info.intx.vpin_src) {
case PTDEV_VPIN_IOAPIC: case PTDEV_VPIN_IOAPIC:
vioapic_deassert_irq(vm, virt_pin); vioapic_deassert_irq(vm, virt_pin);
break; break;
@ -798,9 +814,9 @@ int ptdev_msix_remap(struct vm *vm, uint16_t virt_bdf,
/* build physical config MSI, update to info->pmsi_xxx */ /* build physical config MSI, update to info->pmsi_xxx */
ptdev_build_physical_msi(vm, info, dev_to_vector(entry->node)); ptdev_build_physical_msi(vm, info, dev_to_vector(entry->node));
entry->msi = *info; entry->ptdev_intr_info.msi = *info;
entry->msi.virt_vector = info->vmsi_data & 0xFF; entry->ptdev_intr_info.msi.virt_vector = info->vmsi_data & 0xFF;
entry->msi.phys_vector = dev_to_vector(entry->node); entry->ptdev_intr_info.msi.phys_vector = dev_to_vector(entry->node);
/* update irq handler according to info in guest */ /* update irq handler according to info in guest */
ptdev_update_irq_handler(vm, entry); ptdev_update_irq_handler(vm, entry);
@ -809,8 +825,10 @@ int ptdev_msix_remap(struct vm *vm, uint16_t virt_bdf,
"PCI %x:%x.%x MSI VR[%d] 0x%x->0x%x assigned to vm%d", "PCI %x:%x.%x MSI VR[%d] 0x%x->0x%x assigned to vm%d",
(entry->virt_bdf >> 8) & 0xFF, (entry->virt_bdf >> 8) & 0xFF,
(entry->virt_bdf >> 3) & 0x1F, (entry->virt_bdf >> 3) & 0x1F,
(entry->virt_bdf) & 0x7, entry->msi.msix_entry_index, (entry->virt_bdf) & 0x7,
entry->msi.virt_vector, entry->msi.phys_vector, entry->ptdev_intr_info.msi.msix_entry_index,
entry->ptdev_intr_info.msi.virt_vector,
entry->ptdev_intr_info.msi.phys_vector,
entry->vm->attr.id); entry->vm->attr.id);
END: END:
return 0; return 0;
@ -938,7 +956,7 @@ int ptdev_intx_pin_remap(struct vm *vm, struct ptdev_intx_info *info)
goto END; goto END;
/* phys_pin from physical IOAPIC */ /* phys_pin from physical IOAPIC */
phys_pin = entry->intx.phys_pin; phys_pin = entry->ptdev_intr_info.intx.phys_pin;
phys_irq = pin_to_irq(phys_pin); phys_irq = pin_to_irq(phys_pin);
if (!irq_is_gsi(phys_irq)) if (!irq_is_gsi(phys_irq))
goto END; goto END;
@ -952,18 +970,21 @@ int ptdev_intx_pin_remap(struct vm *vm, struct ptdev_intx_info *info)
dev_dbg(ACRN_DBG_IRQ, dev_dbg(ACRN_DBG_IRQ,
"IOAPIC pin=%d pirq=%d vpin=%d switch from %s to %s " "IOAPIC pin=%d pirq=%d vpin=%d switch from %s to %s "
"vpin=%d for vm%d", phys_pin, phys_irq, "vpin=%d for vm%d", phys_pin, phys_irq,
entry->intx.virt_pin, entry->ptdev_intr_info.intx.virt_pin,
entry->intx.vpin_src ? "vPIC" : "vIOAPIC", entry->ptdev_intr_info.intx.vpin_src ?
entry->intx.vpin_src ? "vIOPIC" : "vPIC", "vPIC" : "vIOAPIC",
entry->ptdev_intr_info.intx.vpin_src ?
"vIOPIC" : "vPIC",
info->virt_pin, info->virt_pin,
entry->vm->attr.id); entry->vm->attr.id);
entry->intx.vpin_src = info->vpin_src; entry->ptdev_intr_info.intx.vpin_src = info->vpin_src;
entry->intx.virt_pin = info->virt_pin; entry->ptdev_intr_info.intx.virt_pin = info->virt_pin;
} }
if (is_entry_active(entry) if (is_entry_active(entry)
&& (entry->intx.vpin_src == PTDEV_VPIN_IOAPIC)) { && (entry->ptdev_intr_info.intx.vpin_src
vioapic_get_rte(vm, entry->intx.virt_pin, &rte); == PTDEV_VPIN_IOAPIC)) {
vioapic_get_rte(vm, entry->ptdev_intr_info.intx.virt_pin, &rte);
if (((uint32_t)rte) == 0x10000) { if (((uint32_t)rte) == 0x10000) {
/* disable interrupt */ /* disable interrupt */
GSI_MASK_IRQ(phys_irq); GSI_MASK_IRQ(phys_irq);
@ -972,14 +993,15 @@ int ptdev_intx_pin_remap(struct vm *vm, struct ptdev_intx_info *info)
"IOAPIC pin=%d pirq=%d deassigned ", "IOAPIC pin=%d pirq=%d deassigned ",
phys_pin, phys_irq); phys_pin, phys_irq);
dev_dbg(ACRN_DBG_IRQ, "from vm%d vIOAPIC vpin=%d", dev_dbg(ACRN_DBG_IRQ, "from vm%d vIOAPIC vpin=%d",
entry->vm->attr.id, entry->intx.virt_pin); entry->vm->attr.id,
entry->ptdev_intr_info.intx.virt_pin);
goto END; goto END;
} else { } else {
/*update rte*/ /*update rte*/
activate_physical_ioapic(vm, entry); activate_physical_ioapic(vm, entry);
} }
} else if (is_entry_active(entry) } else if (is_entry_active(entry)
&& (entry->intx.vpin_src == PTDEV_VPIN_PIC)) { && (entry->ptdev_intr_info.intx.vpin_src == PTDEV_VPIN_PIC)) {
/* only update here /* only update here
* deactive vPIC entry when IOAPIC take it over * deactive vPIC entry when IOAPIC take it over
*/ */
@ -993,8 +1015,9 @@ int ptdev_intx_pin_remap(struct vm *vm, struct ptdev_intx_info *info)
dev_dbg(ACRN_DBG_IRQ, dev_dbg(ACRN_DBG_IRQ,
"IOAPIC pin=%d pirq=%d assigned to vm%d %s vpin=%d", "IOAPIC pin=%d pirq=%d assigned to vm%d %s vpin=%d",
phys_pin, phys_irq, entry->vm->attr.id, phys_pin, phys_irq, entry->vm->attr.id,
entry->intx.vpin_src == PTDEV_VPIN_PIC ? entry->ptdev_intr_info.intx.vpin_src == PTDEV_VPIN_PIC ?
"vPIC" : "vIOAPIC", entry->intx.virt_pin); "vPIC" : "vIOAPIC",
entry->ptdev_intr_info.intx.virt_pin);
} }
END: END:
return 0; return 0;
@ -1095,8 +1118,10 @@ static void get_entry_info(struct ptdev_remapping_info *entry, char *type,
if (is_entry_active(entry)) { if (is_entry_active(entry)) {
if (entry->type == PTDEV_INTR_MSI) { if (entry->type == PTDEV_INTR_MSI) {
strcpy_s(type, 16, "MSI"); strcpy_s(type, 16, "MSI");
*dest = (entry->msi.pmsi_addr & 0xFF000) >> 12; *dest = (entry->ptdev_intr_info.msi.pmsi_addr & 0xFF000)
if (entry->msi.pmsi_data & APIC_TRIGMOD_LEVEL) >> 12;
if (entry->ptdev_intr_info.msi.pmsi_data &
APIC_TRIGMOD_LEVEL)
*lvl_tm = true; *lvl_tm = true;
else else
*lvl_tm = false; *lvl_tm = false;
@ -1105,10 +1130,12 @@ static void get_entry_info(struct ptdev_remapping_info *entry, char *type,
*bdf = entry->phys_bdf; *bdf = entry->phys_bdf;
*vbdf = entry->virt_bdf; *vbdf = entry->virt_bdf;
} else { } else {
int phys_irq = pin_to_irq(entry->intx.phys_pin); int phys_irq = pin_to_irq(
entry->ptdev_intr_info.intx.phys_pin);
uint64_t rte = 0; uint64_t rte = 0;
if (entry->intx.vpin_src == PTDEV_VPIN_IOAPIC) if (entry->ptdev_intr_info.intx.vpin_src
== PTDEV_VPIN_IOAPIC)
strcpy_s(type, 16, "IOAPIC"); strcpy_s(type, 16, "IOAPIC");
else else
strcpy_s(type, 16, "PIC"); strcpy_s(type, 16, "PIC");
@ -1118,8 +1145,8 @@ static void get_entry_info(struct ptdev_remapping_info *entry, char *type,
*lvl_tm = true; *lvl_tm = true;
else else
*lvl_tm = false; *lvl_tm = false;
*pin = entry->intx.phys_pin; *pin = entry->ptdev_intr_info.intx.phys_pin;
*vpin = entry->intx.virt_pin; *vpin = entry->ptdev_intr_info.intx.virt_pin;
*bdf = 0; *bdf = 0;
*vbdf = 0; *vbdf = 0;
} }

6
hypervisor/arch/x86/gdt.c
View File

@ -46,9 +46,9 @@ static void set_tss_desc(union tss_64_descriptor *desc,
u3 = ((uint64_t)tss & 0x00FF0000) >> 16; u3 = ((uint64_t)tss & 0x00FF0000) >> 16;
desc->low32.value = u1 | (tss_limit & 0xFFFF); desc->fields.low32.value = u1 | (tss_limit & 0xFFFF);
desc->base_addr_63_32 = (uint32_t)((uint64_t)tss >> 32); desc->fields.base_addr_63_32 = (uint32_t)((uint64_t)tss >> 32);
desc->high32.value = (u2 | ((uint32_t)type << 8) | 0x8000 | u3); desc->fields.high32.value = (u2 | ((uint32_t)type << 8) | 0x8000 | u3);
} }
void load_gdtr_and_tr(void) void load_gdtr_and_tr(void)

24
hypervisor/arch/x86/trusty.c
View File

@ -52,7 +52,7 @@ struct trusty_mem {
struct { struct {
struct key_info key_info; struct key_info key_info;
struct trusty_startup_param startup_param; struct trusty_startup_param startup_param;
}; } data;
uint8_t page[CPU_PAGE_SIZE]; uint8_t page[CPU_PAGE_SIZE];
} first_page; } first_page;
@ -331,36 +331,38 @@ static bool setup_trusty_info(struct vcpu *vcpu,
{ {
uint32_t i; uint32_t i;
struct trusty_mem *mem; struct trusty_mem *mem;
struct key_info *key_info;
mem = (struct trusty_mem *)(HPA2HVA(mem_base_hpa)); mem = (struct trusty_mem *)(HPA2HVA(mem_base_hpa));
/* copy key_info to the first page of trusty memory */ /* copy key_info to the first page of trusty memory */
memcpy_s(&mem->first_page.key_info, sizeof(g_key_info), memcpy_s(&mem->first_page.data.key_info, sizeof(g_key_info),
&g_key_info, sizeof(g_key_info)); &g_key_info, sizeof(g_key_info));
memset(mem->first_page.key_info.dseed_list, 0, memset(mem->first_page.data.key_info.dseed_list, 0,
sizeof(mem->first_page.key_info.dseed_list)); sizeof(mem->first_page.data.key_info.dseed_list));
/* Derive dvseed from dseed for Trusty */ /* Derive dvseed from dseed for Trusty */
key_info = &mem->first_page.data.key_info;
for (i = 0; i < g_key_info.num_seeds; i++) { for (i = 0; i < g_key_info.num_seeds; i++) {
if (!hkdf_sha256(mem->first_page.key_info.dseed_list[i].seed, if (!hkdf_sha256(key_info->dseed_list[i].seed,
BUP_MKHI_BOOTLOADER_SEED_LEN, BUP_MKHI_BOOTLOADER_SEED_LEN,
g_key_info.dseed_list[i].seed, g_key_info.dseed_list[i].seed,
BUP_MKHI_BOOTLOADER_SEED_LEN, BUP_MKHI_BOOTLOADER_SEED_LEN,
NULL, 0, NULL, 0,
vcpu->vm->GUID, sizeof(vcpu->vm->GUID))) { vcpu->vm->GUID, sizeof(vcpu->vm->GUID))) {
memset(&mem->first_page.key_info, 0, memset(key_info, 0, sizeof(struct key_info));
sizeof(struct key_info));
pr_err("%s: derive dvseed failed!", __func__); pr_err("%s: derive dvseed failed!", __func__);
return false; return false;
} }
} }
/* Prepare trusty startup param */ /* Prepare trusty startup param */
mem->first_page.startup_param.size_of_this_struct = mem->first_page.data.startup_param.size_of_this_struct =
sizeof(struct trusty_startup_param); sizeof(struct trusty_startup_param);
mem->first_page.startup_param.mem_size = mem_size; mem->first_page.data.startup_param.mem_size = mem_size;
mem->first_page.startup_param.tsc_per_ms = CYCLES_PER_MS; mem->first_page.data.startup_param.tsc_per_ms = CYCLES_PER_MS;
mem->first_page.startup_param.trusty_mem_base = TRUSTY_EPT_REBASE_GPA; mem->first_page.data.startup_param.trusty_mem_base =
TRUSTY_EPT_REBASE_GPA;
/* According to trusty boot protocol, it will use RDI as the /* According to trusty boot protocol, it will use RDI as the
* address(GPA) of startup_param on boot. Currently, the startup_param * address(GPA) of startup_param on boot. Currently, the startup_param

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

@ -80,7 +80,7 @@ struct ptdev_remapping_info {
union { union {
struct ptdev_msi_info msi; struct ptdev_msi_info msi;
struct ptdev_intx_info intx; struct ptdev_intx_info intx;
}; } ptdev_intr_info;
}; };
void ptdev_intx_ack(struct vm *vm, int virt_pin, void ptdev_intx_ack(struct vm *vm, int virt_pin,

8
hypervisor/include/arch/x86/gdt.h
View File

@ -134,7 +134,7 @@ union code_segment_descriptor {
uint32_t base_31_24:8; uint32_t base_31_24:8;
} bits; } bits;
} high32; } high32;
}; } fields;
} __aligned(8); } __aligned(8);
/* /*
@ -169,7 +169,7 @@ union data_segment_descriptor {
uint32_t base_31_24:8; uint32_t base_31_24:8;
} bits; } bits;
} high32; } high32;
}; } fields;
} __aligned(8); } __aligned(8);
/* /*
@ -201,7 +201,7 @@ union system_segment_descriptor {
uint32_t base_31_24:8; uint32_t base_31_24:8;
} bits; } bits;
} high32; } high32;
}; } fields;
} __aligned(8); } __aligned(8);
/* /*
@ -242,7 +242,7 @@ union tss_64_descriptor {
uint32_t rsvd_31_13:20; uint32_t rsvd_31_13:20;
} bits; } bits;
} offset_12; } offset_12;
}; } fields;
} __aligned(8); } __aligned(8);
/***************************************************************************** /*****************************************************************************

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

@ -75,7 +75,7 @@ union idt_64_descriptor {
} high32; } high32;
uint32_t offset_63_32; uint32_t offset_63_32;
uint32_t rsvd; uint32_t rsvd;
}; } fields;
} __aligned(8); } __aligned(8);
/***************************************************************************** /*****************************************************************************

40
hypervisor/include/debug/trace.h
View File

@ -81,19 +81,19 @@ struct trace_entry {
union { union {
struct { struct {
uint32_t a, b, c, d; uint32_t a, b, c, d;
}; } fields_32;
struct { struct {
uint8_t a1, a2, a3, a4; uint8_t a1, a2, a3, a4;
uint8_t b1, b2, b3, b4; uint8_t b1, b2, b3, b4;
uint8_t c1, c2, c3, c4; uint8_t c1, c2, c3, c4;
uint8_t d1, d2, d3, d4; uint8_t d1, d2, d3, d4;
}; } fields_8;
struct { struct {
uint64_t e; uint64_t e;
uint64_t f; uint64_t f;
}; } fields_64;
char str[16]; char str[16];
}; } payload;
} __attribute__((aligned(8))); } __attribute__((aligned(8)));
static inline bool static inline bool
@ -128,8 +128,8 @@ TRACE_2L(int evid, uint64_t e, uint64_t f)
if (!trace_check(cpu_id, evid)) if (!trace_check(cpu_id, evid))
return; return;
entry.e = e; entry.payload.fields_64.e = e;
entry.f = f; entry.payload.fields_64.f = f;
_trace_put(cpu_id, evid, &entry); _trace_put(cpu_id, evid, &entry);
} }
@ -143,10 +143,10 @@ TRACE_4I(int evid, uint32_t a, uint32_t b, uint32_t c,
if (!trace_check(cpu_id, evid)) if (!trace_check(cpu_id, evid))
return; return;
entry.a = a; entry.payload.fields_32.a = a;
entry.b = b; entry.payload.fields_32.b = b;
entry.c = c; entry.payload.fields_32.c = c;
entry.d = d; entry.payload.fields_32.d = d;
_trace_put(cpu_id, evid, &entry); _trace_put(cpu_id, evid, &entry);
} }
@ -160,12 +160,12 @@ TRACE_6C(int evid, uint8_t a1, uint8_t a2, uint8_t a3,
if (!trace_check(cpu_id, evid)) if (!trace_check(cpu_id, evid))
return; return;
entry.a1 = a1; entry.payload.fields_8.a1 = a1;
entry.a2 = a2; entry.payload.fields_8.a2 = a2;
entry.a3 = a3; entry.payload.fields_8.a3 = a3;
entry.a4 = a4; entry.payload.fields_8.a4 = a4;
entry.b1 = b1; entry.payload.fields_8.b1 = b1;
entry.b2 = b2; entry.payload.fields_8.b2 = b2;
_trace_put(cpu_id, evid, &entry); _trace_put(cpu_id, evid, &entry);
} }
@ -183,15 +183,15 @@ TRACE_16STR(int evid, const char name[])
if (!trace_check(cpu_id, evid)) if (!trace_check(cpu_id, evid))
return; return;
entry.e = 0; entry.payload.fields_64.e = 0;
entry.f = 0; entry.payload.fields_64.f = 0;
len = strnlen_s(name, 20); len = strnlen_s(name, 20);
len = (len > 16) ? 16 : len; len = (len > 16) ? 16 : len;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
entry.str[i] = name[i]; entry.payload.str[i] = name[i];
entry.str[15] = 0; entry.payload.str[15] = 0;
_trace_put(cpu_id, evid, &entry); _trace_put(cpu_id, evid, &entry);
} }