From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: target-devel <target-devel@vger.kernel.org>
Cc: lf-virt <virtualization@lists.linux-foundation.org>,
kvm-devel <kvm@vger.kernel.org>,
qemu-devel <qemu-devel@nongnu.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, Asias He <asias@redhat.com>,
Anthony Liguori <aliguori@linux.vnet.ibm.com>,
Nicholas Bellinger <nab@linux-iscsi.org>
Subject: [PATCH 3/3] vhost: Check+skip uninitialized VQs in vhost_verify_ring_mappings
Date: Fri, 29 Mar 2013 04:33:12 +0000 [thread overview]
Message-ID: <1364531592-8368-4-git-send-email-nab@linux-iscsi.org> (raw)
In-Reply-To: <1364531592-8368-1-git-send-email-nab@linux-iscsi.org>
From: Nicholas Bellinger <nab@linux-iscsi.org>
With the virtio_queue_valid() checks in place to skip uninitialized VQs
within virtio-pci code, go ahead and skip the same uninitialized VQs
during vhost_verify_ring_mappings().
Note this patch does not prevent vhost_virtqueue_start() from executing
by checking virtio_queue_valid(), as other logic during seabios ->
virtio-scsi LLD guest hand-off appears to depend upon this execution.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Asias He <asias@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
---
hw/vhost.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/hw/vhost.c b/hw/vhost.c
index 4d6aee3..3a71aee 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -314,6 +314,9 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev,
hwaddr l;
void *p;
+ if (!vq->ring_phys || !vq->ring_size) {
+ continue;
+ }
if (!ranges_overlap(start_addr, size, vq->ring_phys, vq->ring_size)) {
continue;
}
--
1.7.2.5
WARNING: multiple messages have this Message-ID (diff)
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: target-devel <target-devel@vger.kernel.org>
Cc: kvm-devel <kvm@vger.kernel.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-devel <qemu-devel@nongnu.org>,
Nicholas Bellinger <nab@linux-iscsi.org>,
lf-virt <virtualization@lists.linux-foundation.org>,
Anthony Liguori <aliguori@linux.vnet.ibm.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, Asias He <asias@redhat.com>
Subject: [Qemu-devel] [PATCH 3/3] vhost: Check+skip uninitialized VQs in vhost_verify_ring_mappings
Date: Fri, 29 Mar 2013 04:33:12 +0000 [thread overview]
Message-ID: <1364531592-8368-4-git-send-email-nab@linux-iscsi.org> (raw)
In-Reply-To: <1364531592-8368-1-git-send-email-nab@linux-iscsi.org>
From: Nicholas Bellinger <nab@linux-iscsi.org>
With the virtio_queue_valid() checks in place to skip uninitialized VQs
within virtio-pci code, go ahead and skip the same uninitialized VQs
during vhost_verify_ring_mappings().
Note this patch does not prevent vhost_virtqueue_start() from executing
by checking virtio_queue_valid(), as other logic during seabios ->
virtio-scsi LLD guest hand-off appears to depend upon this execution.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Asias He <asias@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
---
hw/vhost.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/hw/vhost.c b/hw/vhost.c
index 4d6aee3..3a71aee 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -314,6 +314,9 @@ static int vhost_verify_ring_mappings(struct vhost_dev *dev,
hwaddr l;
void *p;
+ if (!vq->ring_phys || !vq->ring_size) {
+ continue;
+ }
if (!ranges_overlap(start_addr, size, vq->ring_phys, vq->ring_size)) {
continue;
}
--
1.7.2.5
next prev parent reply other threads:[~2013-03-29 4:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-29 4:33 [PATCH 0/3] virtio/vhost: Add checks for uninitialized VQs Nicholas A. Bellinger
2013-03-29 4:33 ` [Qemu-devel] " Nicholas A. Bellinger
2013-03-29 4:33 ` [PATCH 1/3] virtio: add API to check that ring is setup Nicholas A. Bellinger
2013-03-29 4:33 ` Nicholas A. Bellinger
2013-03-29 4:33 ` [Qemu-devel] " Nicholas A. Bellinger
2013-03-29 4:33 ` [PATCH 2/3] virtio-pci: Add virtio_queue_valid checks ahead of virtio_queue_get_num Nicholas A. Bellinger
2013-03-29 4:33 ` [Qemu-devel] " Nicholas A. Bellinger
2013-03-31 7:37 ` Michael S. Tsirkin
2013-03-31 7:37 ` Michael S. Tsirkin
2013-03-31 7:37 ` [Qemu-devel] " Michael S. Tsirkin
2013-04-01 23:16 ` Nicholas A. Bellinger
2013-04-01 23:16 ` Nicholas A. Bellinger
2013-04-01 23:16 ` [Qemu-devel] " Nicholas A. Bellinger
2013-03-29 4:33 ` [PATCH 3/3] vhost: Check+skip uninitialized VQs in vhost_verify_ring_mappings Nicholas A. Bellinger
2013-03-29 4:33 ` Nicholas A. Bellinger [this message]
2013-03-29 4:33 ` [Qemu-devel] " Nicholas A. Bellinger
2013-03-31 7:45 ` Michael S. Tsirkin
2013-03-31 7:45 ` [Qemu-devel] " Michael S. Tsirkin
2013-04-01 23:49 ` Nicholas A. Bellinger
2013-04-01 23:49 ` [Qemu-devel] " Nicholas A. Bellinger
2013-04-01 23:49 ` Nicholas A. Bellinger
2013-03-31 7:46 ` [PATCH 0/3] virtio/vhost: Add checks for uninitialized VQs Michael S. Tsirkin
2013-03-31 7:46 ` [Qemu-devel] " Michael S. Tsirkin
2013-04-01 23:51 ` Nicholas A. Bellinger
2013-04-01 23:51 ` Nicholas A. Bellinger
2013-04-01 23:51 ` [Qemu-devel] " Nicholas A. Bellinger
2013-03-31 7:46 ` Michael S. Tsirkin
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=1364531592-8368-4-git-send-email-nab@linux-iscsi.org \
--to=nab@linux-iscsi.org \
--cc=aliguori@linux.vnet.ibm.com \
--cc=asias@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=target-devel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.