Skip to contentSkip to conversation

virtio: introduce virtqueue_unmap_sg()

PATCH Superseded Jason Wang 2 participants 6 messages Sep 18, 2015 – Sep 25, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jason Wang

author
#0 lore raw

PATCH 1/3 virtio: introduce virtqueue_unmap_sg()

Factor out sg unmapping logic. This will be reused by the patch that can discard descriptor.

Cc Michael S. Tsirkin <[email protected]>
---
 hw/virtio/virtio.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
hw/virtio/virtio.c +10 -5
index 0832db9..eb8d5ca 100644
@@ -243,15 +243,12 @@ int virtio_queue_empty(VirtQueue *vq)
     return vring_avail_idx(vq) == vq->last_avail_idx;
 }
 
-void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
-                    unsigned int len, unsigned int idx)
+static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
+                               unsigned int len)
 {
     unsigned int offset;
     int i;
 
-    trace_virtqueue_fill(vq, elem, len, idx);
-
-    offset = 0;
     for (i = 0; i < elem->in_num; i++) {
         size_t size = MIN(len - offset, elem->in_sg[i].iov_len);
 
@@ -266,6 +263,14 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
         cpu_physical_memory_unmap(elem->out_sg[i].iov_base,
                                   elem->out_sg[i].iov_len,
                                   0, elem->out_sg[i].iov_len);
+}
+
+void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
+                    unsigned int len, unsigned int idx)
+{
+    trace_virtqueue_fill(vq, elem, len, idx);
+
+    virtqueue_unmap_sg(vq, elem, len);
 
     idx = (idx + vring_used_idx(vq)) % vq->vring.num;
 
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 2/3 virtio: introduce virtqueue_discard()

This patch introduces virtqueue_discard() to discard a descriptor and unmap the sgs. This will be used by the patch that will discard descriptor when packet is truncated.

Cc Michael S. Tsirkin <[email protected]>
---
 hw/virtio/virtio.c         | 7 +++++++
 include/hw/virtio/virtio.h | 2 ++
 2 files changed, 9 insertions(+)
hw/virtio/virtio.c +7 -0
index eb8d5ca..d24ee80 100644
@@ -265,6 +265,13 @@ static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
                                   0, elem->out_sg[i].iov_len);
 }
 
+void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
+                       unsigned int len)
+{
+    vq->last_avail_idx--;
+    virtqueue_unmap_sg(vq, elem, len);
+}
+
 void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
                     unsigned int len, unsigned int idx)
 {
include/hw/virtio/virtio.h +2 -0
index 6201ee8..9d09115 100644
@@ -146,6 +146,8 @@ void virtio_del_queue(VirtIODevice *vdev, int n);
 void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
                     unsigned int len);
 void virtqueue_flush(VirtQueue *vq, unsigned int count);
+void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem,
+                       unsigned int len);
 void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
                     unsigned int len, unsigned int idx);
 
Signature · 1 line
2.1.4
author
#2 lore raw

PATCH 3/3 virtio-net: correctly drop truncated packets

In reply to Jason Wang

When packet is truncated during receiving, we drop the packets but neither discard the descriptor nor add and signal used descriptor. This will lead several issues:

- sg mappings are leaked
- rx will be stalled if a lots of packets were truncated

In order to be consistent with vhost, fix by discarding the descriptor in this case.

Cc Michael S. Tsirkin <[email protected]>
---
 hw/net/virtio-net.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
hw/net/virtio-net.c +1 -7
index f72eebf..038a18b 100644
@@ -1086,13 +1086,7 @@ static ssize_t virtio_net_receive(NetClientState *nc, const uint8_t *buf, size_t
          * must have consumed the complete packet.
          * Otherwise, drop it. */
         if (!n->mergeable_rx_bufs && offset < size) {
-#if 0
-            error_report("virtio-net truncated non-mergeable packet: "
-                         "i %zd mergeable %d offset %zd, size %zd, "
-                         "guest hdr len %zd, host hdr len %zd",
-                         i, n->mergeable_rx_bufs,
-                         offset, size, n->guest_hdr_len, n->host_hdr_len);
-#endif
+            virtqueue_discard(q->rx_vq, &elem, total);
             return size;
         }
 
Signature · 1 line
2.1.4
#3 lore raw
In reply to Jason Wang
Quoted 21 lines · Jason Wang

Factor out sg unmapping logic. This will be reused by the patch that can discard descriptor.

Cc Michael S. Tsirkin <[email protected]>
---
 hw/virtio/virtio.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
hw/virtio/virtio.c +2 -2
index 0832db9..eb8d5ca 100644
@@ -243,15 +243,12 @@ int virtio_queue_empty(VirtQueue *vq)
     return vring_avail_idx(vq) == vq->last_avail_idx;
 }
 
