[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 06/10] add check reset mechanism when hotplug vf
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [PATCH 06/10] add check reset mechanism when hotplug vfio device |
Date: |
Wed, 17 Feb 2016 17:55:26 +0200 |
On Wed, Feb 17, 2016 at 06:43:50PM +0800, Cao jin wrote:
> From: Chen Fan <address@hidden>
>
> Since we support multi-function hotplug, the function 0 indicates
> the closure of the slot, so we have the chance to do the check.
>
> Signed-off-by: Chen Fan <address@hidden>
I think I prefer doing it differently: when function is added, query all
existing functions on same device. Do it with a new callback, not a
notifier.
In any case, I suggest these checks should come later.
At this stage, complete aer functionality simply assuming setup is correct
and all functions are combined in the same way as on the host.
> ---
> hw/pci/pci.c | 29 +++++++++++++++++++++++++++++
> hw/vfio/pci.c | 19 +++++++++++++++++++
> hw/vfio/pci.h | 2 ++
> include/hw/pci/pci_bus.h | 5 +++++
> 4 files changed, 55 insertions(+)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index d940f79..e41925e 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -82,6 +82,7 @@ static void pci_bus_realize(BusState *qbus, Error **errp)
> PCIBus *bus = PCI_BUS(qbus);
>
> vmstate_register(NULL, -1, &vmstate_pcibus, bus);
> + notifier_with_return_list_init(&bus->hotplug_notifiers);
> }
>
> static void pci_bus_unrealize(BusState *qbus, Error **errp)
> @@ -1836,6 +1837,22 @@ PCIDevice *pci_find_device(PCIBus *bus, int bus_num,
> uint8_t devfn)
> return bus->devices[devfn];
> }
>
> +void pci_bus_add_hotplug_notifier(PCIBus *bus, NotifierWithReturn *notify)
> +{
> + notifier_with_return_list_add(&bus->hotplug_notifiers, notify);
> +}
> +
> +void pci_bus_remove_hotplug_notifier(NotifierWithReturn *notifier)
> +{
> + notifier_with_return_remove(notifier);
> +}
> +
> +static int pci_bus_hotplug_notifier(PCIBus *bus, void *opaque)
> +{
> + return notifier_with_return_list_notify(&bus->hotplug_notifiers,
> + opaque);
> +}
> +
> static void pci_qdev_realize(DeviceState *qdev, Error **errp)
> {
> PCIDevice *pci_dev = (PCIDevice *)qdev;
> @@ -1878,6 +1895,18 @@ static void pci_qdev_realize(DeviceState *qdev, Error
> **errp)
> pci_qdev_unrealize(DEVICE(pci_dev), NULL);
> return;
> }
> +
> + /*
> + * If the function is func 0, indicate the closure of the slot.
> + * signal the callback.
> + */
> + if (DEVICE(pci_dev)->hotplugged &&
> + pci_get_function_0(pci_dev) == pci_dev &&
> + pci_bus_hotplug_notifier(bus, pci_dev)) {
> + error_setg(errp, "failed to hotplug function 0");
> + pci_qdev_unrealize(DEVICE(pci_dev), NULL);
> + return;
> + }
> }
>
> static void pci_default_realize(PCIDevice *dev, Error **errp)
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index 54032d0..b900f70 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -2076,6 +2076,19 @@ static int vfio_check_devices_host_bus_reset(void)
> return 0;
> }
>
> +static int vfio_check_bus_reset(NotifierWithReturn *n, void *opaque)
> +{
> + VFIOPCIDevice *vdev = container_of(n, VFIOPCIDevice, hotplug_notifier);
> + PCIDevice *pci_dev = PCI_DEVICE(vdev);
> + PCIDevice *pci_func0 = opaque;
> +
> + if (pci_get_function_0(pci_dev) != pci_func0) {
> + return 0;
> + }
> +
> + return vfio_check_host_bus_reset(vdev);
> +}
> +
> static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t cap_ver,
> int pos, uint16_t size)
> {
> @@ -2123,6 +2136,9 @@ static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t
> cap_ver,
> pdev->exp.aer_log.log_max = 0;
> }
>
> + vdev->hotplug_notifier.notify = vfio_check_bus_reset;
> + pci_bus_add_hotplug_notifier(pdev->bus, &vdev->hotplug_notifier);
> +
> pcie_cap_deverr_init(pdev);
> return pcie_aer_init(pdev, pos, size);
>
> @@ -3006,6 +3022,9 @@ static void vfio_exitfn(PCIDevice *pdev)
> vfio_unregister_req_notifier(vdev);
> vfio_unregister_err_notifier(vdev);
> pci_device_set_intx_routing_notifier(&vdev->pdev, NULL);
> + if (vdev->features & VFIO_FEATURE_ENABLE_AER) {
> + pci_bus_remove_hotplug_notifier(&vdev->hotplug_notifier);
> + }
> vfio_disable_interrupts(vdev);
> if (vdev->intx.mmap_timer) {
> timer_free(vdev->intx.mmap_timer);
> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
> index aff46c2..bf9e93c 100644
> --- a/hw/vfio/pci.h
> +++ b/hw/vfio/pci.h
> @@ -143,6 +143,8 @@ typedef struct VFIOPCIDevice {
> bool no_kvm_intx;
> bool no_kvm_msi;
> bool no_kvm_msix;
> +
> + NotifierWithReturn hotplug_notifier;
> } VFIOPCIDevice;
>
> uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);
> diff --git a/include/hw/pci/pci_bus.h b/include/hw/pci/pci_bus.h
> index 403fec6..7812fa9 100644
> --- a/include/hw/pci/pci_bus.h
> +++ b/include/hw/pci/pci_bus.h
> @@ -39,8 +39,13 @@ struct PCIBus {
> Keep a count of the number of devices with raised IRQs. */
> int nirq;
> int *irq_count;
> +
> + NotifierWithReturnList hotplug_notifiers;
> };
>
> +void pci_bus_add_hotplug_notifier(PCIBus *bus, NotifierWithReturn *notify);
> +void pci_bus_remove_hotplug_notifier(NotifierWithReturn *notify);
> +
> typedef struct PCIBridgeWindows PCIBridgeWindows;
>
> /*
> --
> 1.9.3
>
>
- [Qemu-devel] [PATCH 00/10] vfio-pci: pass the aer error to guest, part2, Cao jin, 2016/02/17
- [Qemu-devel] [PATCH 01/10] vfio: extract vfio_get_hot_reset_info as a single function, Cao jin, 2016/02/17
- [Qemu-devel] [PATCH 02/10] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Cao jin, 2016/02/17
- [Qemu-devel] [PATCH 03/10] vfio: add pcie extended capability support, Cao jin, 2016/02/17
- [Qemu-devel] [PATCH 04/10] vfio: add aer support for vfio device, Cao jin, 2016/02/17
- [Qemu-devel] [PATCH 05/10] vfio: add check host bus reset is support or not, Cao jin, 2016/02/17
- [Qemu-devel] [PATCH 06/10] add check reset mechanism when hotplug vfio device, Cao jin, 2016/02/17
- Re: [Qemu-devel] [PATCH 06/10] add check reset mechanism when hotplug vfio device,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 08/10] vfio: introduce last reset sequence id, Cao jin, 2016/02/17
- [Qemu-devel] [PATCH 07/10] pci: introduce pci bus pre reset, Cao jin, 2016/02/17
- [Qemu-devel] [PATCH 09/10] vfio-pci: pass the aer error to guest, Cao jin, 2016/02/17