[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/15] virtio-net: fill head desc after done all
From: |
wexu |
Subject: |
[Qemu-devel] [PATCH v2 10/15] virtio-net: fill head desc after done all in a chain |
Date: |
Wed, 16 Jan 2019 13:31:15 -0500 |
From: Wei Xu <address@hidden>
With the support of marking a descriptor used/unused in 'flags'
field for 1.1, the current way of filling a chained descriptors
does not work since driver side may get the wrong 'num_buffer'
information in case of the head descriptor has been filled in
while the subsequent ones are still in processing in device side.
This patch fills the head one after done all the others one.
Signed-off-by: Wei Xu <address@hidden>
---
hw/net/virtio-net.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index e37fc34..39336b9 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1198,6 +1198,8 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc,
const uint8_t *buf,
struct virtio_net_hdr_mrg_rxbuf mhdr;
unsigned mhdr_cnt = 0;
size_t offset, i, guest_offset;
+ VirtQueueElement head;
+ int head_len = 0;
if (!virtio_net_can_receive(nc)) {
return -1;
@@ -1275,7 +1277,13 @@ static ssize_t virtio_net_receive_rcu(NetClientState
*nc, const uint8_t *buf,
}
/* signal other side */
- virtqueue_fill(q->rx_vq, elem, total, i++);
+ if (i == 0) {
+ head_len = total;
+ head = *elem;
+ } else {
+ virtqueue_fill(q->rx_vq, elem, len, i);
+ }
+ i++;
g_free(elem);
}
@@ -1286,6 +1294,7 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc,
const uint8_t *buf,
&mhdr.num_buffers, sizeof mhdr.num_buffers);
}
+ virtqueue_fill(q->rx_vq, &head, head_len, 0);
virtqueue_flush(q->rx_vq, i);
virtio_notify(vdev, q->rx_vq);
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/15] packed ring virtio-net backends support, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 01/15] virtio: introduce packed ring definitions, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 02/15] virtio: redefine structure & memory cache for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 03/15] virtio: expand offset calculation for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 05/15] virtio: init wrap counter for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 04/15] virtio: add memory region init for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 06/15] virtio: init and desc empty check for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 08/15] virtio: fill/flush/pop for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 10/15] virtio-net: fill head desc after done all in a chain,
wexu <=
- [Qemu-devel] [PATCH v2 12/15] virtio: add vhost-net migration for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 07/15] virtio: get avail bytes check for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 13/15] virtio: packed ring feature bit for userspace backend, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 09/15] virtio: event suppression support for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 11/15] virtio: add userspace migration for packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 14/15] vhost: enable packed ring, wexu, 2019/01/16
- [Qemu-devel] [PATCH v2 15/15] virtio: enable packed ring via a new command line, wexu, 2019/01/16