-void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
-                    unsigned int len, unsigned int idx)
+static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
+                               unsigned int len)

hw/virtio/virtio.c int virtio_queue_empty(VirtQueue *vq) · line 254

Quoted 10 lines
hw/virtio/virtio.c +0 -3
 {
     unsigned int offset;
     int i;
 
-    trace_virtqueue_fill(vq, elem, len, idx);
-
-    offset = 0;
     for (i = 0; i < elem->in_num; i++) {
         size_t size = MIN(len - offset, elem->in_sg[i].iov_len);
 

Should the "offset = 0" really be dropped here? Seems like it ends up uninitialized. GCC thinks it might too.

Quoted 6 lines
hw/virtio/virtio.c +1 -0
@@ -266,6 +263,14 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
         cpu_physical_memory_unmap(elem->out_sg[i].iov_base,
                                   elem->out_sg[i].iov_len,
                                   0, elem->out_sg[i].iov_len);
+}

hw/virtio/virtio.c void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, · line 276

Quoted 10 lines
hw/virtio/virtio.c +7 -0
+
+void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
+                    unsigned int len, unsigned int idx)
+{
+    trace_virtqueue_fill(vq, elem, len, idx);
+
+    virtqueue_unmap_sg(vq, elem, len);
 
     idx = (idx + vring_used_idx(vq)) % vq->vring.num;
 

Thanks,

Signature · 1 line
Andrew James
#4 lore raw
In reply to Jason Wang
Quoted 21 lines · Jason Wang

Factor out sg unmapping logic. This will be reused by the patch that can discard descriptor.

Cc Michael S. Tsirkin <[email protected]>
---
 hw/virtio/virtio.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
hw/virtio/virtio.c +2 -2
index 0832db9..eb8d5ca 100644
@@ -243,15 +243,12 @@ int virtio_queue_empty(VirtQueue *vq)
     return vring_avail_idx(vq) == vq->last_avail_idx;
 }
 
-void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
-                    unsigned int len, unsigned int idx)
+static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
+                               unsigned int len)

hw/virtio/virtio.c int virtio_queue_empty(VirtQueue *vq) · line 254

Quoted 10 lines
hw/virtio/virtio.c +0 -3
 {
     unsigned int offset;
     int i;
 
-    trace_virtqueue_fill(vq, elem, len, idx);
-
-    offset = 0;
     for (i = 0; i < elem->in_num; i++) {
         size_t size = MIN(len - offset, elem->in_sg[i].iov_len);
 

Should the "offset = 0" really be dropped here? Seems like it ends up uninitialized. GCC thinks it might too.

Quoted 6 lines
hw/virtio/virtio.c +1 -0
@@ -266,6 +263,14 @@ void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
         cpu_physical_memory_unmap(elem->out_sg[i].iov_base,
                                   elem->out_sg[i].iov_len,
                                   0, elem->out_sg[i].iov_len);
+}

hw/virtio/virtio.c void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, · line 276

Quoted 10 lines
hw/virtio/virtio.c +7 -0
+
+void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
+                    unsigned int len, unsigned int idx)
+{
+    trace_virtqueue_fill(vq, elem, len, idx);
+
+    virtqueue_unmap_sg(vq, elem, len);
 
     idx = (idx + vring_used_idx(vq)) % vq->vring.num;
 

Thanks,

Signature · 1 line
Andrew James
author
#5 lore raw
Quoted 26 lines · Andrew James
Quoted 25 lines · Jason Wang
Quoted 25 lines

Factor out sg unmapping logic. This will be reused by the patch that can discard descriptor.

Cc Michael S. Tsirkin <[email protected]>
---
 hw/virtio/virtio.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
hw/virtio/virtio.c +2 -2
index 0832db9..eb8d5ca 100644
@@ -243,15 +243,12 @@ int virtio_queue_empty(VirtQueue *vq)
     return vring_avail_idx(vq) == vq->last_avail_idx;
 }
 
-void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem,
-                    unsigned int len, unsigned int idx)
+static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
+                               unsigned int len)
 {
     unsigned int offset;
     int i;
 
Quoted 7 lines
Quoted 6 lines

hw/virtio/virtio.c int virtio_queue_empty(VirtQueue *vq) · line 254

Quoted 6 lines
hw/virtio/virtio.c +0 -3
-    trace_virtqueue_fill(vq, elem, len, idx);
-
-    offset = 0;
     for (i = 0; i < elem->in_num; i++) {
         size_t size = MIN(len - offset, elem->in_sg[i].iov_len);
 

Should the "offset = 0" really be dropped here?

Probably not.

Quoted 3 lines

Seems like it ends
up uninitialized. GCC thinks it might too.

Yes, will keep the offset initialization in V2.

Thanks