From: Akihiko Odaki Date: Fri, 22 Nov 2024 05:03:09 +0000 (+0900) Subject: virtio-net: Do not check for the queue before RSS X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=162bdb8113d32e2efb3c6967e3828d4f0c4e14e0;p=qemu.git virtio-net: Do not check for the queue before RSS virtio_net_can_receive() checks if the queue is ready, but RSS will change the queue to use so, strictly speaking, we may still be able to receive the packet even if the queue initially provided is not ready. Perform RSS before virtio_net_can_receive() to cover such a case. Fixes: 4474e37a5b3a ("virtio-net: implement RX RSS processing") Signed-off-by: Akihiko Odaki Signed-off-by: Jason Wang --- diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index a2a8d6b07b..d4aaf362b7 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1911,10 +1911,6 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, size_t offset, i, guest_offset, j; ssize_t err; - if (!virtio_net_can_receive(nc)) { - return -1; - } - if (!no_rss && n->rss_data.enabled && n->rss_data.enabled_software_rss) { int index = virtio_net_process_rss(nc, buf, size, &extra_hdr); if (index >= 0) { @@ -1924,6 +1920,10 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf, } } + if (!virtio_net_can_receive(nc)) { + return -1; + } + /* hdr_len refers to the header we supply to the guest */ if (!virtio_net_has_buffers(q, size + n->guest_hdr_len - n->host_hdr_len)) { return 0;