Revert "virtio-pci: harden INTX interrupts"
PATCH 1/2 Revert "virtio-pci: harden INTX interrupts"
This reverts commit 080cd7c3ac8701081d143a15ba17dd9475313188. Since the MSI-X interrupts hardening will be reverted in the next patch. We will rework the interrupt hardening in the future.
--- drivers/virtio/virtio_pci_common.c | 23 ++--------------------- drivers/virtio/virtio_pci_common.h | 1 - 2 files changed, 2 insertions(+), 22 deletions(-)
drivers/virtio/virtio_pci_common.c +2 -21
@@ -30,16 +30,8 @@ void vp_disable_cbs(struct virtio_device *vdev)struct virtio_pci_device *vp_dev =to_vp_device (vdev);int i; -if (vp_dev->intx_enabled) { -/* -* The below synchronize() guarantees that any -* interrupt for this line arriving after -* synchronize_irq() has completed is guaranteed to see -* intx_soft_enabled == false. -*/ -WRITE_ONCE (vp_dev->intx_soft_enabled, false); +if (vp_dev->intx_enabled)synchronize_irq (vp_dev->pci_dev->irq); - }for (i =0 ; i < vp_dev->msix_vectors; ++i)disable_irq (pci_irq_vector (vp_dev->pci_dev, i));
@@ -51,16 +43,8 @@ void vp_enable_cbs(struct virtio_device *vdev)struct virtio_pci_device *vp_dev =to_vp_device (vdev);int i; -if (vp_dev->intx_enabled) { -disable_irq (vp_dev->pci_dev->irq); -/* -* The above disable_irq() provides TSO ordering and -* as such promotes the below store to store-release. -*/ -WRITE_ONCE (vp_dev->intx_soft_enabled, true); -enable_irq (vp_dev->pci_dev->irq); +if (vp_dev->intx_enabled)return ; - }for (i =0 ; i < vp_dev->msix_vectors; ++i)enable_irq (pci_irq_vector (vp_dev->pci_dev, i));
@@ -113,9 +97,6 @@ static irqreturn_t vp_interrupt(int irq, void *opaque)struct virtio_pci_device *vp_dev = opaque;u8 isr; -if (!READ_ONCE (vp_dev->intx_soft_enabled)) -return IRQ_NONE ; -/* reading the ISR has the effect of also clearing it so it's very * important to save off the value. */ isr =ioread8 (vp_dev->isr);
drivers/virtio/virtio_pci_common.h +0 -1
@@ -63,7 +63,6 @@ struct virtio_pci_device {/* MSI-X support */ int msix_enabled;int intx_enabled; -bool intx_soft_enabled;cpumask_var_t *msix_affinity_masks;/* Name strings for interrupts. This size should be enough, * and I'm too lazy to allocate each name separately. */
Signature · 1 line
2.25.1
PATCH 2/2 Revert "virtio_pci: harden MSI-X interrupts"
This reverts commit 9e35276a5344f74d4a3600fc4100b3dd251d5c56. Issue were reported for the drivers that are using affinity managed IRQ where manually toggling IRQ status is not expected. And we forget to enable the interrupts in the restore path as well.
In the future, we will rework on the interrupt hardening.
--- drivers/virtio/virtio_pci_common.c | 27 ++++++--------------------- drivers/virtio/virtio_pci_common.h | 6 ++---- drivers/virtio/virtio_pci_legacy.c | 5 ++--- drivers/virtio/virtio_pci_modern.c | 6 ++---- 4 files changed, 12 insertions(+), 32 deletions(-)
drivers/virtio/virtio_pci_common.c +6 -21
@@ -24,8 +24,8 @@ MODULE_PARM_DESC(force_legacy, "Force legacy mode for transitional virtio 1 devices");#endif -/* disable irq handlers */ -void vp_disable_cbs (struct virtio_device *vdev) +/* wait for pending irq handlers */ +void vp_synchronize_vectors (struct virtio_device *vdev) {struct virtio_pci_device *vp_dev =to_vp_device (vdev);int i;
@@ -34,20 +34,7 @@ void vp_disable_cbs(struct virtio_device *vdev)synchronize_irq (vp_dev->pci_dev->irq);for (i =0 ; i < vp_dev->msix_vectors; ++i) -disable_irq (pci_irq_vector (vp_dev->pci_dev, i)); -} - -/* enable irq handlers */ -void vp_enable_cbs (struct virtio_device *vdev) -{ -struct virtio_pci_device *vp_dev =to_vp_device (vdev); -int i; - -if (vp_dev->intx_enabled) -return ; - -for (i =0 ; i < vp_dev->msix_vectors; ++i) -enable_irq (pci_irq_vector (vp_dev->pci_dev, i)); +synchronize_irq (pci_irq_vector (vp_dev->pci_dev, i)); }/* the notify function used when creating a virt queue */
@@ -154,8 +141,7 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,snprintf (vp_dev->msix_names[v],sizeof *vp_dev->msix_names,"%s-config" , name); err =request_irq (pci_irq_vector (vp_dev->pci_dev, v), - vp_config_changed,IRQF_NO_AUTOEN , - vp_dev->msix_names[v], + vp_config_changed,0 , vp_dev->msix_names[v], vp_dev);if (err) goto error;
@@ -174,8 +160,7 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,snprintf (vp_dev->msix_names[v],sizeof *vp_dev->msix_names,"%s-virtqueues" , name); err =request_irq (pci_irq_vector (vp_dev->pci_dev, v), - vp_vring_interrupt,IRQF_NO_AUTOEN , - vp_dev->msix_names[v], + vp_vring_interrupt,0 , vp_dev->msix_names[v], vp_dev);if (err) goto error;
@@ -352,7 +337,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned nvqs,"%s-%s" , dev_name(&vp_dev->vdev.dev), names[i]); err =request_irq (pci_irq_vector (vp_dev->pci_dev, msix_vec), - vring_interrupt,IRQF_NO_AUTOEN , + vring_interrupt,0 , vp_dev->msix_names[msix_vec], vqs[i]);if (err)
drivers/virtio/virtio_pci_common.h +2 -4
@@ -101,10 +101,8 @@ static struct virtio_pci_device *to_vp_device(struct virtio_device *vdev) return container_of(vdev, struct virtio_pci_device, vdev); } -/* disable irq handlers */ -void vp_disable_cbs (struct virtio_device *vdev); -/* enable irq handlers */ -void vp_enable_cbs (struct virtio_device *vdev); +/* wait for pending irq handlers */ +void vp_synchronize_vectors (struct virtio_device *vdev);/* the notify function used when creating a virt queue */ bool vp_notify (struct virtqueue *vq);/* the config->del_vqs() implementation */
drivers/virtio/virtio_pci_legacy.c +2 -3
@@ -98,8 +98,8 @@ static void vp_reset(struct virtio_device *vdev)/* Flush out the status write, and flush in device writes, * including MSi-X interrupts, if any. */ vp_legacy_get_status (&vp_dev->ldev); -/* Disable VQ/configuration callbacks. */ -vp_disable_cbs (vdev); +/* Flush pending VQ/configuration callbacks. */ +vp_synchronize_vectors (vdev); }static u16 vp_config_vector (struct virtio_pci_device *vp_dev,u16 vector)
@@ -185,7 +185,6 @@ static void del_vq(struct virtio_pci_vq_info *info) }static const struct virtio_config_ops virtio_pci_config_ops = { - .enable_cbs = vp_enable_cbs, .get = vp_get, .set = vp_set, .get_status = vp_get_status,
drivers/virtio/virtio_pci_modern.c +2 -4
@@ -172,8 +172,8 @@ static void vp_reset(struct virtio_device *vdev)*/ while (vp_modern_get_status (mdev))msleep (1 ); -/* Disable VQ/configuration callbacks. */ -vp_disable_cbs (vdev); +/* Flush pending VQ/configuration callbacks. */ +vp_synchronize_vectors (vdev); }static u16 vp_config_vector (struct virtio_pci_device *vp_dev,u16 vector)
@@ -380,7 +380,6 @@ static bool vp_get_shm_region(struct virtio_device *vdev, }static const struct virtio_config_ops virtio_pci_config_nodev_ops = { - .enable_cbs = vp_enable_cbs, .get =NULL , .set =NULL , .generation = vp_generation,
@@ -398,7 +397,6 @@ static const struct virtio_config_ops virtio_pci_config_nodev_ops = { };static const struct virtio_config_ops virtio_pci_config_ops = { - .enable_cbs = vp_enable_cbs, .get = vp_get, .set = vp_set, .generation = vp_generation,
Signature · 6 lines
2.25.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 2/2] Revert "virtio_pci: harden MSI-X interrupts"
Quoted 6 lines · Jason Wang
This reverts commit
9e35276a5344f74d4a3600fc4100b3dd251d5c56. Issue were reported for the drivers that are using affinity managed IRQ where manually toggling IRQ status is not expected. And we forget to enable the interrupts in the restore path as well.
Quoted 6 lines
In the future, we will rework on the interrupt hardening.
Fixes 9e35276a5344 ("virtio_pci: harden MSI-X interrupts")Reported-by Marc Zyngier <[email protected]>Reported-by Stefano Garzarella <[email protected]>Signed-off-by Jason Wang <[email protected]>
For this patch and the INTx one:
Please keep me in the loop when you decide to rework this.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH 2/2] Revert "virtio_pci: harden MSI-X interrupts"
Quoted 16 lines · Marc Zyngier
Quoted 6 lines · Jason Wang
This reverts commit
9e35276a5344f74d4a3600fc4100b3dd251d5c56. Issue were reported for the drivers that are using affinity managed IRQ where manually toggling IRQ status is not expected. And we forget to enable the interrupts in the restore path as well.Quoted 6 lines
In the future, we will rework on the interrupt hardening.
Fixes 9e35276a5344 ("virtio_pci: harden MSI-X interrupts")Reported-by Marc Zyngier <[email protected]>Reported-by Stefano Garzarella <[email protected]>Signed-off-by Jason Wang <[email protected]>
Quoted 5 lines
For this patch and the INTx one:
Acked-by Marc Zyngier <[email protected]>Please keep me in the loop when you decide to rework this.
Ok.
Thanks
Quoted 8 lines
Thanks,
M.--
Without deviation from the norm, progress is not possible.
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH 2/2] Revert "virtio_pci: harden MSI-X interrupts"
In reply to Jason WangQuoted 6 lines · Jason Wang
This reverts commit
9e35276a5344f74d4a3600fc4100b3dd251d5c56. Issue were reported for the drivers that are using affinity managed IRQ where manually toggling IRQ status is not expected. And we forget to enable the interrupts in the restore path as well.
Quoted 6 lines
In the future, we will rework on the interrupt hardening.
Fixes 9e35276a5344 ("virtio_pci: harden MSI-X interrupts")Reported-by Marc Zyngier <[email protected]>Reported-by Stefano Garzarella <[email protected]>Signed-off-by Jason Wang <[email protected]>
For this patch and the INTx one:
Please keep me in the loop when you decide to rework this.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.