ethdev: use constants for link state

[dpdk.git] / drivers / net / af_packet / rte_eth_af_packet.c

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index cac26e5..dee7b59 100644 (file)
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -5,7 +5,7 @@
  *
  *   Originally based upon librte_pmd_pcap code:
  *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
  *   Copyright(c) 2014 6WIND S.A.
  *   All rights reserved.
  *
@@ -53,8 +53,6 @@
 #include <unistd.h>
 #include <poll.h>
 
-#include "rte_eth_af_packet.h"
-
 #define ETH_AF_PACKET_IFACE_ARG                "iface"
 #define ETH_AF_PACKET_NUM_Q_ARG                "qpairs"
 #define ETH_AF_PACKET_BLOCKSIZE_ARG    "blocksz"
@@ -65,6 +63,8 @@
 #define DFLT_FRAME_SIZE                (1 << 11)
 #define DFLT_FRAME_COUNT       (1 << 9)
 
+#define RTE_PMD_AF_PACKET_MAX_RINGS 16
+
 struct pkt_rx_queue {
        int sockfd;
 
@@ -74,6 +74,7 @@ struct pkt_rx_queue {
        unsigned int framenum;
 
        struct rte_mempool *mb_pool;
+       uint8_t in_port;
 
        volatile unsigned long rx_pkts;
        volatile unsigned long err_pkts;
@@ -117,7 +118,7 @@ static const char *drivername = "AF_PACKET PMD";
 static struct rte_eth_link pmd_link = {
        .link_speed = 10000,
        .link_duplex = ETH_LINK_FULL_DUPLEX,
-       .link_status = 0
+       .link_status = ETH_LINK_DOWN,
 };
 
 static uint16_t
@@ -160,6 +161,7 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                ppd->tp_status = TP_STATUS_KERNEL;
                if (++framenum >= framecount)
                        framenum = 0;
+               mbuf->port = pkt_q->in_port;
 
                /* account for the receive frame */
                bufs[i] = mbuf;
@@ -220,7 +222,8 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        }
 
        /* kick-off transmits */
-       sendto(pkt_q->sockfd, NULL, 0, MSG_DONTWAIT, NULL, 0);
+       if (sendto(pkt_q->sockfd, NULL, 0, MSG_DONTWAIT, NULL, 0) == -1)
+               return 0; /* error sending -- no packets transmitted */
 
        pkt_q->framenum = framenum;
        pkt_q->tx_pkts += num_tx;
@@ -231,7 +234,7 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 static int
 eth_dev_start(struct rte_eth_dev *dev)
 {
-       dev->data->dev_link.link_status = 1;
+       dev->data->dev_link.link_status = ETH_LINK_UP;
        return 0;
 }
 
@@ -254,7 +257,7 @@ eth_dev_stop(struct rte_eth_dev *dev)
                        close(sockfd);
        }
 
-       dev->data->dev_link.link_status = 0;
+       dev->data->dev_link.link_status = ETH_LINK_DOWN;
 }
 
 static int
@@ -364,6 +367,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
        }
 
        dev->data->rx_queues[rx_queue_id] = pkt_q;
+       pkt_q->in_port = dev->data->port_id;
 
        return 0;
 }
@@ -431,7 +435,6 @@ rte_pmd_init_internals(const char *name,
                        struct rte_kvargs *kvlist)
 {
        struct rte_eth_dev_data *data = NULL;
-       struct rte_pci_device *pci_dev = NULL;
        struct rte_kvargs_pair *pair = NULL;
        struct ifreq ifr;
        size_t ifnamelen;
@@ -469,10 +472,6 @@ rte_pmd_init_internals(const char *name,
        if (data == NULL)
                goto error_early;
 
-       pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, numa_node);
-       if (pci_dev == NULL)
-               goto error_early;
-
        *internals = rte_zmalloc_socket(name, sizeof(**internals),
                                        0, numa_node);
        if (*internals == NULL)
@@ -655,8 +654,8 @@ rte_pmd_init_internals(const char *name,
        /*
         * now put it all together
         * - store queue data in internals,
-        * - store numa_node info in pci_driver
-        * - point eth_dev_data to internals and pci_driver
+        * - store numa_node in eth_dev
+        * - point eth_dev_data to internals
         * - and point eth_dev structure to new eth_dev_data structure
         */
 
@@ -668,12 +667,16 @@ rte_pmd_init_internals(const char *name,
        data->nb_tx_queues = (uint16_t)nb_queues;
        data->dev_link = pmd_link;
        data->mac_addrs = &(*internals)->eth_addr;
-
-       pci_dev->numa_node = numa_node;
+       strncpy(data->name,
+               (*eth_dev)->data->name, strlen((*eth_dev)->data->name));
 
        (*eth_dev)->data = data;
        (*eth_dev)->dev_ops = &ops;
-       (*eth_dev)->pci_dev = pci_dev;
+       (*eth_dev)->driver = NULL;
+       (*eth_dev)->data->dev_flags = RTE_ETH_DEV_DETACHABLE;
+       (*eth_dev)->data->drv_name = drivername;
+       (*eth_dev)->data->kdrv = RTE_KDRV_NONE;
+       (*eth_dev)->data->numa_node = numa_node;
 
        return 0;
 
@@ -692,7 +695,6 @@ error:
        }
        rte_free(*internals);
 error_early:
-       rte_free(pci_dev);
        rte_free(data);
        return -1;
 }
@@ -798,7 +800,7 @@ rte_eth_from_packet(const char *name,
        return 0;
 }
 
-int
+static int
 rte_pmd_af_packet_devinit(const char *name, const char *params)
 {
        unsigned numa_node;
@@ -836,10 +838,43 @@ exit:
        return ret;
 }
 
+static int
+rte_pmd_af_packet_devuninit(const char *name)
+{
+       struct rte_eth_dev *eth_dev = NULL;
+       struct pmd_internals *internals;
+       unsigned q;
+
+       RTE_LOG(INFO, PMD, "Closing AF_PACKET ethdev on numa socket %u\n",
+                       rte_socket_id());
+
+       if (name == NULL)
+               return -1;
+
+       /* find the ethdev entry */
+       eth_dev = rte_eth_dev_allocated(name);
+       if (eth_dev == NULL)
+               return -1;
+
+       internals = eth_dev->data->dev_private;
+       for (q = 0; q < internals->nb_queues; q++) {
+               rte_free(internals->rx_queue[q].rd);
+               rte_free(internals->tx_queue[q].rd);
+       }
+
+       rte_free(eth_dev->data->dev_private);
+       rte_free(eth_dev->data);
+
+       rte_eth_dev_release_port(eth_dev);
+
+       return 0;
+}
+
 static struct rte_driver pmd_af_packet_drv = {
        .name = "eth_af_packet",
        .type = PMD_VDEV,
        .init = rte_pmd_af_packet_devinit,
+       .uninit = rte_pmd_af_packet_devuninit,
 };
 
 PMD_REGISTER_DRIVER(pmd_af_packet_drv);