drivers: use PCI registration macro

[dpdk.git] / lib / librte_vhost / virtio-net.c

diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c
index 13dc021..1785695 100644 (file)
--- a/lib/librte_vhost/virtio-net.c
+++ b/lib/librte_vhost/virtio-net.c
@@ -387,8 +387,6 @@ int
 vhost_set_features(int vid, uint64_t *pu)
 {
        struct virtio_net *dev;
-       uint16_t vhost_hlen;
-       uint16_t i;
 
        dev = get_device(vid);
        if (dev == NULL)
@@ -399,9 +397,9 @@ vhost_set_features(int vid, uint64_t *pu)
        dev->features = *pu;
        if (dev->features &
                ((1 << VIRTIO_NET_F_MRG_RXBUF) | (1ULL << VIRTIO_F_VERSION_1))) {
-               vhost_hlen = sizeof(struct virtio_net_hdr_mrg_rxbuf);
+               dev->vhost_hlen = sizeof(struct virtio_net_hdr_mrg_rxbuf);
        } else {
-               vhost_hlen = sizeof(struct virtio_net_hdr);
+               dev->vhost_hlen = sizeof(struct virtio_net_hdr);
        }
        LOG_DEBUG(VHOST_CONFIG,
                "(%d) mergeable RX buffers %s, virtio 1 %s\n",
@@ -409,13 +407,6 @@ vhost_set_features(int vid, uint64_t *pu)
                (dev->features & (1 << VIRTIO_NET_F_MRG_RXBUF)) ? "on" : "off",
                (dev->features & (1ULL << VIRTIO_F_VERSION_1)) ? "on" : "off");
 
-       for (i = 0; i < dev->virt_qp_nb; i++) {
-               uint16_t base_idx = i * VIRTIO_QNUM;
-
-               dev->virtqueue[base_idx + VIRTIO_RXQ]->vhost_hlen = vhost_hlen;
-               dev->virtqueue[base_idx + VIRTIO_TXQ]->vhost_hlen = vhost_hlen;
-       }
-
        return 0;
 }
 
@@ -570,6 +561,14 @@ vhost_set_vring_addr(int vid, struct vhost_vring_addr *addr)
                return -1;
        }
 
+       if (vq->last_used_idx != vq->used->idx) {
+               RTE_LOG(WARNING, VHOST_CONFIG,
+                       "last_used_idx (%u) and vq->used->idx (%u) mismatches; "
+                       "some packets maybe resent for Tx and dropped for Rx\n",
+                       vq->last_used_idx, vq->used->idx);
+               vq->last_used_idx     = vq->used->idx;
+       }
+
        vq->log_guest_addr = addr->log_guest_addr;
 
        LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n",
@@ -599,7 +598,6 @@ vhost_set_vring_base(int vid, struct vhost_vring_state *state)
 
        /* State->index refers to the queue index. The txq is 1, rxq is 0. */
        dev->virtqueue[state->index]->last_used_idx = state->num;
-       dev->virtqueue[state->index]->last_used_idx_res = state->num;
 
        return 0;
 }
@@ -796,7 +794,7 @@ rte_vhost_avail_entries(int vid, uint16_t queue_id)
        if (!vq->enabled)
                return 0;
 
-       return *(volatile uint16_t *)&vq->avail->idx - vq->last_used_idx_res;
+       return *(volatile uint16_t *)&vq->avail->idx - vq->last_used_idx;
 }
 
 int