| Message ID | 1455389632-6840-1-git-send-email-mst@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
"Michael S. Tsirkin" <mst@redhat.com> writes: > commit 428c3ece97179557f2753071fb0ca97a03437267 ("fix MSI injection on Xen") > inadvertently enabled the xen-specific logic unconditionally. > Limit it to only when xen is enabled. > Additionally, msix data should be read with pci_get_log > since the format is pci little-endian. > > Reported-by: "Daniel P. Berrange" <berrange@redhat.com> > Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Fixes ivshmem-test /x86_64/ivshmem/server-msi. Not run by "make check" unless you add SPEED=slow. Quick reproducer: $ make tests/ivshmem-test && QTEST_QEMU_BINARY='x86_64-softmmu/qemu-system-x86_64' QTEST_QEMU_IMG=qemu-img MALLOC_PERTURB_=${MALLOC_PERTURB_:-$((RANDOM % 255 + 1))} gtester -k --verbose -m slow tests/ivshmem-test Adding this to the commit message wouldn't hurt. Thanks!
diff --git a/hw/pci/msix.c b/hw/pci/msix.c index eb4ef11..537fdba 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -80,10 +80,10 @@ static void msix_clr_pending(PCIDevice *dev, int vector) static bool msix_vector_masked(PCIDevice *dev, unsigned int vector, bool fmask) { unsigned offset = vector * PCI_MSIX_ENTRY_SIZE; - uint32_t *data = (uint32_t *)&dev->msix_table[offset + PCI_MSIX_ENTRY_DATA]; + uint8_t *data = &dev->msix_table[offset + PCI_MSIX_ENTRY_DATA]; /* MSIs on Xen can be remapped into pirqs. In those cases, masking * and unmasking go through the PV evtchn path. */ - if (xen_is_pirq_msi(*data)) { + if (xen_enabled() && xen_is_pirq_msi(pci_get_long(data))) { return false; } return fmask || dev->msix_table[offset + PCI_MSIX_ENTRY_VECTOR_CTRL] &
commit 428c3ece97179557f2753071fb0ca97a03437267 ("fix MSI injection on Xen") inadvertently enabled the xen-specific logic unconditionally. Limit it to only when xen is enabled. Additionally, msix data should be read with pci_get_log since the format is pci little-endian. Reported-by: "Daniel P. Berrange" <berrange@redhat.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/pci/msix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)