| Message ID | 1456486323-8047-10-git-send-email-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/26/2016 10:32 PM, David Gibson wrote: > Now that the EEH code is independent of the special > spapr-vfio-pci-host-bridge device, we can allow it on all spapr PCI > host bridges instead. We do this by changing spapr_phb_eeh_available() > to be based on the vfio_eeh_as_ok() call instead of the host bridge class. > > Because the value of vfio_eeh_as_ok() can change with devices being > hotplugged or unplugged, this can potentially lead to some strange edge > cases where the guest starts using EEH, then it starts failing because > of a change in status. > > However, it's not really any worse than the current situation. Cases that > would have worked previously will still work (i.e. VFIO devices from at > most one VFIO IOMMU group per vPHB), it's just that it's no longer > necessary to use spapr-vfio-pci-host-bridge with the groupid pre-specified. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > hw/ppc/spapr_pci.c | 5 +---- > hw/ppc/spapr_pci_vfio.c | 1 - > include/hw/pci-host/spapr.h | 1 - > 3 files changed, 1 insertion(+), 6 deletions(-) > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index be18bf6..336ffd2 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -97,9 +97,7 @@ PCIDevice *spapr_pci_find_dev(sPAPRMachineState *spapr, uint64_t buid, > > static bool spapr_phb_eeh_available(sPAPRPHBState *sphb) > { > - sPAPRPHBClass *spc = SPAPR_PCI_HOST_BRIDGE_GET_CLASS(sphb); > - > - return spc->eeh_available; > + return vfio_eeh_as_ok(&sphb->iommu_as); > } > > static uint32_t rtas_pci_cfgaddr(uint32_t arg) > @@ -1680,7 +1678,6 @@ static void spapr_phb_class_init(ObjectClass *klass, void *data) > set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); > dc->cannot_instantiate_with_device_add_yet = false; > spc->finish_realize = spapr_phb_finish_realize; > - spc->eeh_available = false; > hp->plug = spapr_phb_hot_plug_child; > hp->unplug = spapr_phb_hot_unplug_child; > } > diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c > index 0a0f31a..ecbcc5c 100644 > --- a/hw/ppc/spapr_pci_vfio.c > +++ b/hw/ppc/spapr_pci_vfio.c > @@ -80,7 +80,6 @@ static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) > > dc->props = spapr_phb_vfio_properties; > spc->finish_realize = spapr_phb_vfio_finish_realize; > - spc->eeh_available = true; > } > > static const TypeInfo spapr_phb_vfio_info = { > diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h > index d32750e..9313209 100644 > --- a/include/hw/pci-host/spapr.h > +++ b/include/hw/pci-host/spapr.h > @@ -49,7 +49,6 @@ struct sPAPRPHBClass { > PCIHostBridgeClass parent_class; > > void (*finish_realize)(sPAPRPHBState *sphb, Error **errp); > - bool eeh_available; > }; > > typedef struct spapr_pci_msi { >
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index be18bf6..336ffd2 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -97,9 +97,7 @@ PCIDevice *spapr_pci_find_dev(sPAPRMachineState *spapr, uint64_t buid, static bool spapr_phb_eeh_available(sPAPRPHBState *sphb) { - sPAPRPHBClass *spc = SPAPR_PCI_HOST_BRIDGE_GET_CLASS(sphb); - - return spc->eeh_available; + return vfio_eeh_as_ok(&sphb->iommu_as); } static uint32_t rtas_pci_cfgaddr(uint32_t arg) @@ -1680,7 +1678,6 @@ static void spapr_phb_class_init(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); dc->cannot_instantiate_with_device_add_yet = false; spc->finish_realize = spapr_phb_finish_realize; - spc->eeh_available = false; hp->plug = spapr_phb_hot_plug_child; hp->unplug = spapr_phb_hot_unplug_child; } diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 0a0f31a..ecbcc5c 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -80,7 +80,6 @@ static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) dc->props = spapr_phb_vfio_properties; spc->finish_realize = spapr_phb_vfio_finish_realize; - spc->eeh_available = true; } static const TypeInfo spapr_phb_vfio_info = { diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index d32750e..9313209 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -49,7 +49,6 @@ struct sPAPRPHBClass { PCIHostBridgeClass parent_class; void (*finish_realize)(sPAPRPHBState *sphb, Error **errp); - bool eeh_available; }; typedef struct spapr_pci_msi {
Now that the EEH code is independent of the special spapr-vfio-pci-host-bridge device, we can allow it on all spapr PCI host bridges instead. We do this by changing spapr_phb_eeh_available() to be based on the vfio_eeh_as_ok() call instead of the host bridge class. Because the value of vfio_eeh_as_ok() can change with devices being hotplugged or unplugged, this can potentially lead to some strange edge cases where the guest starts using EEH, then it starts failing because of a change in status. However, it's not really any worse than the current situation. Cases that would have worked previously will still work (i.e. VFIO devices from at most one VFIO IOMMU group per vPHB), it's just that it's no longer necessary to use spapr-vfio-pci-host-bridge with the groupid pre-specified. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/ppc/spapr_pci.c | 5 +---- hw/ppc/spapr_pci_vfio.c | 1 - include/hw/pci-host/spapr.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-)