diff mbox series

net/kni: fix crash caused by double stop

Message ID 20191126105007.62289-1-ferruh.yigit@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series net/kni: fix crash caused by double stop |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-compilation success Compile Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed

Commit Message

Ferruh Yigit Nov. 26, 2019, 10:50 a.m. UTC 
  '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>
---
 drivers/net/kni/rte_eth_kni.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Ferruh Yigit Nov. 26, 2019, 2:46 p.m. UTC | #1 
On 11/26/2019 10:50 AM, Ferruh Yigit wrote:
> '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>

Applied to dpdk-next-net/master, thanks.

(Applied quickly to make the fix for rc4)
Wang, Yinan Nov. 26, 2019, 3:42 p.m. UTC | #2 
Test-by :Wang, Yinan <yinan.wang@intel.com>

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Ferruh Yigit
> Sent: 2019年11月26日 22:47
> To: Yigit, Ferruh <ferruh.yigit@intel.com>
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/kni: fix crash caused by double stop
> 
> On 11/26/2019 10:50 AM, Ferruh Yigit wrote:
> > '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>
> 
> Applied to dpdk-next-net/master, thanks.
> 
> (Applied quickly to make the fix for rc4)
diff mbox series

Patch

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index 7cba92e2e..d88cb1778 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -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;