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

hv: ptdev: minor refine about ptirq_build_physical_msi

Browse Source 
The virtual MSI information could be included in ptirq_remapping_info structrue,
there's no need to pass another input paramater for this puepose. So we could
remove the ptirq_msi_info input.

Tracked-On: #4550
Signed-off-by: Li Fei1 <fei1.li@intel.com>
This commit is contained in:
Li Fei1 2020-04-30 11:06:02 +08:00 committed by wenlingz
parent 73335b7276
commit 0c6b3e57d6
6 changed files with 66 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
hypervisor/arch/x86/guest/assign.c
View File

@ -25,21 +25,21 @@
* *
* @pre (vm != NULL) && (info != NULL) * @pre (vm != NULL) && (info != NULL)
*/ */
static struct acrn_vcpu *is_single_destination(struct acrn_vm *vm, const struct ptirq_msi_info *info) static struct acrn_vcpu *is_single_destination(struct acrn_vm *vm, const struct msi_info *info)
{ {
uint64_t vdmask; uint64_t vdmask;
uint16_t vid; uint16_t vid;
struct acrn_vcpu *vcpu = NULL; struct acrn_vcpu *vcpu = NULL;
vlapic_calc_dest(vm, &vdmask, false, (uint32_t)(info->vmsi_addr.bits.dest_field), vlapic_calc_dest(vm, &vdmask, false, (uint32_t)(info->addr.bits.dest_field),
(bool)(info->vmsi_addr.bits.dest_mode == MSI_ADDR_DESTMODE_PHYS), (bool)(info->addr.bits.dest_mode == MSI_ADDR_DESTMODE_PHYS),
(bool)(info->vmsi_data.bits.delivery_mode == MSI_DATA_DELMODE_LOPRI)); (bool)(info->data.bits.delivery_mode == MSI_DATA_DELMODE_LOPRI));
vid = ffs64(vdmask); vid = ffs64(vdmask);
/* Can only post fixed and Lowpri IRQs */ /* Can only post fixed and Lowpri IRQs */
if ((info->vmsi_data.bits.delivery_mode == MSI_DATA_DELMODE_FIXED) if ((info->data.bits.delivery_mode == MSI_DATA_DELMODE_FIXED)
|| (info->vmsi_data.bits.delivery_mode == MSI_DATA_DELMODE_LOPRI)) { || (info->data.bits.delivery_mode == MSI_DATA_DELMODE_LOPRI)) {
/* Can only post single-destination IRQs */ /* Can only post single-destination IRQs */
if (vdmask == (1UL << vid)) { if (vdmask == (1UL << vid)) {
vcpu = vcpu_from_vid(vm, vid); vcpu = vcpu_from_vid(vm, vid);
@ -122,8 +122,8 @@ static void ptirq_free_irte(const struct ptirq_remapping_info *entry)
* pid_paddr != 0: physical address of posted interrupt descriptor, indicate * pid_paddr != 0: physical address of posted interrupt descriptor, indicate
* that posted mode shall be used * that posted mode shall be used
*/ */
static void ptirq_build_physical_msi(struct acrn_vm *vm, struct ptirq_msi_info *info, static void ptirq_build_physical_msi(struct acrn_vm *vm,
const struct ptirq_remapping_info *entry, uint32_t vector, uint64_t pid_paddr) struct ptirq_remapping_info *entry, uint32_t vector, uint64_t pid_paddr)
{ {
uint64_t vdmask, pdmask; uint64_t vdmask, pdmask;
uint32_t dest, delmode, dest_mask; uint32_t dest, delmode, dest_mask;
@ -134,14 +134,14 @@ static void ptirq_build_physical_msi(struct acrn_vm *vm, struct ptirq_msi_info *
struct intr_source intr_src; struct intr_source intr_src;
/* get physical destination cpu mask */ /* get physical destination cpu mask */
dest = info->vmsi_addr.bits.dest_field; dest = entry->vmsi.addr.bits.dest_field;
phys = (info->vmsi_addr.bits.dest_mode == MSI_ADDR_DESTMODE_PHYS); phys = (entry->vmsi.addr.bits.dest_mode == MSI_ADDR_DESTMODE_PHYS);
vlapic_calc_dest(vm, &vdmask, false, dest, phys, false); vlapic_calc_dest(vm, &vdmask, false, dest, phys, false);
pdmask = vcpumask2pcpumask(vm, vdmask); pdmask = vcpumask2pcpumask(vm, vdmask);
/* get physical delivery mode */ /* get physical delivery mode */
delmode = info->vmsi_data.bits.delivery_mode; delmode = entry->vmsi.data.bits.delivery_mode;
if ((delmode != MSI_DATA_DELMODE_FIXED) && (delmode != MSI_DATA_DELMODE_LOPRI)) { if ((delmode != MSI_DATA_DELMODE_FIXED) && (delmode != MSI_DATA_DELMODE_LOPRI)) {
delmode = MSI_DATA_DELMODE_LOPRI; delmode = MSI_DATA_DELMODE_LOPRI;
} }
@ -168,32 +168,32 @@ static void ptirq_build_physical_msi(struct acrn_vm *vm, struct ptirq_msi_info *
* SHV is set to 0 as ACRN disables MMC (Multi-Message Capable * SHV is set to 0 as ACRN disables MMC (Multi-Message Capable
* for MSI devices. * for MSI devices.
*/ */
info->pmsi_data.full = 0U; entry->pmsi.data.full = 0U;
ir_index.index = (uint16_t)entry->allocated_pirq; ir_index.index = (uint16_t)entry->allocated_pirq;
info->pmsi_addr.full = 0UL; entry->pmsi.addr.full = 0UL;
info->pmsi_addr.ir_bits.intr_index_high = ir_index.bits.index_high; entry->pmsi.addr.ir_bits.intr_index_high = ir_index.bits.index_high;
info->pmsi_addr.ir_bits.shv = 0U; entry->pmsi.addr.ir_bits.shv = 0U;
info->pmsi_addr.ir_bits.intr_format = 0x1U; entry->pmsi.addr.ir_bits.intr_format = 0x1U;
info->pmsi_addr.ir_bits.intr_index_low = ir_index.bits.index_low; entry->pmsi.addr.ir_bits.intr_index_low = ir_index.bits.index_low;
info->pmsi_addr.ir_bits.constant = 0xFEEU; entry->pmsi.addr.ir_bits.constant = 0xFEEU;
} else { } else {
/* In case there is no corresponding IOMMU, for example, if the /* In case there is no corresponding IOMMU, for example, if the
* IOMMU is ignored, pass the MSI info in Compatibility Format * IOMMU is ignored, pass the MSI info in Compatibility Format
*/ */
info->pmsi_data = info->vmsi_data; entry->pmsi.data = entry->vmsi.data;
info->pmsi_data.bits.delivery_mode = delmode; entry->pmsi.data.bits.delivery_mode = delmode;
info->pmsi_data.bits.vector = vector; entry->pmsi.data.bits.vector = vector;
info->pmsi_addr = info->vmsi_addr; entry->pmsi.addr = entry->vmsi.addr;
info->pmsi_addr.bits.dest_field = dest_mask; entry->pmsi.addr.bits.dest_field = dest_mask;
info->pmsi_addr.bits.rh = MSI_ADDR_RH; entry->pmsi.addr.bits.rh = MSI_ADDR_RH;
info->pmsi_addr.bits.dest_mode = MSI_ADDR_DESTMODE_LOGICAL; entry->pmsi.addr.bits.dest_mode = MSI_ADDR_DESTMODE_LOGICAL;
} }
dev_dbg(DBG_LEVEL_IRQ, "MSI %s addr:data = 0x%lx:%x(V) -> 0x%lx:%x(P)", dev_dbg(DBG_LEVEL_IRQ, "MSI %s addr:data = 0x%lx:%x(V) -> 0x%lx:%x(P)",
(info->pmsi_addr.ir_bits.intr_format != 0U) ? " Remappable Format" : "Compatibility Format", (entry->pmsi.addr.ir_bits.intr_format != 0U) ? " Remappable Format" : "Compatibility Format",
info->vmsi_addr.full, info->vmsi_data.full, entry->vmsi.addr.full, entry->vmsi.data.full,
info->pmsi_addr.full, info->pmsi_data.full); entry->pmsi.addr.full, entry->pmsi.data.full);
} }
static union ioapic_rte static union ioapic_rte
@ -539,13 +539,13 @@ void ptirq_softirq(uint16_t pcpu_id)
{ {
while (1) { while (1) {
struct ptirq_remapping_info *entry = ptirq_dequeue_softirq(pcpu_id); struct ptirq_remapping_info *entry = ptirq_dequeue_softirq(pcpu_id);
struct ptirq_msi_info *msi; struct msi_info *vmsi;
if (entry == NULL) { if (entry == NULL) {
break; break;
} }
msi = &entry->msi; vmsi = &entry->vmsi;
/* skip any inactive entry */ /* skip any inactive entry */
if (!is_entry_active(entry)) { if (!is_entry_active(entry)) {
@ -557,16 +557,14 @@ void ptirq_softirq(uint16_t pcpu_id)
if (entry->intr_type == PTDEV_INTR_INTX) { if (entry->intr_type == PTDEV_INTR_INTX) {
ptirq_handle_intx(entry->vm, entry); ptirq_handle_intx(entry->vm, entry);
} else { } else {
if (msi != NULL) { if (vmsi != NULL) {
/* TODO: msi destmode check required */ /* TODO: vmsi destmode check required */
(void)vlapic_intr_msi(entry->vm, msi->vmsi_addr.full, msi->vmsi_data.full); (void)vlapic_intr_msi(entry->vm, vmsi->addr.full, vmsi->data.full);
dev_dbg(DBG_LEVEL_PTIRQ, "dev-assign: irq=0x%x MSI VR: 0x%x-0x%x", dev_dbg(DBG_LEVEL_PTIRQ, "dev-assign: irq=0x%x MSI VR: 0x%x-0x%x",
entry->allocated_pirq, entry->allocated_pirq, vmsi->data.bits.vector,
msi->vmsi_data.bits.vector,
irq_to_vector(entry->allocated_pirq)); irq_to_vector(entry->allocated_pirq));
dev_dbg(DBG_LEVEL_PTIRQ, " vmsi_addr: 0x%lx vmsi_data: 0x%x", dev_dbg(DBG_LEVEL_PTIRQ, " vmsi_addr: 0x%lx vmsi_data: 0x%x",
msi->vmsi_addr.full, vmsi->addr.full, vmsi->data.full);
msi->vmsi_data.full);
} }
} }
} }
@ -618,7 +616,7 @@ void ptirq_intx_ack(struct acrn_vm *vm, uint32_t virt_gsi, enum intx_ctlr vgsi_c
* user must provide bdf and entry_nr * user must provide bdf and entry_nr
*/ */
int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf, int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
uint16_t entry_nr, struct ptirq_msi_info *info) uint16_t entry_nr, struct msi_info *info)
{ {
struct ptirq_remapping_info *entry; struct ptirq_remapping_info *entry;
DEFINE_MSI_SID(virt_sid, virt_bdf, entry_nr); DEFINE_MSI_SID(virt_sid, virt_bdf, entry_nr);
@ -641,6 +639,8 @@ int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t
if (entry != NULL) { if (entry != NULL) {
ret = 0; ret = 0;
entry->vmsi = *info;
/* build physical config MSI, update to info->pmsi_xxx */ /* build physical config MSI, update to info->pmsi_xxx */
if (is_lapic_pt_configured(vm)) { if (is_lapic_pt_configured(vm)) {
enum vm_vlapic_state vlapic_state = check_vm_vlapic_state(vm); enum vm_vlapic_state vlapic_state = check_vm_vlapic_state(vm);
@ -650,13 +650,13 @@ int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t
* All the vCPUs are in x2APIC mode and LAPIC is Pass-through * All the vCPUs are in x2APIC mode and LAPIC is Pass-through
* Use guest vector to program the interrupt source * Use guest vector to program the interrupt source
*/ */
ptirq_build_physical_msi(vm, info, entry, (uint32_t)info->vmsi_data.bits.vector, 0UL); ptirq_build_physical_msi(vm, entry, (uint32_t)info->data.bits.vector, 0UL);
} else if (vlapic_state == VM_VLAPIC_XAPIC) { } else if (vlapic_state == VM_VLAPIC_XAPIC) {
/* /*
* All the vCPUs are in xAPIC mode and LAPIC is emulated * All the vCPUs are in xAPIC mode and LAPIC is emulated
* Use host vector to program the interrupt source * Use host vector to program the interrupt source
*/ */
ptirq_build_physical_msi(vm, info, entry, irq_to_vector(entry->allocated_pirq), 0UL); ptirq_build_physical_msi(vm, entry, irq_to_vector(entry->allocated_pirq), 0UL);
} else if (vlapic_state == VM_VLAPIC_TRANSITION) { } else if (vlapic_state == VM_VLAPIC_TRANSITION) {
/* /*
* vCPUs are in middle of transition, so do not program interrupt source * vCPUs are in middle of transition, so do not program interrupt source
@ -673,19 +673,19 @@ int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t
struct acrn_vcpu *vcpu = is_single_destination(vm, info); struct acrn_vcpu *vcpu = is_single_destination(vm, info);
if (is_pi_capable(vm) && (vcpu != NULL)) { if (is_pi_capable(vm) && (vcpu != NULL)) {
ptirq_build_physical_msi(vm, info, entry, ptirq_build_physical_msi(vm, entry,
(uint32_t)info->vmsi_data.bits.vector, hva2hpa(get_pi_desc(vcpu))); (uint32_t)info->data.bits.vector, hva2hpa(get_pi_desc(vcpu)));
} else { } else {
/* Go with remapped mode if we cannot handle it in posted mode */ /* Go with remapped mode if we cannot handle it in posted mode */
ptirq_build_physical_msi(vm, info, entry, irq_to_vector(entry->allocated_pirq), 0UL); ptirq_build_physical_msi(vm, entry, irq_to_vector(entry->allocated_pirq), 0UL);
} }
} }
if (ret == 0) { if (ret == 0) {
entry->msi = *info; *info = entry->pmsi;
vbdf.value = virt_bdf; vbdf.value = virt_bdf;
dev_dbg(DBG_LEVEL_IRQ, "PCI %x:%x.%x MSI VR[%d] 0x%x->0x%x assigned to vm%d", dev_dbg(DBG_LEVEL_IRQ, "PCI %x:%x.%x MSI VR[%d] 0x%x->0x%x assigned to vm%d",
vbdf.bits.b, vbdf.bits.d, vbdf.bits.f, entry_nr, info->vmsi_data.bits.vector, vbdf.bits.b, vbdf.bits.d, vbdf.bits.f, entry_nr, entry->vmsi.data.bits.vector,
irq_to_vector(entry->allocated_pirq), entry->vm->vm_id); irq_to_vector(entry->allocated_pirq), entry->vm->vm_id);
} }
} }

4
hypervisor/debug/shell.c
View File

@ -1059,8 +1059,8 @@ static void get_entry_info(const struct ptirq_remapping_info *entry, char *type,
if (is_entry_active(entry)) { if (is_entry_active(entry)) {
if (entry->intr_type == PTDEV_INTR_MSI) { if (entry->intr_type == PTDEV_INTR_MSI) {
(void)strncpy_s(type, 16U, "MSI", 16U); (void)strncpy_s(type, 16U, "MSI", 16U);
*dest = entry->msi.pmsi_addr.bits.dest_field; *dest = entry->pmsi.addr.bits.dest_field;
if (entry->msi.pmsi_data.bits.trigger_mode == MSI_DATA_TRGRMODE_LEVEL) { if (entry->pmsi.data.bits.trigger_mode == MSI_DATA_TRGRMODE_LEVEL) {
*lvl_tm = true; *lvl_tm = true;
} else { } else {
*lvl_tm = false; *lvl_tm = false;

14
hypervisor/dm/vpci/vmsi.c
View File

@ -62,7 +62,7 @@ static inline void enable_disable_msi(const struct pci_vdev *vdev, bool enable)
*/ */
static void remap_vmsi(const struct pci_vdev *vdev) static void remap_vmsi(const struct pci_vdev *vdev)
{ {
struct ptirq_msi_info info = {}; struct msi_info info = {};
union pci_bdf pbdf = vdev->pdev->bdf; union pci_bdf pbdf = vdev->pdev->bdf;
struct acrn_vm *vm = vpci2vm(vdev->vpci); struct acrn_vm *vm = vpci2vm(vdev->vpci);
uint32_t capoff = vdev->msi.capoff; uint32_t capoff = vdev->msi.capoff;
@ -76,17 +76,17 @@ static void remap_vmsi(const struct pci_vdev *vdev)
} else { } else {
vmsi_msgdata = pci_vdev_read_vcfg(vdev, (capoff + PCIR_MSI_DATA), 2U); vmsi_msgdata = pci_vdev_read_vcfg(vdev, (capoff + PCIR_MSI_DATA), 2U);
} }
info.vmsi_addr.full = (uint64_t)vmsi_addrlo | ((uint64_t)vmsi_addrhi << 32U); info.addr.full = (uint64_t)vmsi_addrlo | ((uint64_t)vmsi_addrhi << 32U);
info.vmsi_data.full = vmsi_msgdata; info.data.full = vmsi_msgdata;
if (ptirq_prepare_msix_remap(vm, vdev->bdf.value, pbdf.value, 0U, &info) == 0) { if (ptirq_prepare_msix_remap(vm, vdev->bdf.value, pbdf.value, 0U, &info) == 0) {
pci_pdev_write_cfg(pbdf, capoff + PCIR_MSI_ADDR, 0x4U, (uint32_t)info.pmsi_addr.full); pci_pdev_write_cfg(pbdf, capoff + PCIR_MSI_ADDR, 0x4U, (uint32_t)info.addr.full);
if (vdev->msi.is_64bit) { if (vdev->msi.is_64bit) {
pci_pdev_write_cfg(pbdf, capoff + PCIR_MSI_ADDR_HIGH, 0x4U, pci_pdev_write_cfg(pbdf, capoff + PCIR_MSI_ADDR_HIGH, 0x4U,
(uint32_t)(info.pmsi_addr.full >> 32U)); (uint32_t)(info.addr.full >> 32U));
pci_pdev_write_cfg(pbdf, capoff + PCIR_MSI_DATA_64BIT, 0x2U, (uint16_t)info.pmsi_data.full); pci_pdev_write_cfg(pbdf, capoff + PCIR_MSI_DATA_64BIT, 0x2U, (uint16_t)info.data.full);
} else { } else {
pci_pdev_write_cfg(pbdf, capoff + PCIR_MSI_DATA, 0x2U, (uint16_t)info.pmsi_data.full); pci_pdev_write_cfg(pbdf, capoff + PCIR_MSI_DATA, 0x2U, (uint16_t)info.data.full);
} }
/* If MSI Enable is being set, make sure INTxDIS bit is set */ /* If MSI Enable is being set, make sure INTxDIS bit is set */

12
hypervisor/dm/vpci/vmsix.c
View File

@ -79,14 +79,14 @@ static void remap_one_vmsix_entry(const struct pci_vdev *vdev, uint32_t index)
{ {
const struct msix_table_entry *ventry; const struct msix_table_entry *ventry;
struct msix_table_entry *pentry; struct msix_table_entry *pentry;
struct ptirq_msi_info info = {}; struct msi_info info = {};
int32_t ret; int32_t ret;
mask_one_msix_vector(vdev, index); mask_one_msix_vector(vdev, index);
ventry = &vdev->msix.table_entries[index]; ventry = &vdev->msix.table_entries[index];
if ((ventry->vector_control & PCIM_MSIX_VCTRL_MASK) == 0U) { if ((ventry->vector_control & PCIM_MSIX_VCTRL_MASK) == 0U) {
info.vmsi_addr.full = vdev->msix.table_entries[index].addr; info.addr.full = vdev->msix.table_entries[index].addr;
info.vmsi_data.full = vdev->msix.table_entries[index].data; info.data.full = vdev->msix.table_entries[index].data;
ret = ptirq_prepare_msix_remap(vpci2vm(vdev->vpci), vdev->bdf.value, vdev->pdev->bdf.value, (uint16_t)index, &info); ret = ptirq_prepare_msix_remap(vpci2vm(vdev->vpci), vdev->bdf.value, vdev->pdev->bdf.value, (uint16_t)index, &info);
if (ret == 0) { if (ret == 0) {
@ -99,10 +99,10 @@ static void remap_one_vmsix_entry(const struct pci_vdev *vdev, uint32_t index)
* write only * write only
*/ */
stac(); stac();
mmio_write32((uint32_t)(info.pmsi_addr.full), (void *)&(pentry->addr)); mmio_write32((uint32_t)(info.addr.full), (void *)&(pentry->addr));
mmio_write32((uint32_t)(info.pmsi_addr.full >> 32U), (void *)((char *)&(pentry->addr) + 4U)); mmio_write32((uint32_t)(info.addr.full >> 32U), (void *)((char *)&(pentry->addr) + 4U));
mmio_write32(info.pmsi_data.full, (void *)&(pentry->data)); mmio_write32(info.data.full, (void *)&(pentry->data));
mmio_write32(vdev->msix.table_entries[index].vector_control, (void *)&(pentry->vector_control)); mmio_write32(vdev->msix.table_entries[index].vector_control, (void *)&(pentry->vector_control));
clac(); clac();
} }

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

@ -62,7 +62,7 @@ void ptirq_intx_ack(struct acrn_vm *vm, uint32_t virt_gsi, enum intx_ctlr vgsi_c
* *
*/ */
int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf, int32_t ptirq_prepare_msix_remap(struct acrn_vm *vm, uint16_t virt_bdf, uint16_t phys_bdf,
uint16_t entry_nr, struct ptirq_msi_info *info); uint16_t entry_nr, struct msi_info *info);
/** /**

12
hypervisor/include/common/ptdev.h
View File

@ -106,12 +106,9 @@ union msi_data_reg {
} bits __packed; } bits __packed;
}; };
/* entry per guest virt vector */ struct msi_info {
struct ptirq_msi_info { union msi_addr_reg addr;
union msi_addr_reg vmsi_addr; /* virt msi_addr */ union msi_data_reg data;
union msi_data_reg vmsi_data; /* virt msi_data */
union msi_addr_reg pmsi_addr; /* phys msi_addr */
union msi_data_reg pmsi_data; /* phys msi_data */
}; };
struct ptirq_remapping_info; struct ptirq_remapping_info;
@ -132,7 +129,8 @@ struct ptirq_remapping_info {
uint32_t allocated_pirq; uint32_t allocated_pirq;
uint32_t polarity; /* 0=active high, 1=active low*/ uint32_t polarity; /* 0=active high, 1=active low*/
struct list_head softirq_node; struct list_head softirq_node;
struct ptirq_msi_info msi; struct msi_info vmsi;
struct msi_info pmsi;
uint64_t intr_count; uint64_t intr_count;
struct hv_timer intr_delay_timer; /* used for delay intr injection */ struct hv_timer intr_delay_timer; /* used for delay intr injection */