[Qemu-devel] [PATCH v13 10/13] pci: add pci device pre-post reset callbacks for host bus reset
From: Chen Fan
Particularly, For vfio devices, Once need to recovery devices
by bus reset such as AER, we always need to reset the host bus
to recovery the devices under the bus, so we need to add pci device
callbacks to specify to do host bus reset.
Signed-off-by: Chen Fan
---
hw/pci/pci.c | 18 ++
hw/pci/pci_bridge.c | 9 +
hw/vfio/pci.c| 26 ++
hw/vfio/pci.h| 2 ++
include/hw/pci/pci.h | 7 +++
5 files changed, 62 insertions(+)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index f6ca6ef..64fa2cc 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -247,6 +247,24 @@ static void pci_do_device_reset(PCIDevice *dev)
msix_reset(dev);
}
+void pci_device_pre_reset(PCIBus *bus, PCIDevice *dev, void *unused)
+{
+PCIDeviceClass *dc = PCI_DEVICE_GET_CLASS(dev);
+
+if (dc->pre_reset) {
+dc->pre_reset(dev);
+}
+}
+
+void pci_device_post_reset(PCIBus *bus, PCIDevice *dev, void *unused)
+{
+PCIDeviceClass *dc = PCI_DEVICE_GET_CLASS(dev);
+
+if (dc->post_reset) {
+dc->post_reset(dev);
+}
+}
+
/*
* This function is called on #RST and FLR.
* FLR if PCI_EXP_DEVCTL_BCR_FLR is set
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 40c97b1..ddb76ab 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -267,8 +267,17 @@ void pci_bridge_write_config(PCIDevice *d,
newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {
+/*
+ * Notify all vfio-pci devices under the bus
+ * should do physical bus reset.
+ */
+PCIBus *sec_bus = pci_bridge_get_sec_bus(s);
+pci_for_each_device(sec_bus, pci_bus_num(sec_bus),
+pci_device_pre_reset, NULL);
/* Trigger hot reset on 0->1 transition. */
qbus_reset_all(&s->sec_bus.qbus);
+pci_for_each_device(sec_bus, pci_bus_num(sec_bus),
+pci_device_post_reset, NULL);
}
}
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index e619998..90df393 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -39,6 +39,7 @@
static void vfio_disable_interrupts(VFIOPCIDevice *vdev);
static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);
+static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single);
/*
* Disabling BAR mmaping can be slow, but toggling it around INTx can
@@ -1879,6 +1880,8 @@ static int vfio_check_host_bus_reset(VFIOPCIDevice *vdev)
/* List all affected devices by bus reset */
devices = &info->devices[0];
+vdev->single_depend_dev = (info->count == 1);
+
/* Verify that we have all the groups required */
for (i = 0; i < info->count; i++) {
PCIHostDeviceAddress host;
@@ -2003,10 +2006,26 @@ static int vfio_check_bus_reset(NotifierWithReturn *n,
void *opaque)
return vfio_check_host_bus_reset(vdev);
}
+static void vfio_aer_pre_reset(PCIDevice *pdev)
+{
+VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
+
+vdev->aer_reset = true;
+vfio_pci_hot_reset(vdev, vdev->single_depend_dev);
+}
+
+static void vfio_aer_post_reset(PCIDevice *pdev)
+{
+VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
+
+vdev->aer_reset = false;
+}
+
static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t cap_ver,
int pos, uint16_t size)
{
PCIDevice *pdev = &vdev->pdev;
+PCIDeviceClass *dc = PCI_DEVICE_GET_CLASS(pdev);
PCIDevice *dev_iter;
uint8_t type;
uint32_t errcap;
@@ -2060,6 +2079,9 @@ static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t
cap_ver,
vdev->hotplug_notifier.notify = vfio_check_bus_reset;
pci_bus_add_hotplug_notifier(pdev->bus, &vdev->hotplug_notifier);
+dc->pre_reset = vfio_aer_pre_reset;
+dc->post_reset = vfio_aer_post_reset;
+
return 0;
error:
@@ -2953,6 +2975,10 @@ static void vfio_pci_reset(DeviceState *dev)
trace_vfio_pci_reset(vdev->vbasedev.name);
+if (vdev->aer_reset) {
+return;
+}
+
vfio_pci_pre_reset(vdev);
if (vdev->resetfn && !vdev->resetfn(vdev)) {
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index b385f07..1b89b83 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -144,6 +144,8 @@ typedef struct VFIOPCIDevice {
bool no_kvm_msix;
NotifierWithReturn hotplug_notifier;
+bool aer_reset;
+bool single_depend_dev;
} VFIOPCIDevice;
uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 379b6e1..6b1f2d4 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -105,6 +105,9 @@ typedef void PCIMapIORegionFunc(PCIDevice *pci_dev, int
region_num,
pcibus_t addr, pcibus_t size, int type);
typedef void PCIUnregisterFunc(PCIDevice *pci_dev);
+typedef void PCIPreResetFunc(PCIDevice *pci_dev);
+typedef void PCIPostResetFunc(PCIDevic
Re: [Qemu-devel] [PATCH v13 10/13] pci: add pci device pre-post reset callbacks for host bus reset
On Wed, Nov 11, 2015 at 06:34:28PM +0800, Cao jin wrote:
> From: Chen Fan
>
> Particularly, For vfio devices, Once need to recovery devices
> by bus reset such as AER, we always need to reset the host bus
> to recovery the devices under the bus, so we need to add pci device
> callbacks to specify to do host bus reset.
>
> Signed-off-by: Chen Fan
Reviewed-by: Michael S. Tsirkin
> ---
> hw/pci/pci.c | 18 ++
> hw/pci/pci_bridge.c | 9 +
> hw/vfio/pci.c| 26 ++
> hw/vfio/pci.h| 2 ++
> include/hw/pci/pci.h | 7 +++
> 5 files changed, 62 insertions(+)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index f6ca6ef..64fa2cc 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -247,6 +247,24 @@ static void pci_do_device_reset(PCIDevice *dev)
> msix_reset(dev);
> }
>
> +void pci_device_pre_reset(PCIBus *bus, PCIDevice *dev, void *unused)
> +{
> +PCIDeviceClass *dc = PCI_DEVICE_GET_CLASS(dev);
> +
> +if (dc->pre_reset) {
> +dc->pre_reset(dev);
> +}
> +}
> +
> +void pci_device_post_reset(PCIBus *bus, PCIDevice *dev, void *unused)
> +{
> +PCIDeviceClass *dc = PCI_DEVICE_GET_CLASS(dev);
> +
> +if (dc->post_reset) {
> +dc->post_reset(dev);
> +}
> +}
> +
> /*
> * This function is called on #RST and FLR.
> * FLR if PCI_EXP_DEVCTL_BCR_FLR is set
> diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
> index 40c97b1..ddb76ab 100644
> --- a/hw/pci/pci_bridge.c
> +++ b/hw/pci/pci_bridge.c
> @@ -267,8 +267,17 @@ void pci_bridge_write_config(PCIDevice *d,
>
> newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);
> if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {
> +/*
> + * Notify all vfio-pci devices under the bus
> + * should do physical bus reset.
> + */
> +PCIBus *sec_bus = pci_bridge_get_sec_bus(s);
> +pci_for_each_device(sec_bus, pci_bus_num(sec_bus),
> +pci_device_pre_reset, NULL);
> /* Trigger hot reset on 0->1 transition. */
> qbus_reset_all(&s->sec_bus.qbus);
> +pci_for_each_device(sec_bus, pci_bus_num(sec_bus),
> +pci_device_post_reset, NULL);
> }
> }
>
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index e619998..90df393 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -39,6 +39,7 @@
>
> static void vfio_disable_interrupts(VFIOPCIDevice *vdev);
> static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);
> +static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single);
>
> /*
> * Disabling BAR mmaping can be slow, but toggling it around INTx can
> @@ -1879,6 +1880,8 @@ static int vfio_check_host_bus_reset(VFIOPCIDevice
> *vdev)
> /* List all affected devices by bus reset */
> devices = &info->devices[0];
>
> +vdev->single_depend_dev = (info->count == 1);
> +
> /* Verify that we have all the groups required */
> for (i = 0; i < info->count; i++) {
> PCIHostDeviceAddress host;
> @@ -2003,10 +2006,26 @@ static int vfio_check_bus_reset(NotifierWithReturn
> *n, void *opaque)
> return vfio_check_host_bus_reset(vdev);
> }
>
> +static void vfio_aer_pre_reset(PCIDevice *pdev)
> +{
> +VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
> +
> +vdev->aer_reset = true;
> +vfio_pci_hot_reset(vdev, vdev->single_depend_dev);
> +}
> +
> +static void vfio_aer_post_reset(PCIDevice *pdev)
> +{
> +VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);
> +
> +vdev->aer_reset = false;
> +}
> +
> static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t cap_ver,
>int pos, uint16_t size)
> {
> PCIDevice *pdev = &vdev->pdev;
> +PCIDeviceClass *dc = PCI_DEVICE_GET_CLASS(pdev);
> PCIDevice *dev_iter;
> uint8_t type;
> uint32_t errcap;
> @@ -2060,6 +2079,9 @@ static int vfio_setup_aer(VFIOPCIDevice *vdev, uint8_t
> cap_ver,
> vdev->hotplug_notifier.notify = vfio_check_bus_reset;
> pci_bus_add_hotplug_notifier(pdev->bus, &vdev->hotplug_notifier);
>
> +dc->pre_reset = vfio_aer_pre_reset;
> +dc->post_reset = vfio_aer_post_reset;
> +
> return 0;
>
> error:
> @@ -2953,6 +2975,10 @@ static void vfio_pci_reset(DeviceState *dev)
>
> trace_vfio_pci_reset(vdev->vbasedev.name);
>
> +if (vdev->aer_reset) {
> +return;
> +}
> +
> vfio_pci_pre_reset(vdev);
>
> if (vdev->resetfn && !vdev->resetfn(vdev)) {
> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
> index b385f07..1b89b83 100644
> --- a/hw/vfio/pci.h
> +++ b/hw/vfio/pci.h
> @@ -144,6 +144,8 @@ typedef struct VFIOPCIDevice {
> bool no_kvm_msix;
>
> NotifierWithReturn hotplug_notifier;
> +bool aer_reset;
> +bool single_depend_dev;
> } VFIOPCIDevice;
>
> uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);
> diff --git a/include/hw/pci/pci.h b/include/hw/pc
Re: [Qemu-devel] [PATCH v13 10/13] pci: add pci device pre-post reset callbacks for host bus reset
On Wed, 2015-11-11 at 18:34 +0800, Cao jin wrote:
> From: Chen Fan
>
> Particularly, For vfio devices, Once need to recovery devices
> by bus reset such as AER, we always need to reset the host bus
> to recovery the devices under the bus, so we need to add pci device
> callbacks to specify to do host bus reset.
>
> Signed-off-by: Chen Fan
> ---
> hw/pci/pci.c | 18 ++
> hw/pci/pci_bridge.c | 9 +
> hw/vfio/pci.c| 26 ++
> hw/vfio/pci.h| 2 ++
> include/hw/pci/pci.h | 7 +++
> 5 files changed, 62 insertions(+)
...
> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
> index b385f07..1b89b83 100644
> --- a/hw/vfio/pci.h
> +++ b/hw/vfio/pci.h
> @@ -144,6 +144,8 @@ typedef struct VFIOPCIDevice {
> bool no_kvm_msix;
>
> NotifierWithReturn hotplug_notifier;
> +bool aer_reset;
> +bool single_depend_dev;
> } VFIOPCIDevice;
Add these to with the rest of the bools above hotplug_notifier so the
structure isn't larger than it needs to be.
Re: [Qemu-devel] [PATCH v13 10/13] pci: add pci device pre-post reset callbacks for host bus reset
On 11/12/2015 04:58 AM, Alex Williamson wrote:
On Wed, 2015-11-11 at 18:34 +0800, Cao jin wrote:
From: Chen Fan
...
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index b385f07..1b89b83 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -144,6 +144,8 @@ typedef struct VFIOPCIDevice {
bool no_kvm_msix;
NotifierWithReturn hotplug_notifier;
+bool aer_reset;
+bool single_depend_dev;
} VFIOPCIDevice;
Add these to with the rest of the bools above hotplug_notifier so the
structure isn't larger than it needs to be.
OK
--
Yours Sincerely,
Cao Jin
