From mboxrd@z Thu Jan 1 00:00:00 1970 From: julien.grall@arm.com (Julien Grall) Date: Thu, 10 May 2018 15:04:37 +0100 Subject: [RFC 09/13] virtio: Handle aborts using invalid PFN In-Reply-To: <20180510140441.24573-1-julien.grall@arm.com> References: <20180510140441.24573-1-julien.grall@arm.com> Message-ID: <20180510140441.24573-10-julien.grall@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Suzuki K Poulose When the host fails to complete the shake hand due to various reasons. e.g, for PCI and MMIO, if 0 is written as the PFN, it implies the host has given up and simply don't take any action. Signed-off-by: Suzuki K Poulose --- virtio/mmio.c | 14 ++++++++------ virtio/pci.c | 10 ++++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/virtio/mmio.c b/virtio/mmio.c index 8c0f1cc..b118b8a 100644 --- a/virtio/mmio.c +++ b/virtio/mmio.c @@ -188,12 +188,14 @@ static void virtio_mmio_config_out(struct kvm_cpu *vcpu, break; case VIRTIO_MMIO_QUEUE_PFN: val = ioport__read32(data); - virtio_mmio_init_ioeventfd(vmmio->kvm, vdev, vmmio->hdr.queue_sel); - vdev->ops->init_vq(vmmio->kvm, vmmio->dev, - vmmio->hdr.queue_sel, - vmmio->hdr.guest_page_size, - vmmio->hdr.queue_align, - val); + if (val) { + virtio_mmio_init_ioeventfd(vmmio->kvm, vdev, vmmio->hdr.queue_sel); + vdev->ops->init_vq(vmmio->kvm, vmmio->dev, + vmmio->hdr.queue_sel, + vmmio->hdr.guest_page_size, + vmmio->hdr.queue_align, + val); + } break; case VIRTIO_MMIO_QUEUE_NOTIFY: val = ioport__read32(data); diff --git a/virtio/pci.c b/virtio/pci.c index 5a5fc6e..403063f 100644 --- a/virtio/pci.c +++ b/virtio/pci.c @@ -269,10 +269,12 @@ static bool virtio_pci__io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 break; case VIRTIO_PCI_QUEUE_PFN: val = ioport__read32(data); - virtio_pci__init_ioeventfd(kvm, vdev, vpci->queue_selector); - vdev->ops->init_vq(kvm, vpci->dev, vpci->queue_selector, - 1 << VIRTIO_PCI_QUEUE_ADDR_SHIFT, - VIRTIO_PCI_VRING_ALIGN, val); + if (val) { + virtio_pci__init_ioeventfd(kvm, vdev, vpci->queue_selector); + vdev->ops->init_vq(kvm, vpci->dev, vpci->queue_selector, + 1 << VIRTIO_PCI_QUEUE_ADDR_SHIFT, + VIRTIO_PCI_VRING_ALIGN, val); + } break; case VIRTIO_PCI_QUEUE_SEL: vpci->queue_selector = ioport__read16(data); -- 2.11.0