[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 1/6] virtio-net: setup vhost_dev and notifiers for cvq only wh
From: |
Si-Wei Liu |
Subject: |
[PATCH v3 1/6] virtio-net: setup vhost_dev and notifiers for cvq only when feature is negotiated |
Date: |
Thu, 5 May 2022 21:54:29 -0700 |
When the control virtqueue feature is absent or not negotiated,
vhost_net_start() still tries to set up vhost_dev and install
vhost notifiers for the control virtqueue, which results in
erroneous ioctl calls with incorrect queue index sending down
to driver. Do that only when needed.
Fixes: 22288fe ("virtio-net: vhost control virtqueue support")
Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
---
hw/net/virtio-net.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 1067e72..ffb3475 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -245,7 +245,8 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t
status)
VirtIODevice *vdev = VIRTIO_DEVICE(n);
NetClientState *nc = qemu_get_queue(n->nic);
int queue_pairs = n->multiqueue ? n->max_queue_pairs : 1;
- int cvq = n->max_ncs - n->max_queue_pairs;
+ int cvq = virtio_vdev_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ) ?
+ n->max_ncs - n->max_queue_pairs : 0;
if (!get_vhost_net(nc->peer)) {
return;
--
1.8.3.1
- [PATCH v3 0/6] vhost-vdpa multiqueue fixes, Si-Wei Liu, 2022/05/06
- [PATCH v3 5/6] vhost-vdpa: backend feature should set only once, Si-Wei Liu, 2022/05/06
- [PATCH v3 2/6] virtio-net: align ctrl_vq index for non-mq guest for vhost_vdpa, Si-Wei Liu, 2022/05/06
- [PATCH v3 1/6] virtio-net: setup vhost_dev and notifiers for cvq only when feature is negotiated,
Si-Wei Liu <=
- [PATCH v3 4/6] vhost-net: fix improper cleanup in vhost_net_start, Si-Wei Liu, 2022/05/06
- [PATCH v3 6/6] virtio-net: don't handle mq request in userspace handler for vhost-vdpa, Si-Wei Liu, 2022/05/06
- [PATCH v3 3/6] vhost-vdpa: fix improper cleanup in net_init_vhost_vdpa, Si-Wei Liu, 2022/05/06