From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Andrew Melnychenko <andrew@daynix.com>,
Raphael Norwitz <raphael.norwitz@nutanix.com>,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [PULL 06/13] virtio-pci: Changed return values for "notify", "device" and "isr" read.
Date: Wed, 7 Jul 2021 11:03:14 -0400 [thread overview]
Message-ID: <20210707150157.52328-7-mst@redhat.com> (raw)
In-Reply-To: <20210707150157.52328-1-mst@redhat.com>
From: Andrew Melnychenko <andrew@daynix.com>
At some point, after unplugging virtio-pci the virtio device may be unrealised,
but the memory regions may be present in flatview. So, it's a possible situation
when memory region's callbacks are called for "unplugged" device.
Previous two patches made sure this case does not cause QEMU to crash.
This patch adds check for "notify" memory region. Now reads will return "-1" if a virtio
device is not present on a virtio bus.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1938042
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1743098
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
Message-Id: <20210609095843.141378-4-andrew@daynix.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-pci.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index c0d9c47df7..433060ac02 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1349,6 +1349,11 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
static uint64_t virtio_pci_notify_read(void *opaque, hwaddr addr,
unsigned size)
{
+ VirtIOPCIProxy *proxy = opaque;
+ if (virtio_bus_get_device(&proxy->bus) == NULL) {
+ return UINT64_MAX;
+ }
+
return 0;
}
@@ -1386,7 +1391,7 @@ static uint64_t virtio_pci_isr_read(void *opaque, hwaddr addr,
uint64_t val;
if (vdev == NULL) {
- return 0;
+ return UINT64_MAX;
}
val = qatomic_xchg(&vdev->isr, 0);
@@ -1407,7 +1412,7 @@ static uint64_t virtio_pci_device_read(void *opaque, hwaddr addr,
uint64_t val;
if (vdev == NULL) {
- return 0;
+ return UINT64_MAX;
}
switch (size) {
--
MST
next prev parent reply other threads:[~2021-07-07 15:10 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-07 15:02 [PULL 00/13] pc,pci,virtio: bugfixes, improvements Michael S. Tsirkin
2021-07-07 15:02 ` [PULL 01/13] virtio: disable ioeventfd for record/replay Michael S. Tsirkin
2021-07-07 15:02 ` [PULL 02/13] virtio: Clarify MR transaction optimization Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 03/13] hw/pci-host/q35: Ignore write of reserved PCIEXBAR LENGTH field Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 04/13] virtio-pci: Added check for virtio device presence in mm callbacks Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 05/13] virtio-pci: Added check for virtio device in PCI config cbs Michael S. Tsirkin
2021-07-07 15:03 ` Michael S. Tsirkin [this message]
2021-07-07 15:03 ` [PULL 07/13] migration: failover: reset partially_hotplugged Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 08/13] tests: acpi: prepare for changing DSDT tables Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 09/13] acpi: pc: revert back to v5.2 PCI slot enumeration Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 10/13] tests: acpi: pc: update expected DSDT blobs Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 11/13] acpi/ged: fix reset cause Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 12/13] docs: add slot when adding new PCIe root port Michael S. Tsirkin
2021-07-07 15:03 ` [PULL 13/13] MAINTAINERS: Add maintainer for vhost-user RNG implementation Michael S. Tsirkin
2021-07-08 22:01 ` Mathieu Poirier
2021-07-09 6:58 ` Michael S. Tsirkin
2021-07-09 7:02 ` Michael S. Tsirkin
2021-07-09 14:59 ` [PULL 00/13] pc,pci,virtio: bugfixes, improvements Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210707150157.52328-7-mst@redhat.com \
--to=mst@redhat.com \
--cc=andrew@daynix.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
--cc=sgarzare@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).