OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio-net: Fix vhost virtqueue notifiers for RSS

Browse Source 
virtio_net_guest_notifier_pending() and virtio_net_guest_notifier_mask()
checked VIRTIO_NET_F_MQ to know there are multiple queues, but
VIRTIO_NET_F_RSS also enables multiple queues. Refer to n->multiqueue,
which is set to true either of VIRTIO_NET_F_MQ or VIRTIO_NET_F_RSS is
enabled.

Fixes: 68b0a6395f ("virtio-net: align ctrl_vq index for non-mq guest for vhost_vdpa")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Akihiko Odaki 2024-03-27 11:05:09 +09:00 committed by Jason Wang
parent 5012e522ac
commit 1c188fc8cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/net/virtio-net.c
View File

@ -3426,7 +3426,7 @@ static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx)
VirtIONet *n = VIRTIO_NET(vdev); VirtIONet *n = VIRTIO_NET(vdev);
NetClientState *nc; NetClientState *nc;
assert(n->vhost_started); assert(n->vhost_started);
if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_MQ) && idx == 2) { if (!n->multiqueue && idx == 2) {
/* Must guard against invalid features and bogus queue index /* Must guard against invalid features and bogus queue index
* from being set by malicious guest, or penetrated through * from being set by malicious guest, or penetrated through
* buggy migration stream. * buggy migration stream.
@ -3458,7 +3458,7 @@ static void virtio_net_guest_notifier_mask(VirtIODevice *vdev, int idx,
VirtIONet *n = VIRTIO_NET(vdev); VirtIONet *n = VIRTIO_NET(vdev);
NetClientState *nc; NetClientState *nc;
assert(n->vhost_started); assert(n->vhost_started);
if (!virtio_vdev_has_feature(vdev, VIRTIO_NET_F_MQ) && idx == 2) { if (!n->multiqueue && idx == 2) {
/* Must guard against invalid features and bogus queue index /* Must guard against invalid features and bogus queue index
* from being set by malicious guest, or penetrated through * from being set by malicious guest, or penetrated through
* buggy migration stream. * buggy migration stream.