New upstream version 18.08

[deb_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 d003b28..244f865 100644 (file)
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -73,6 +73,7 @@ struct pmd_internals {
        struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
        struct null_queue tx_null_queues[RTE_MAX_QUEUES_PER_PORT];
 
+       struct ether_addr eth_addr;
        /** Bit mask of RSS offloads, the bit offset also means flow type */
        uint64_t flow_type_rss_offloads;
 
@@ -84,16 +85,19 @@ struct pmd_internals {
 
        uint8_t rss_key[40];                /**< 40-byte hash key. */
 };
-
-
-static struct ether_addr eth_addr = { .addr_bytes = {0} };
 static struct rte_eth_link pmd_link = {
        .link_speed = ETH_SPEED_NUM_10G,
        .link_duplex = ETH_LINK_FULL_DUPLEX,
        .link_status = ETH_LINK_DOWN,
-       .link_autoneg = ETH_LINK_AUTONEG,
+       .link_autoneg = ETH_LINK_FIXED,
 };
 
+static int eth_null_logtype;
+
+#define PMD_LOG(level, fmt, args...) \
+       rte_log(RTE_LOG_ ## level, eth_null_logtype, \
+               "%s(): " fmt "\n", __func__, ##args)
+
 static uint16_t
 eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 {
@@ -105,10 +109,10 @@ eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
                return 0;
 
        packet_size = h->internals->packet_size;
+       if (rte_pktmbuf_alloc_bulk(h->mb_pool, bufs, nb_bufs) != 0)
+               return 0;
+
        for (i = 0; i < nb_bufs; i++) {
-               bufs[i] = rte_pktmbuf_alloc(h->mb_pool);
-               if (!bufs[i])
-                       break;
                bufs[i]->data_len = (uint16_t)packet_size;
                bufs[i]->pkt_len = packet_size;
                bufs[i]->port = h->internals->port_id;
@@ -130,10 +134,10 @@ eth_null_copy_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
                return 0;
 
        packet_size = h->internals->packet_size;
+       if (rte_pktmbuf_alloc_bulk(h->mb_pool, bufs, nb_bufs) != 0)
+               return 0;
+
        for (i = 0; i < nb_bufs; i++) {
-               bufs[i] = rte_pktmbuf_alloc(h->mb_pool);
-               if (!bufs[i])
-                       break;
                rte_memcpy(rte_pktmbuf_mtod(bufs[i], void *), h->dummy_packet,
                                        packet_size);
                bufs[i]->data_len = (uint16_t)packet_size;
@@ -301,6 +305,7 @@ eth_dev_info(struct rte_eth_dev *dev,
        dev_info->min_rx_bufsize = 0;
        dev_info->reta_size = internals->reta_size;
        dev_info->flow_type_rss_offloads = internals->flow_type_rss_offloads;
+       dev_info->rx_offload_capa = DEV_RX_OFFLOAD_CRC_STRIP;
 }
 
 static int
@@ -461,10 +466,11 @@ eth_rss_hash_conf_get(struct rte_eth_dev *dev,
        return 0;
 }
 
-static void
+static int
 eth_mac_address_set(__rte_unused struct rte_eth_dev *dev,
                    __rte_unused struct ether_addr *addr)
 {
+       return 0;
 }
 
 static const struct eth_dev_ops ops = {
@@ -496,7 +502,7 @@ eth_dev_null_create(struct rte_vdev_device *dev,
 {
        const unsigned nb_rx_queues = 1;
        const unsigned nb_tx_queues = 1;
-       struct rte_eth_dev_data *data = NULL;
+       struct rte_eth_dev_data *data;
        struct pmd_internals *internals = NULL;
        struct rte_eth_dev *eth_dev = NULL;
 
@@ -510,22 +516,12 @@ eth_dev_null_create(struct rte_vdev_device *dev,
        if (dev->device.numa_node == SOCKET_ID_ANY)
                dev->device.numa_node = rte_socket_id();
 
-       RTE_LOG(INFO, PMD, "Creating null ethdev on numa socket %u\n",
-               dev->device.numa_node);
-
-       /* now do all data allocation - for eth_dev structure, dummy pci driver
-        * and internal (private) data
-        */
-       data = rte_zmalloc_socket(rte_vdev_device_name(dev), sizeof(*data), 0,
+       PMD_LOG(INFO, "Creating null ethdev on numa socket %u",
                dev->device.numa_node);
-       if (!data)
-               return -ENOMEM;
 
        eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals));
-       if (!eth_dev) {
-               rte_free(data);
+       if (!eth_dev)
                return -ENOMEM;
-       }
 
        /* now put it all together
         * - store queue data in internals,
@@ -540,19 +536,19 @@ eth_dev_null_create(struct rte_vdev_device *dev,
        internals->packet_size = packet_size;
        internals->packet_copy = packet_copy;
        internals->port_id = eth_dev->data->port_id;
+       eth_random_addr(internals->eth_addr.addr_bytes);
 
        internals->flow_type_rss_offloads =  ETH_RSS_PROTO_MASK;
        internals->reta_size = RTE_DIM(internals->reta_conf) * RTE_RETA_GROUP_SIZE;
 
        rte_memcpy(internals->rss_key, default_rss_key, 40);
 
-       rte_memcpy(data, eth_dev->data, sizeof(*data));
+       data = eth_dev->data;
        data->nb_rx_queues = (uint16_t)nb_rx_queues;
        data->nb_tx_queues = (uint16_t)nb_tx_queues;
        data->dev_link = pmd_link;
-       data->mac_addrs = &eth_addr;
+       data->mac_addrs = &internals->eth_addr;
 
-       eth_dev->data = data;
        eth_dev->dev_ops = &ops;
 
        /* finally assign rx and tx ops */
@@ -564,6 +560,7 @@ eth_dev_null_create(struct rte_vdev_device *dev,
                eth_dev->tx_pkt_burst = eth_null_tx;
        }
 
+       rte_eth_dev_probing_finish(eth_dev);
        return 0;
 }
 
@@ -608,6 +605,7 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
        unsigned packet_size = default_packet_size;
        unsigned packet_copy = default_packet_copy;
        struct rte_kvargs *kvlist = NULL;
+       struct rte_eth_dev *eth_dev;
        int ret;
 
        if (!dev)
@@ -615,7 +613,21 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 
        name = rte_vdev_device_name(dev);
        params = rte_vdev_device_args(dev);
-       RTE_LOG(INFO, PMD, "Initializing pmd_null for %s\n", name);
+       PMD_LOG(INFO, "Initializing pmd_null for %s", name);
+
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
+           strlen(params) == 0) {
+               eth_dev = rte_eth_dev_attach_secondary(name);
+               if (!eth_dev) {
+                       PMD_LOG(ERR, "Failed to probe %s", name);
+                       return -1;
+               }
+               /* TODO: request info from primary to set up Rx and Tx */
+               eth_dev->dev_ops = &ops;
+               eth_dev->device = &dev->device;
+               rte_eth_dev_probing_finish(eth_dev);
+               return 0;
+       }
 
        if (params != NULL) {
                kvlist = rte_kvargs_parse(params, valid_arguments);
@@ -641,8 +653,8 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
                }
        }
 
-       RTE_LOG(INFO, PMD, "Configure pmd_null: packet size is %d, "
-                       "packet copy is %s\n", packet_size,
+       PMD_LOG(INFO, "Configure pmd_null: packet size is %d, "
+                       "packet copy is %s", packet_size,
                        packet_copy ? "enabled" : "disabled");
 
        ret = eth_dev_null_create(dev, packet_size, packet_copy);
@@ -661,7 +673,7 @@ rte_pmd_null_remove(struct rte_vdev_device *dev)
        if (!dev)
                return -EINVAL;
 
-       RTE_LOG(INFO, PMD, "Closing null ethdev on numa socket %u\n",
+       PMD_LOG(INFO, "Closing null ethdev on numa socket %u",
                        rte_socket_id());
 
        /* find the ethdev entry */
@@ -670,7 +682,6 @@ rte_pmd_null_remove(struct rte_vdev_device *dev)
                return -1;
 
        rte_free(eth_dev->data->dev_private);
-       rte_free(eth_dev->data);
 
        rte_eth_dev_release_port(eth_dev);
 
@@ -687,3 +698,10 @@ 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);
+}