net/kni: fix crash caused by double stop

[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 1f232e4..d88cb17 100644 (file)
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -20,7 +20,7 @@
 #define MAX_KNI_PORTS 8
 
 #define KNI_ETHER_MTU(mbuf_size)       \
-       ((mbuf_size) - ETHER_HDR_LEN) /**< Ethernet MTU. */
+       ((mbuf_size) - RTE_ETHER_HDR_LEN) /**< Ethernet MTU. */
 
 #define ETH_KNI_NO_REQUEST_THREAD_ARG  "no_request_thread"
 static const char * const valid_arguments[] = {
@@ -35,7 +35,6 @@ struct eth_kni_args {
 struct pmd_queue_stats {
        uint64_t pkts;
        uint64_t bytes;
-       uint64_t err_pkts;
 };
 
 struct pmd_queue {
@@ -54,7 +53,7 @@ struct pmd_internals {
        int stop_thread;
        int no_request_thread;
 
-       struct ether_addr eth_addr;
+       struct rte_ether_addr eth_addr;
 
        struct pmd_queue rx_queues[KNI_MAX_QUEUE_PER_PORT];
        struct pmd_queue tx_queues[KNI_MAX_QUEUE_PER_PORT];
@@ -83,7 +82,6 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
        nb_pkts = rte_kni_rx_burst(kni, bufs, nb_bufs);
 
        kni_q->rx.pkts += nb_pkts;
-       kni_q->rx.err_pkts += nb_bufs - nb_pkts;
 
        return nb_pkts;
 }
@@ -98,7 +96,6 @@ eth_kni_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
        nb_pkts =  rte_kni_tx_burst(kni, bufs, nb_bufs);
 
        kni_q->tx.pkts += nb_pkts;
-       kni_q->tx.err_pkts += nb_bufs - nb_pkts;
 
        return nb_pkts;
 }
@@ -159,6 +156,8 @@ eth_kni_dev_start(struct rte_eth_dev *dev)
        }
 
        if (internals->no_request_thread == 0) {
+               internals->stop_thread = 0;
+
                ret = rte_ctrl_thread_create(&internals->thread,
                        "kni_handle_req", NULL,
                        kni_handle_request, internals);
@@ -180,7 +179,7 @@ eth_kni_dev_stop(struct rte_eth_dev *dev)
        struct pmd_internals *internals = dev->data->dev_private;
        int ret;
 
-       if (internals->no_request_thread == 0) {
+       if (internals->no_request_thread == 0 && internals->stop_thread == 0) {
                internals->stop_thread = 1;
 
                ret = pthread_cancel(internals->thread);
@@ -190,20 +189,36 @@ eth_kni_dev_stop(struct rte_eth_dev *dev)
                ret = pthread_join(internals->thread, NULL);
                if (ret)
                        PMD_LOG(ERR, "Can't join the thread");
-
-               internals->stop_thread = 0;
        }
 
        dev->data->dev_link.link_status = 0;
 }
 
+static void
+eth_kni_close(struct rte_eth_dev *eth_dev)
+{
+       struct pmd_internals *internals;
+       int ret;
+
+       eth_kni_dev_stop(eth_dev);
+
+       /* mac_addrs must not be freed alone because part of dev_private */
+       eth_dev->data->mac_addrs = NULL;
+
+       internals = eth_dev->data->dev_private;
+       ret = rte_kni_release(internals->kni);
+       if (ret)
+               PMD_LOG(WARNING, "Not able to release kni for %s",
+                       eth_dev->data->name);
+}
+
 static int
 eth_kni_dev_configure(struct rte_eth_dev *dev __rte_unused)
 {
        return 0;
 }
 
-static void
+static int
 eth_kni_dev_info(struct rte_eth_dev *dev __rte_unused,
                struct rte_eth_dev_info *dev_info)
 {
@@ -212,6 +227,8 @@ eth_kni_dev_info(struct rte_eth_dev *dev __rte_unused,
        dev_info->max_rx_queues = KNI_MAX_QUEUE_PER_PORT;
        dev_info->max_tx_queues = KNI_MAX_QUEUE_PER_PORT;
        dev_info->min_rx_bufsize = 0;
+
+       return 0;
 }
 
 static int
@@ -270,7 +287,6 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        unsigned long rx_packets_total = 0, rx_bytes_total = 0;
        unsigned long tx_packets_total = 0, tx_bytes_total = 0;
        struct rte_eth_dev_data *data = dev->data;
-       unsigned long tx_packets_err_total = 0;
        unsigned int i, num_stats;
        struct pmd_queue *q;
 
@@ -290,22 +306,19 @@ eth_kni_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
                q = data->tx_queues[i];
                stats->q_opackets[i] = q->tx.pkts;
                stats->q_obytes[i] = q->tx.bytes;
-               stats->q_errors[i] = q->tx.err_pkts;
                tx_packets_total += stats->q_opackets[i];
                tx_bytes_total += stats->q_obytes[i];
-               tx_packets_err_total += stats->q_errors[i];
        }
 
        stats->ipackets = rx_packets_total;
        stats->ibytes = rx_bytes_total;
        stats->opackets = tx_packets_total;
        stats->obytes = tx_bytes_total;
-       stats->oerrors = tx_packets_err_total;
 
        return 0;
 }
 
-static void
+static int
 eth_kni_stats_reset(struct rte_eth_dev *dev)
 {
        struct rte_eth_dev_data *data = dev->data;
@@ -321,13 +334,15 @@ eth_kni_stats_reset(struct rte_eth_dev *dev)
                q = data->tx_queues[i];
                q->tx.pkts = 0;
                q->tx.bytes = 0;
-               q->tx.err_pkts = 0;
        }
+
+       return 0;
 }
 
 static const struct eth_dev_ops eth_kni_ops = {
        .dev_start = eth_kni_dev_start,
        .dev_stop = eth_kni_dev_stop,
+       .dev_close = eth_kni_close,
        .dev_configure = eth_kni_dev_configure,
        .dev_infos_get = eth_kni_dev_info,
        .rx_queue_setup = eth_kni_rx_queue_setup,
@@ -362,8 +377,12 @@ eth_kni_create(struct rte_vdev_device *vdev,
        data->nb_tx_queues = 1;
        data->dev_link = pmd_link;
        data->mac_addrs = &internals->eth_addr;
+       data->promiscuous = 1;
+       data->all_multicast = 1;
+
+       data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
 
-       eth_random_addr(internals->eth_addr.addr_bytes);
+       rte_eth_random_addr(internals->eth_addr.addr_bytes);
 
        eth_dev->dev_ops = &eth_kni_ops;
 
@@ -457,9 +476,7 @@ static int
 eth_kni_remove(struct rte_vdev_device *vdev)
 {
        struct rte_eth_dev *eth_dev;
-       struct pmd_internals *internals;
        const char *name;
-       int ret;
 
        name = rte_vdev_device_name(vdev);
        PMD_LOG(INFO, "Un-Initializing eth_kni for %s", name);
@@ -469,19 +486,12 @@ eth_kni_remove(struct rte_vdev_device *vdev)
        if (eth_dev == NULL)
                return -1;
 
-       /* mac_addrs must not be freed alone because part of dev_private */
-       eth_dev->data->mac_addrs = NULL;
-
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+               eth_kni_dev_stop(eth_dev);
                return rte_eth_dev_release_port(eth_dev);
+       }
 
-       eth_kni_dev_stop(eth_dev);
-
-       internals = eth_dev->data->dev_private;
-       ret = rte_kni_release(internals->kni);
-       if (ret)
-               PMD_LOG(WARNING, "Not able to release kni for %s", name);
-
+       eth_kni_close(eth_dev);
        rte_eth_dev_release_port(eth_dev);
 
        is_kni_initialized--;