net: add rte prefix to ether structures

[dpdk.git] / drivers / net / netvsc / hn_rxtx.c

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 6197118..a5850c2 100644 (file)
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -108,7 +108,7 @@ static void
 hn_update_packet_stats(struct hn_stats *stats, const struct rte_mbuf *m)
 {
        uint32_t s = m->pkt_len;
-       const struct ether_addr *ea;
+       const struct rte_ether_addr *ea;
 
        if (s == 64) {
                stats->size_bins[1]++;
@@ -123,11 +123,11 @@ hn_update_packet_stats(struct hn_stats *stats, const struct rte_mbuf *m)
                        stats->size_bins[0]++;
                else if (s < 1519)
                        stats->size_bins[6]++;
-               else if (s >= 1519)
+               else
                        stats->size_bins[7]++;
        }
 
-       ea = rte_pktmbuf_mtod(m, const struct ether_addr *);
+       ea = rte_pktmbuf_mtod(m, const struct rte_ether_addr *);
        if (is_multicast_ether_addr(ea)) {
                if (is_broadcast_ether_addr(ea))
                        stats->broadcast++;
@@ -840,12 +840,9 @@ fail:
        return error;
 }
 
-void
-hn_dev_rx_queue_release(void *arg)
+static void
+hn_rx_queue_free(struct hn_rx_queue *rxq, bool keep_primary)
 {
-       struct hn_rx_queue *rxq = arg;
-
-       PMD_INIT_FUNC_TRACE();
 
        if (!rxq)
                return;
@@ -857,10 +854,21 @@ hn_dev_rx_queue_release(void *arg)
        hn_vf_rx_queue_release(rxq->hv, rxq->queue_id);
 
        /* Keep primary queue to allow for control operations */
-       if (rxq != rxq->hv->primary) {
-               rte_free(rxq->event_buf);
-               rte_free(rxq);
-       }
+       if (keep_primary && rxq == rxq->hv->primary)
+               return;
+
+       rte_free(rxq->event_buf);
+       rte_free(rxq);
+}
+
+void
+hn_dev_rx_queue_release(void *arg)
+{
+       struct hn_rx_queue *rxq = arg;
+
+       PMD_INIT_FUNC_TRACE();
+
+       hn_rx_queue_free(rxq, true);
 }
 
 int
@@ -1313,8 +1321,8 @@ hn_xmit_pkts(void *ptxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                return 0;
 
        /* Transmit over VF if present and up */
-       vf_dev = hv->vf_dev;
-       rte_compiler_barrier();
+       vf_dev = hn_get_vf_dev(hv);
+
        if (vf_dev && vf_dev->data->dev_started) {
                void *sub_q = vf_dev->data->tx_queues[queue_id];
 
@@ -1393,6 +1401,24 @@ fail:
        return nb_tx;
 }
 
+static uint16_t
+hn_recv_vf(uint16_t vf_port, const struct hn_rx_queue *rxq,
+          struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+{
+       uint16_t i, n;
+
+       if (unlikely(nb_pkts == 0))
+               return 0;
+
+       n = rte_eth_rx_burst(vf_port, rxq->queue_id, rx_pkts, nb_pkts);
+
+       /* relabel the received mbufs */
+       for (i = 0; i < n; i++)
+               rx_pkts[i]->port = rxq->port_id;
+
+       return n;
+}
+
 uint16_t
 hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 {
@@ -1404,30 +1430,41 @@ hn_recv_pkts(void *prxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        if (unlikely(hv->closed))
                return 0;
 
-       vf_dev = hv->vf_dev;
-       rte_compiler_barrier();
+       /* Receive from VF if present and up */
+       vf_dev = hn_get_vf_dev(hv);
 
-       if (vf_dev && vf_dev->data->dev_started) {
-               /* Normally, with SR-IOV the ring buffer will be empty */
+       /* Check for new completions */
+       if (likely(rte_ring_count(rxq->rx_ring) < nb_pkts))
                hn_process_events(hv, rxq->queue_id, 0);
 
-               /* Get mbufs some bufs off of staging ring */
-               nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring,
-                                                  (void **)rx_pkts,
-                                                  nb_pkts / 2, NULL);
-               /* And rest off of VF */
-               nb_rcv += rte_eth_rx_burst(vf_dev->data->port_id,
-                                          rxq->queue_id,
-                                          rx_pkts + nb_rcv, nb_pkts - nb_rcv);
-       } else {
-               /* If receive ring is not full then get more */
-               if (rte_ring_count(rxq->rx_ring) < nb_pkts)
-                       hn_process_events(hv, rxq->queue_id, 0);
+       /* Always check the vmbus path for multicast and new flows */
+       nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring,
+                                          (void **)rx_pkts, nb_pkts, NULL);
 
-               nb_rcv = rte_ring_sc_dequeue_burst(rxq->rx_ring,
-                                                  (void **)rx_pkts,
-                                                  nb_pkts, NULL);
-       }
+       /* If VF is available, check that as well */
+       if (vf_dev && vf_dev->data->dev_started)
+               nb_rcv += hn_recv_vf(vf_dev->data->port_id, rxq,
+                                    rx_pkts + nb_rcv, nb_pkts - nb_rcv);
 
        return nb_rcv;
 }
+
+void
+hn_dev_free_queues(struct rte_eth_dev *dev)
+{
+       unsigned int i;
+
+       for (i = 0; i < dev->data->nb_rx_queues; i++) {
+               struct hn_rx_queue *rxq = dev->data->rx_queues[i];
+
+               hn_rx_queue_free(rxq, false);
+               dev->data->rx_queues[i] = NULL;
+       }
+       dev->data->nb_rx_queues = 0;
+
+       for (i = 0; i < dev->data->nb_tx_queues; i++) {
+               hn_dev_tx_queue_release(dev->data->tx_queues[i]);
+               dev->data->tx_queues[i] = NULL;
+       }
+       dev->data->nb_tx_queues = 0;
+}