net/txgbe: add Rx and Tx init

[dpdk.git] / drivers / net / null / rte_eth_null.c

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 2c08ebf..49ee8da 100644 (file)
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -14,13 +14,16 @@
 
 #define ETH_NULL_PACKET_SIZE_ARG       "size"
 #define ETH_NULL_PACKET_COPY_ARG       "copy"
+#define ETH_NULL_PACKET_NO_RX_ARG      "no-rx"
 
 static unsigned int default_packet_size = 64;
 static unsigned int default_packet_copy;
+static unsigned int default_no_rx;
 
 static const char *valid_arguments[] = {
        ETH_NULL_PACKET_SIZE_ARG,
        ETH_NULL_PACKET_COPY_ARG,
+       ETH_NULL_PACKET_NO_RX_ARG,
        NULL
 };
 
@@ -39,11 +42,13 @@ struct null_queue {
 struct pmd_options {
        unsigned int packet_copy;
        unsigned int packet_size;
+       unsigned int no_rx;
 };
 
 struct pmd_internals {
        unsigned int packet_size;
        unsigned int packet_copy;
+       unsigned int no_rx;
        uint16_t port_id;
 
        struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
@@ -68,7 +73,7 @@ static struct rte_eth_link pmd_link = {
        .link_autoneg = ETH_LINK_FIXED,
 };
 
-static int eth_null_logtype;
+RTE_LOG_REGISTER(eth_null_logtype, pmd.net.null, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
        rte_log(RTE_LOG_ ## level, eth_null_logtype, \
@@ -126,6 +131,13 @@ eth_null_copy_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
        return i;
 }
 
+static uint16_t
+eth_null_no_rx(void *q __rte_unused, struct rte_mbuf **bufs __rte_unused,
+               uint16_t nb_bufs __rte_unused)
+{
+       return 0;
+}
+
 static uint16_t
 eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 {
@@ -181,13 +193,15 @@ eth_dev_start(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 eth_dev_stop(struct rte_eth_dev *dev)
 {
        if (dev == NULL)
-               return;
+               return 0;
 
        dev->data->dev_link.link_status = ETH_LINK_DOWN;
+
+       return 0;
 }
 
 static int
@@ -446,7 +460,23 @@ eth_mac_address_set(__rte_unused struct rte_eth_dev *dev,
        return 0;
 }
 
+static int
+eth_dev_close(struct rte_eth_dev *dev)
+{
+       PMD_LOG(INFO, "Closing null ethdev on NUMA socket %u",
+                       rte_socket_id());
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       /* mac_addrs must not be freed alone because part of dev_private */
+       dev->data->mac_addrs = NULL;
+
+       return 0;
+}
+
 static const struct eth_dev_ops ops = {
+       .dev_close = eth_dev_close,
        .dev_start = eth_dev_start,
        .dev_stop = eth_dev_stop,
        .dev_configure = eth_dev_configure,
@@ -504,6 +534,7 @@ eth_dev_null_create(struct rte_vdev_device *dev, struct pmd_options *args)
        internals = eth_dev->data->dev_private;
        internals->packet_size = args->packet_size;
        internals->packet_copy = args->packet_copy;
+       internals->no_rx = args->no_rx;
        internals->port_id = eth_dev->data->port_id;
        rte_eth_random_addr(internals->eth_addr.addr_bytes);
 
@@ -519,6 +550,7 @@ eth_dev_null_create(struct rte_vdev_device *dev, struct pmd_options *args)
        data->mac_addrs = &internals->eth_addr;
        data->promiscuous = 1;
        data->all_multicast = 1;
+       data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
 
        eth_dev->dev_ops = &ops;
 
@@ -526,6 +558,9 @@ eth_dev_null_create(struct rte_vdev_device *dev, struct pmd_options *args)
        if (internals->packet_copy) {
                eth_dev->rx_pkt_burst = eth_null_copy_rx;
                eth_dev->tx_pkt_burst = eth_null_copy_tx;
+       } else if (internals->no_rx) {
+               eth_dev->rx_pkt_burst = eth_null_no_rx;
+               eth_dev->tx_pkt_burst = eth_null_tx;
        } else {
                eth_dev->rx_pkt_burst = eth_null_rx;
                eth_dev->tx_pkt_burst = eth_null_tx;
@@ -569,6 +604,24 @@ get_packet_copy_arg(const char *key __rte_unused,
        return 0;
 }
 
+static int
+get_packet_no_rx_arg(const char *key __rte_unused,
+               const char *value, void *extra_args)
+{
+       const char *a = value;
+       unsigned int no_rx;
+
+       if (value == NULL || extra_args == NULL)
+               return -EINVAL;
+
+       no_rx = (unsigned int)strtoul(a, NULL, 0);
+       if (no_rx != 0 && no_rx != 1)
+               return -1;
+
+       *(unsigned int *)extra_args = no_rx;
+       return 0;
+}
+
 static int
 rte_pmd_null_probe(struct rte_vdev_device *dev)
 {
@@ -576,6 +629,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
        struct pmd_options args = {
                .packet_copy = default_packet_copy,
                .packet_size = default_packet_size,
+               .no_rx = default_no_rx,
        };
        struct rte_kvargs *kvlist = NULL;
        struct rte_eth_dev *eth_dev;
@@ -602,6 +656,9 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
                if (internals->packet_copy) {
                        eth_dev->rx_pkt_burst = eth_null_copy_rx;
                        eth_dev->tx_pkt_burst = eth_null_copy_tx;
+               } else if (internals->no_rx) {
+                       eth_dev->rx_pkt_burst = eth_null_no_rx;
+                       eth_dev->tx_pkt_burst = eth_null_tx;
                } else {
                        eth_dev->rx_pkt_burst = eth_null_rx;
                        eth_dev->tx_pkt_burst = eth_null_tx;
@@ -627,6 +684,20 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
                                &get_packet_copy_arg, &args.packet_copy);
                if (ret < 0)
                        goto free_kvlist;
+
+               ret = rte_kvargs_process(kvlist,
+                               ETH_NULL_PACKET_NO_RX_ARG,
+                               &get_packet_no_rx_arg, &args.no_rx);
+               if (ret < 0)
+                       goto free_kvlist;
+
+               if (args.no_rx && args.packet_copy) {
+                       PMD_LOG(ERR,
+                               "Both %s and %s arguments at the same time not supported",
+                               ETH_NULL_PACKET_COPY_ARG,
+                               ETH_NULL_PACKET_NO_RX_ARG);
+                       goto free_kvlist;
+               }
        }
 
        PMD_LOG(INFO, "Configure pmd_null: packet size is %d, "
@@ -649,18 +720,12 @@ rte_pmd_null_remove(struct rte_vdev_device *dev)
        if (!dev)
                return -EINVAL;
 
-       PMD_LOG(INFO, "Closing null ethdev on numa socket %u",
-                       rte_socket_id());
-
        /* find the ethdev entry */
        eth_dev = rte_eth_dev_allocated(rte_vdev_device_name(dev));
        if (eth_dev == NULL)
-               return -1;
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               /* mac_addrs must not be freed alone because part of dev_private */
-               eth_dev->data->mac_addrs = NULL;
+               return 0; /* port already released */
 
+       eth_dev_close(eth_dev);
        rte_eth_dev_release_port(eth_dev);
 
        return 0;
@@ -675,11 +740,5 @@ RTE_PMD_REGISTER_VDEV(net_null, pmd_null_drv);
 RTE_PMD_REGISTER_ALIAS(net_null, eth_null);
 RTE_PMD_REGISTER_PARAM_STRING(net_null,
        "size=<int> "
-       "copy=<int>");
-
-RTE_INIT(eth_null_init_log)
-{
-       eth_null_logtype = rte_log_register("pmd.net.null");
-       if (eth_null_logtype >= 0)
-               rte_log_set_level(eth_null_logtype, RTE_LOG_NOTICE);
-}
+       "copy=<int> "
+       ETH_NULL_PACKET_NO_RX_ARG "=0|1");