qemu-xen: free all the pirqs for msi/msix when driver unload
Pirqs are not freed when driver unload, then new pirqs are allocated when driver reload. This could exhaust pirqs if do it in a loop. This patch fixes the bug by freeing pirqs when ENABLE bit is cleared in msi/msix control reg. There is also other way of fixing it such as reuse pirqs between driver reload, but this way is better. Xen-devel: http://marc.info/?l=xen-devel&m=136800120304275&w=2 Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
parent
fe680d0dac
commit
c976437c7d
|
@ -1123,8 +1123,8 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s,
|
||||||
msi->mapped = true;
|
msi->mapped = true;
|
||||||
}
|
}
|
||||||
msi->flags |= PCI_MSI_FLAGS_ENABLE;
|
msi->flags |= PCI_MSI_FLAGS_ENABLE;
|
||||||
} else {
|
} else if (msi->mapped) {
|
||||||
msi->flags &= ~PCI_MSI_FLAGS_ENABLE;
|
xen_pt_msi_disable(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* pass through MSI_ENABLE bit */
|
/* pass through MSI_ENABLE bit */
|
||||||
|
@ -1397,6 +1397,8 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s,
|
||||||
if ((*val & PCI_MSIX_FLAGS_ENABLE)
|
if ((*val & PCI_MSIX_FLAGS_ENABLE)
|
||||||
&& !(*val & PCI_MSIX_FLAGS_MASKALL)) {
|
&& !(*val & PCI_MSIX_FLAGS_MASKALL)) {
|
||||||
xen_pt_msix_update(s);
|
xen_pt_msix_update(s);
|
||||||
|
} else if (!(*val & PCI_MSIX_FLAGS_ENABLE) && s->msix->enabled) {
|
||||||
|
xen_pt_msix_disable(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
debug_msix_enabled_old = s->msix->enabled;
|
debug_msix_enabled_old = s->msix->enabled;
|
||||||
|
|
|
@ -282,7 +282,8 @@ void xen_pt_msi_disable(XenPCIPassthroughState *s)
|
||||||
msi->initialized);
|
msi->initialized);
|
||||||
|
|
||||||
/* clear msi info */
|
/* clear msi info */
|
||||||
msi->flags = 0;
|
msi->flags &= ~PCI_MSI_FLAGS_ENABLE;
|
||||||
|
msi->initialized = false;
|
||||||
msi->mapped = false;
|
msi->mapped = false;
|
||||||
msi->pirq = XEN_PT_UNASSIGNED_PIRQ;
|
msi->pirq = XEN_PT_UNASSIGNED_PIRQ;
|
||||||
}
|
}
|
||||||
|
@ -446,7 +447,8 @@ static void pci_msix_write(void *opaque, hwaddr addr,
|
||||||
if (offset != PCI_MSIX_ENTRY_VECTOR_CTRL) {
|
if (offset != PCI_MSIX_ENTRY_VECTOR_CTRL) {
|
||||||
const volatile uint32_t *vec_ctrl;
|
const volatile uint32_t *vec_ctrl;
|
||||||
|
|
||||||
if (get_entry_value(entry, offset) == val) {
|
if (get_entry_value(entry, offset) == val
|
||||||
|
&& entry->pirq != XEN_PT_UNASSIGNED_PIRQ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue