virtio-pci: enable bus master for old guests
PATCH v5 1/1 virtio-pci: enable bus master for old guests
commit cc943c36faa192cd4b32af8fe5edb31894017d35
pci: Use bus master address space for delivering MSI/MSI-X messages
breaks virtio-net for rhel6.[56] x86 guests because they don't enable bus mastering for virtio PCI devices. For the same reason, rhel6.[56] ppc64 guests cannot boot on a virtio-blk disk anymore.
Old guests forgot to enable bus mastering, enable it automatically on DRIVER (guests use some devices before DRIVER_OK).
---
Sorry, v4 was broken - forgot to commit before git format-patch. Here's the correct version.
Still not tested - will do next week.
Testing reports appreciated meanwhile.
hw/virtio/virtio-pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
hw/virtio/virtio-pci.c +10 -0
@@ -314,6 +314,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)msix_unuse_all_vectors (&proxy->pci_dev); } +/* Linux before 2.6.34 drives the device without enabling +the PCI device bus master bit. Enable it automatically +for the guest. This is a PCI spec violation but so is +initiating DMA with bus master bit clear. */ +if (val == (VIRTIO_CONFIG_S_ACKNOWLEDGE |VIRTIO_CONFIG_S_DRIVER )) { +pci_default_write_config (&proxy->pci_dev,PCI_COMMAND , + proxy->pci_dev.config[PCI_COMMAND ] | +PCI_COMMAND_MASTER ,1 ); + } +/* Linux before 2.6.34 sets the device as OK without enabling the PCI device bus master bit. In this case we need to disable some safety checks. */
Signature · 1 line
MST
Quoted 9 lines · On Thu, 11 Sep 2014 21:20:03 +0300 "Michael S. Tsirkin" <[email protected]> wrote:
commit
cc943c36faa192cd4b32af8fe5edb31894017d35
pci: Use bus master address space for delivering MSI/MSI-X messages
breaks virtio-net for rhel6.[56] x86 guests because they don't enable bus mastering for virtio PCI devices. For the same reason, rhel6.[56] ppc64 guests cannot boot on a virtio-blk disk anymore.Old guests forgot to enable bus mastering, enable it automatically on DRIVER (guests use some devices before
DRIVER_OK).
Quoted 8 lines
Reported-by Greg Kurz <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
Sorry, v4 was broken - forgot to commit before git format-patch. Here's the correct version.
Still not tested - will do next week.
Testing reports appreciated meanwhile.
Nice patch indeed ! :)
Cc'ing qemu-stable as Michael said he would queue the initial bus master patch for 2.1.2.
Quoted 24 lines
hw/virtio/virtio-pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/virtio/virtio-pci.c +10
-0@@ -314,6 +314,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)msix_unuse_all_vectors (&proxy->pci_dev); } +/* Linux before 2.6.34 drives the device without enabling +the PCI device bus master bit. Enable it automatically +for the guest. This is a PCI spec violation but so is +initiating DMA with bus master bit clear. */ +if (val == (VIRTIO_CONFIG_S_ACKNOWLEDGE |VIRTIO_CONFIG_S_DRIVER )) { +pci_default_write_config (&proxy->pci_dev,PCI_COMMAND , + proxy->pci_dev.config[PCI_COMMAND ] | +PCI_COMMAND_MASTER ,1 ); + } +/* Linux before 2.6.34 sets the device as OK without enabling the PCI device bus master bit. In this case we need to disable some safety checks. */
Signature · 7 lines
Gregory Kurz [email protected] [email protected] Software Engineer @ IBM/Meiosys http://www.ibm.com Tel +33 (0)562 165 496 "Anarchy is about taking complete responsibility for yourself." Alan Moore.
Quoted 21 lines · Greg Kurz
Quoted 9 lines · On Thu, 11 Sep 2014 21:20:03 +0300 "Michael S. Tsirkin" <[email protected]> wrote:
commit
cc943c36faa192cd4b32af8fe5edb31894017d35
pci: Use bus master address space for delivering MSI/MSI-X messages
breaks virtio-net for rhel6.[56] x86 guests because they don't enable bus mastering for virtio PCI devices. For the same reason, rhel6.[56] ppc64 guests cannot boot on a virtio-blk disk anymore.Old guests forgot to enable bus mastering, enable it automatically on DRIVER (guests use some devices before
DRIVER_OK).Quoted 8 lines
Reported-by Greg Kurz <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
Sorry, v4 was broken - forgot to commit before git format-patch. Here's the correct version.
Still not tested - will do next week.
Testing reports appreciated meanwhile.
Quoted 7 lines
Nice patch indeed ! :)
Reviewed-by Greg Kurz <[email protected]>Tested-by Greg Kurz <[email protected]>Cc'ing qemu-stable as Michael said he would queue the initial bus master patch for 2.1.2.
In my opinion it's best to keep the initial patch off stable.
Quoted 35 lines
Quoted 24 lines
hw/virtio/virtio-pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/virtio/virtio-pci.c +10
-0@@ -314,6 +314,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)msix_unuse_all_vectors (&proxy->pci_dev); } +/* Linux before 2.6.34 drives the device without enabling +the PCI device bus master bit. Enable it automatically +for the guest. This is a PCI spec violation but so is +initiating DMA with bus master bit clear. */ +if (val == (VIRTIO_CONFIG_S_ACKNOWLEDGE |VIRTIO_CONFIG_S_DRIVER )) { +pci_default_write_config (&proxy->pci_dev,PCI_COMMAND , + proxy->pci_dev.config[PCI_COMMAND ] | +PCI_COMMAND_MASTER ,1 ); + } +/* Linux before 2.6.34 sets the device as OK without enabling the PCI device bus master bit. In this case we need to disable some safety checks. */ Signature · 7 lines
Gregory Kurz [email protected] [email protected] Software Engineer @ IBM/Meiosys http://www.ibm.com Tel +33 (0)562 165 496 "Anarchy is about taking complete responsibility for yourself." Alan Moore.
Quoted 31 lines · Michael S. Tsirkin
commit
cc943c36faa192cd4b32af8fe5edb31894017d35
pci: Use bus master address space for delivering MSI/MSI-X messages
breaks virtio-net for rhel6.[56] x86 guests because they don't enable bus mastering for virtio PCI devices. For the same reason, rhel6.[56] ppc64 guests cannot boot on a virtio-blk disk anymore.Old guests forgot to enable bus mastering, enable it automatically on DRIVER (guests use some devices before
DRIVER_OK).Reported-by Greg Kurz <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
Sorry, v4 was broken - forgot to commit before git format-patch. Here's the correct version.
Still not tested - will do next week.
Testing reports appreciated meanwhile.hw/virtio/virtio-pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/virtio/virtio-pci.c +3
-0@@ -314,6 +314,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)msix_unuse_all_vectors (&proxy->pci_dev); } +/* Linux before 2.6.34 drives the device without enabling +the PCI device bus master bit. Enable it automatically +for the guest. This is a PCI spec violation but so is
hw/virtio/virtio-pci.c static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) · line 329
Quoted 10 lines
hw/virtio/virtio-pci.c +7
-0+initiating DMA with bus master bit clear. */ +if (val == (VIRTIO_CONFIG_S_ACKNOWLEDGE |VIRTIO_CONFIG_S_DRIVER )) { +pci_default_write_config (&proxy->pci_dev,PCI_COMMAND , + proxy->pci_dev.config[PCI_COMMAND ] | +PCI_COMMAND_MASTER ,1 ); + } +/* Linux before 2.6.34 sets the device as OK without enabling the PCI device bus master bit. In this case we need to disable some safety checks. */
So with this patch, we can also remove the detecting and handling of VIRTIO_PCI_FLAG_BUS_MATER_BUG?
Quoted 29 lines · Jason Wang
Quoted 28 lines · Michael S. Tsirkin
commit
cc943c36faa192cd4b32af8fe5edb31894017d35
pci: Use bus master address space for delivering MSI/MSI-X messages
breaks virtio-net for rhel6.[56] x86 guests because they don't enable bus mastering for virtio PCI devices. For the same reason, rhel6.[56] ppc64 guests cannot boot on a virtio-blk disk anymore.Old guests forgot to enable bus mastering, enable it automatically on DRIVER (guests use some devices before
DRIVER_OK).Reported-by Greg Kurz <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
Sorry, v4 was broken - forgot to commit before git format-patch. Here's the correct version.
Still not tested - will do next week.
Testing reports appreciated meanwhile.hw/virtio/virtio-pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/virtio/virtio-pci.c +0
-0@@ -314,6 +314,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)msix_unuse_all_vectors (&proxy->pci_dev); }
Quoted 16 lines
hw/virtio/virtio-pci.c static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) · line 329
Quoted 13 lines
hw/virtio/virtio-pci.c +10
-0+/* Linux before 2.6.34 drives the device without enabling +the PCI device bus master bit. Enable it automatically +for the guest. This is a PCI spec violation but so is +initiating DMA with bus master bit clear. */ +if (val == (VIRTIO_CONFIG_S_ACKNOWLEDGE |VIRTIO_CONFIG_S_DRIVER )) { +pci_default_write_config (&proxy->pci_dev,PCI_COMMAND , + proxy->pci_dev.config[PCI_COMMAND ] | +PCI_COMMAND_MASTER ,1 ); + } +/* Linux before 2.6.34 sets the device as OK without enabling the PCI device bus master bit. In this case we need to disable some safety checks. */ So with this patch, we can also remove the detecting and handling of
VIRTIO_PCI_FLAG_BUS_MATER_BUG?
Yes - I sent a follow-up patch to do that.
Signature · 1 line
MST
Quoted 47 lines · Michael S. Tsirkin
Quoted 29 lines · Jason Wang
Quoted 28 lines · Michael S. Tsirkin
commit
cc943c36faa192cd4b32af8fe5edb31894017d35
pci: Use bus master address space for delivering MSI/MSI-X messages
breaks virtio-net for rhel6.[56] x86 guests because they don't enable bus mastering for virtio PCI devices. For the same reason, rhel6.[56] ppc64 guests cannot boot on a virtio-blk disk anymore.Old guests forgot to enable bus mastering, enable it automatically on DRIVER (guests use some devices before
DRIVER_OK).Reported-by Greg Kurz <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>---
Sorry, v4 was broken - forgot to commit before git format-patch. Here's the correct version.
Still not tested - will do next week.
Testing reports appreciated meanwhile.hw/virtio/virtio-pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/virtio/virtio-pci.c +0
-0@@ -314,6 +314,16 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val)msix_unuse_all_vectors (&proxy->pci_dev); }Quoted 16 lines
hw/virtio/virtio-pci.c static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) · line 329
Quoted 13 lines
hw/virtio/virtio-pci.c +10
-0+/* Linux before 2.6.34 drives the device without enabling +the PCI device bus master bit. Enable it automatically +for the guest. This is a PCI spec violation but so is +initiating DMA with bus master bit clear. */ +if (val == (VIRTIO_CONFIG_S_ACKNOWLEDGE |VIRTIO_CONFIG_S_DRIVER )) { +pci_default_write_config (&proxy->pci_dev,PCI_COMMAND , + proxy->pci_dev.config[PCI_COMMAND ] | +PCI_COMMAND_MASTER ,1 ); + } +/* Linux before 2.6.34 sets the device as OK without enabling the PCI device bus master bit. In this case we need to disable some safety checks. */ So with this patch, we can also remove the detecting and handling of
VIRTIO_PCI_FLAG_BUS_MATER_BUG?
Quoted 1 line
Yes - I sent a follow-up patch to do that.
I will check if this patch fixed this bug (it seems WIN8r2 doesn't set BUS_MASTER bit correctly): https://bugzilla.redhat.com/show_bug.cgi?id=1090237
Signature · 1 line
Amos.