0552c42c39
- kvm-Introduce-event-loop-base-abstract-class.patch [bz#2031024] - kvm-util-main-loop-Introduce-the-main-loop-into-QOM.patch [bz#2031024] - kvm-util-event-loop-base-Introduce-options-to-set-the-th.patch [bz#2031024] - kvm-qcow2-Improve-refcount-structure-rebuilding.patch [bz#2072379] - kvm-iotests-108-Test-new-refcount-rebuild-algorithm.patch [bz#2072379] - kvm-qcow2-Add-errp-to-rebuild_refcount_structure.patch [bz#2072379] - kvm-iotests-108-Fix-when-missing-user_allow_other.patch [bz#2072379] - kvm-virtio-net-setup-vhost_dev-and-notifiers-for-cvq-onl.patch [bz#2070804] - kvm-virtio-net-align-ctrl_vq-index-for-non-mq-guest-for-.patch [bz#2070804] - kvm-vhost-vdpa-fix-improper-cleanup-in-net_init_vhost_vd.patch [bz#2070804] - kvm-vhost-net-fix-improper-cleanup-in-vhost_net_start.patch [bz#2070804] - kvm-vhost-vdpa-backend-feature-should-set-only-once.patch [bz#2070804] - kvm-vhost-vdpa-change-name-and-polarity-for-vhost_vdpa_o.patch [bz#2070804] - kvm-virtio-net-don-t-handle-mq-request-in-userspace-hand.patch [bz#2070804] - kvm-Revert-globally-limit-the-maximum-number-of-CPUs.patch [bz#2094270] - kvm-vfio-common-remove-spurious-warning-on-vfio_listener.patch [bz#2086262] - Resolves: bz#2031024 (Add support for fixing thread pool size [QEMU]) - Resolves: bz#2072379 (Fail to rebuild the reference count tables of qcow2 image on host block devices (e.g. LVs)) - Resolves: bz#2070804 (PXE boot crash qemu when using multiqueue vDPA) - Resolves: bz#2094270 (Do not set the hard vCPU limit to the soft vCPU limit in downstream qemu-kvm anymore) - Resolves: bz#2086262 ([Win11][tpm]vfio_listener_region_del received unaligned region)
53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
From 9e737aba614e94da4458f02d4ff97e95ffffd19f Mon Sep 17 00:00:00 2001
|
|
From: Si-Wei Liu <si-wei.liu@oracle.com>
|
|
Date: Fri, 6 May 2022 19:28:12 -0700
|
|
Subject: [PATCH 08/16] virtio-net: setup vhost_dev and notifiers for cvq only
|
|
when feature is negotiated
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Jason Wang <jasowang@redhat.com>
|
|
RH-MergeRequest: 98: Multiqueue fixes for vhost-vDPA
|
|
RH-Commit: [1/7] a5c5a2862b2e4d15ef7c09da3e4234fdef37cc66 (jasowang/qemu-kvm-cs)
|
|
RH-Bugzilla: 2070804
|
|
RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
RH-Acked-by: Cindy Lu <lulu@redhat.com>
|
|
|
|
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>
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Message-Id: <1651890498-24478-2-git-send-email-si-wei.liu@oracle.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit aa8581945a13712ff3eed0ad3ba7a9664fc1604b)
|
|
Signed-off-by: Jason Wang <jasowang@redhat.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 1067e72b39..ffb3475201 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;
|
|
--
|
|
2.31.1
|
|
|