|
 |
b91920 |
From 82b43dd199d5492527b73002d4c3b009a98ca7a0 Mon Sep 17 00:00:00 2001
|
|
|
b91920 |
From: Jens Freimann <jfreimann@redhat.com>
|
|
|
b91920 |
Date: Fri, 11 Jan 2019 10:39:28 +0100
|
|
|
b91920 |
Subject: [PATCH 14/18] net/virtio: check head desc with correct wrap counter
|
|
|
b91920 |
|
|
|
b91920 |
[ upstream commit a4270ea4ff79b46280dd542f4ab3eb45f8c9685a ]
|
|
|
b91920 |
|
|
|
b91920 |
In virtio_pq_send_command() we check for a used descriptor
|
|
|
b91920 |
and wait in an idle loop until it becomes used. We can't use
|
|
|
b91920 |
vq->used_wrap_counter here to check for the first descriptor
|
|
|
b91920 |
we made available because the ring could have wrapped. Let's use
|
|
|
b91920 |
the used_wrap_counter that matches the state of the head descriptor.
|
|
|
b91920 |
|
|
|
b91920 |
Fixes: ec194c2f1895 ("net/virtio: support packed queue in send command")
|
|
|
b91920 |
|
|
|
b91920 |
Signed-off-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
b91920 |
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
|
|
|
b91920 |
(cherry picked from commit a4270ea4ff79b46280dd542f4ab3eb45f8c9685a)
|
|
|
b91920 |
Signed-off-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
b91920 |
---
|
|
|
b91920 |
drivers/net/virtio/virtio_ethdev.c | 11 ++++++-----
|
|
|
b91920 |
drivers/net/virtio/virtqueue.h | 10 ++++++++--
|
|
|
b91920 |
2 files changed, 14 insertions(+), 7 deletions(-)
|
|
|
b91920 |
|
|
|
b91920 |
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
|
|
|
b91920 |
index 53773445b..7bd38a292 100644
|
|
|
b91920 |
--- a/drivers/net/virtio/virtio_ethdev.c
|
|
|
b91920 |
+++ b/drivers/net/virtio/virtio_ethdev.c
|
|
|
b91920 |
@@ -149,7 +149,7 @@ virtio_pq_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,
|
|
|
b91920 |
int head;
|
|
|
b91920 |
struct vring_packed_desc *desc = vq->ring_packed.desc_packed;
|
|
|
b91920 |
struct virtio_pmd_ctrl *result;
|
|
|
b91920 |
- int wrap_counter;
|
|
|
b91920 |
+ bool avail_wrap_counter, used_wrap_counter;
|
|
|
b91920 |
uint16_t flags;
|
|
|
b91920 |
int sum = 0;
|
|
|
b91920 |
int k;
|
|
|
b91920 |
@@ -161,7 +161,8 @@ virtio_pq_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,
|
|
|
b91920 |
* One RX packet for ACK.
|
|
|
b91920 |
*/
|
|
|
b91920 |
head = vq->vq_avail_idx;
|
|
|
b91920 |
- wrap_counter = vq->avail_wrap_counter;
|
|
|
b91920 |
+ avail_wrap_counter = vq->avail_wrap_counter;
|
|
|
b91920 |
+ used_wrap_counter = vq->used_wrap_counter;
|
|
|
b91920 |
desc[head].flags = VRING_DESC_F_NEXT;
|
|
|
b91920 |
desc[head].addr = cvq->virtio_net_hdr_mem;
|
|
|
b91920 |
desc[head].len = sizeof(struct virtio_net_ctrl_hdr);
|
|
|
b91920 |
@@ -199,8 +200,8 @@ virtio_pq_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,
|
|
|
b91920 |
VRING_DESC_F_USED(!vq->avail_wrap_counter);
|
|
|
b91920 |
desc[vq->vq_avail_idx].flags = flags;
|
|
|
b91920 |
flags = VRING_DESC_F_NEXT;
|
|
|
b91920 |
- flags |= VRING_DESC_F_AVAIL(wrap_counter) |
|
|
|
b91920 |
- VRING_DESC_F_USED(!wrap_counter);
|
|
|
b91920 |
+ flags |= VRING_DESC_F_AVAIL(avail_wrap_counter) |
|
|
|
b91920 |
+ VRING_DESC_F_USED(!avail_wrap_counter);
|
|
|
b91920 |
desc[head].flags = flags;
|
|
|
b91920 |
rte_smp_wmb();
|
|
|
b91920 |
|
|
|
b91920 |
@@ -216,7 +217,7 @@ virtio_pq_send_command(struct virtnet_ctl *cvq, struct virtio_pmd_ctrl *ctrl,
|
|
|
b91920 |
do {
|
|
|
b91920 |
rte_rmb();
|
|
|
b91920 |
usleep(100);
|
|
|
b91920 |
- } while (!desc_is_used(&desc[head], vq));
|
|
|
b91920 |
+ } while (!__desc_is_used(&desc[head], used_wrap_counter));
|
|
|
b91920 |
|
|
|
b91920 |
/* now get used descriptors */
|
|
|
b91920 |
while (desc_is_used(&desc[vq->vq_used_cons_idx], vq)) {
|
|
|
b91920 |
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
|
|
|
b91920 |
index b142fd488..75f5782bc 100644
|
|
|
b91920 |
--- a/drivers/net/virtio/virtqueue.h
|
|
|
b91920 |
+++ b/drivers/net/virtio/virtqueue.h
|
|
|
b91920 |
@@ -256,7 +256,7 @@ struct virtio_tx_region {
|
|
|
b91920 |
};
|
|
|
b91920 |
|
|
|
b91920 |
static inline int
|
|
|
b91920 |
-desc_is_used(struct vring_packed_desc *desc, struct virtqueue *vq)
|
|
|
b91920 |
+__desc_is_used(struct vring_packed_desc *desc, bool wrap_counter)
|
|
|
b91920 |
{
|
|
|
b91920 |
uint16_t used, avail, flags;
|
|
|
b91920 |
|
|
|
b91920 |
@@ -264,7 +264,13 @@ desc_is_used(struct vring_packed_desc *desc, struct virtqueue *vq)
|
|
|
b91920 |
used = !!(flags & VRING_DESC_F_USED(1));
|
|
|
b91920 |
avail = !!(flags & VRING_DESC_F_AVAIL(1));
|
|
|
b91920 |
|
|
|
b91920 |
- return avail == used && used == vq->used_wrap_counter;
|
|
|
b91920 |
+ return avail == used && used == wrap_counter;
|
|
|
b91920 |
+}
|
|
|
b91920 |
+
|
|
|
b91920 |
+static inline int
|
|
|
b91920 |
+desc_is_used(struct vring_packed_desc *desc, struct virtqueue *vq)
|
|
|
b91920 |
+{
|
|
|
b91920 |
+ return __desc_is_used(desc, vq->used_wrap_counter);
|
|
|
b91920 |
}
|
|
|
b91920 |
|
|
|
b91920 |
|
|
|
b91920 |
--
|
|
|
b91920 |
2.21.0
|
|
|
b91920 |
|