net/kni: fix crash caused by double stop
authorFerruh Yigit <ferruh.yigit@intel.com>
Tue, 26 Nov 2019 10:50:07 +0000 (10:50 +0000)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 26 Nov 2019 17:22:27 +0000 (18:22 +0100)
'close()' calls 'stop()' and 'stop()' cancels pthread without any check.
Calling 'stop()' & 'close()' sequentially tries to cancel pthread twice
which will cause a crash.

Adding a state check in 'stop()' before canceling the pthread to prevent
multiple stop.

Fixes: 696fbc7bb4fc ("net/kni: remove resources when port is closed")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Tested-by: Yinan Wang <yinan.wang@intel.com>
drivers/net/kni/rte_eth_kni.c

index 7cba92e..d88cb17 100644 (file)
@@ -156,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);
@@ -177,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);
@@ -187,8 +189,6 @@ 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;