eal: set name when creating a control thread

[dpdk.git] / drivers / net / kni / rte_eth_kni.c

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index c10e970..35a6d3e 100644 (file)
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -149,7 +149,8 @@ eth_kni_dev_start(struct rte_eth_dev *dev)
        }
 
        if (internals->no_request_thread == 0) {
-               ret = pthread_create(&internals->thread, NULL,
+               ret = rte_ctrl_thread_create(&internals->thread,
+                       "kni_handle_req", NULL,
                        kni_handle_request, internals);
                if (ret) {
                        RTE_LOG(ERR, PMD,
@@ -336,25 +337,17 @@ eth_kni_create(struct rte_vdev_device *vdev,
        struct pmd_internals *internals;
        struct rte_eth_dev_data *data;
        struct rte_eth_dev *eth_dev;
-       const char *name;
 
        RTE_LOG(INFO, PMD, "Creating kni ethdev on numa socket %u\n",
                        numa_node);
 
-       name = rte_vdev_device_name(vdev);
-       data = rte_zmalloc_socket(name, sizeof(*data), 0, numa_node);
-       if (data == NULL)
-               return NULL;
-
        /* reserve an ethdev entry */
        eth_dev = rte_eth_vdev_allocate(vdev, sizeof(*internals));
-       if (eth_dev == NULL) {
-               rte_free(data);
+       if (!eth_dev)
                return NULL;
-       }
 
        internals = eth_dev->data->dev_private;
-       rte_memcpy(data, eth_dev->data, sizeof(*data));
+       data = eth_dev->data;
        data->nb_rx_queues = 1;
        data->nb_tx_queues = 1;
        data->dev_link = pmd_link;
@@ -362,7 +355,6 @@ eth_kni_create(struct rte_vdev_device *vdev,
 
        eth_random_addr(internals->eth_addr.addr_bytes);
 
-       eth_dev->data = data;
        eth_dev->dev_ops = &eth_kni_ops;
 
        internals->no_request_thread = args->no_request_thread;
@@ -413,6 +405,18 @@ eth_kni_probe(struct rte_vdev_device *vdev)
        params = rte_vdev_device_args(vdev);
        RTE_LOG(INFO, PMD, "Initializing eth_kni for %s\n", name);
 
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
+           strlen(params) == 0) {
+               eth_dev = rte_eth_dev_attach_secondary(name);
+               if (!eth_dev) {
+                       RTE_LOG(ERR, PMD, "Failed to probe %s\n", name);
+                       return -1;
+               }
+               /* TODO: request info from primary to set up Rx and Tx */
+               eth_dev->dev_ops = &eth_kni_ops;
+               return 0;
+       }
+
        ret = eth_kni_kvargs_process(&args, params);
        if (ret < 0)
                return ret;
@@ -458,7 +462,6 @@ eth_kni_remove(struct rte_vdev_device *vdev)
        rte_kni_release(internals->kni);
 
        rte_free(internals);
-       rte_free(eth_dev->data);
 
        rte_eth_dev_release_port(eth_dev);