diff mbox series

[v8] raw/ifpga: fix pthread cannot join

Message ID 20220124035005.18955-1-wei.huang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v8] raw/ifpga: fix pthread cannot join |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/intel-Testing success Testing PASS

Commit Message

Wei Huang Jan. 24, 2022, 3:50 a.m. UTC 
  From: Tianfei Zhang <tianfei.zhang@intel.com>

When we want to close a thread, we should set a flag to notify
thread handler function.

Fixes: 9c006c45 ("raw/ifpga: scan PCIe BDF device tree")
Cc: stable@dpdk.org

Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
---
v2: update commit log
---
v3: set thread id to 0 after pthread_join
---
v4: do not evaluate and set pthread_t variable
---
v5: use builtin atomic function to access ifpga_monitor_start flag
---
v6: use __atomic_xxx_n to replace rte_atomicNN_xxx
---
v7: fix typo
---
v8: solve patch applying issue
---
 drivers/raw/ifpga/ifpga_rawdev.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Xu, Rosen Jan. 25, 2022, 1:42 a.m. UTC | #1 
Hi,

> -----Original Message-----
> From: Huang, Wei <wei.huang@intel.com>
> Sent: Monday, January 24, 2022 11:50
> To: dev@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: stable@dpdk.org; Zhang, Tianfei <tianfei.zhang@intel.com>; Yigit, Ferruh
> <ferruh.yigit@intel.com>; stephen@networkplumber.org;
> david.marchand@redhat.com
> Subject: [PATCH v8] raw/ifpga: fix pthread cannot join
> 
> From: Tianfei Zhang <tianfei.zhang@intel.com>
> 
> When we want to close a thread, we should set a flag to notify thread
> handler function.
> 
> Fixes: 9c006c45 ("raw/ifpga: scan PCIe BDF device tree")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
> ---
> v2: update commit log
> ---
> v3: set thread id to 0 after pthread_join
> ---
> v4: do not evaluate and set pthread_t variable
> ---
> v5: use builtin atomic function to access ifpga_monitor_start flag
> ---
> v6: use __atomic_xxx_n to replace rte_atomicNN_xxx
> ---
> v7: fix typo
> ---
> v8: solve patch applying issue
> ---
>  drivers/raw/ifpga/ifpga_rawdev.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/raw/ifpga/ifpga_rawdev.c
> b/drivers/raw/ifpga/ifpga_rawdev.c
> index 8d9db58..19c2357 100644
> --- a/drivers/raw/ifpga/ifpga_rawdev.c
> +++ b/drivers/raw/ifpga/ifpga_rawdev.c
> @@ -497,7 +497,7 @@ static int set_surprise_link_check_aer(
>  	int gsd_enable, ret;
>  #define MS 1000
> 
> -	while (1) {
> +	while (__atomic_load_n(&ifpga_monitor_start,
> __ATOMIC_RELAXED)) {
>  		gsd_enable = 0;
>  		for (i = 0; i < IFPGA_RAWDEV_NUM; i++) {
>  			ifpga_rdev = &ifpga_rawdevices[i];
> @@ -525,7 +525,7 @@ static int set_surprise_link_check_aer(  {
>  	int ret;
> 
> -	if (ifpga_monitor_start == 0) {
> +	if (!__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) {
>  		ret = rte_ctrl_thread_create(&ifpga_monitor_start_thread,
>  					     "ifpga-monitor", NULL,
>  					     ifpga_rawdev_gsd_handle, NULL);
> @@ -534,7 +534,7 @@ static int set_surprise_link_check_aer(
>  				"Fail to create ifpga monitor thread");
>  			return -1;
>  		}
> -		ifpga_monitor_start = 1;
> +		__atomic_store_n(&ifpga_monitor_start, 1,
> __ATOMIC_RELAXED);
>  	}
> 
>  	return 0;
> @@ -544,7 +544,9 @@ static int set_surprise_link_check_aer(  {
>  	int ret;
> 
> -	if (ifpga_monitor_start == 1) {
> +	if (__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) {
> +		__atomic_store_n(&ifpga_monitor_start, 0,
> __ATOMIC_RELAXED);
> +
>  		ret = pthread_cancel(ifpga_monitor_start_thread);
>  		if (ret)
>  			IFPGA_RAWDEV_PMD_ERR("Can't cancel the
> thread"); @@ -553,8 +555,6 @@ static int set_surprise_link_check_aer(
>  		if (ret)
>  			IFPGA_RAWDEV_PMD_ERR("Can't join the thread");
> 
> -		ifpga_monitor_start = 0;
> -
>  		return ret;
>  	}
> 
> --
> 1.8.3.1

Acked-by: Rosen Xu <rosen.xu@intel.com>
Qi Zhang Jan. 25, 2022, 4:47 a.m. UTC | #2 
> -----Original Message-----
> From: Xu, Rosen <rosen.xu@intel.com>
> Sent: Tuesday, January 25, 2022 9:43 AM
> To: Huang, Wei <wei.huang@intel.com>; dev@dpdk.org; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: stable@dpdk.org; Zhang, Tianfei <tianfei.zhang@intel.com>; Yigit, Ferruh
> <ferruh.yigit@intel.com>; stephen@networkplumber.org;
> david.marchand@redhat.com
> Subject: RE: [PATCH v8] raw/ifpga: fix pthread cannot join
> 
> Hi,
> 
> > -----Original Message-----
> > From: Huang, Wei <wei.huang@intel.com>
> > Sent: Monday, January 24, 2022 11:50
> > To: dev@dpdk.org; Xu, Rosen <rosen.xu@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>
> > Cc: stable@dpdk.org; Zhang, Tianfei <tianfei.zhang@intel.com>; Yigit,
> > Ferruh <ferruh.yigit@intel.com>; stephen@networkplumber.org;
> > david.marchand@redhat.com
> > Subject: [PATCH v8] raw/ifpga: fix pthread cannot join
> >
> > From: Tianfei Zhang <tianfei.zhang@intel.com>
> >
> > When we want to close a thread, we should set a flag to notify thread
> > handler function.
> >
> > Fixes: 9c006c45 ("raw/ifpga: scan PCIe BDF device tree")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
> > ---
> > v2: update commit log
> > ---
> > v3: set thread id to 0 after pthread_join
> > ---
> > v4: do not evaluate and set pthread_t variable
> > ---
> > v5: use builtin atomic function to access ifpga_monitor_start flag
> > ---
> > v6: use __atomic_xxx_n to replace rte_atomicNN_xxx
> > ---
> > v7: fix typo
> > ---
> > v8: solve patch applying issue
> > ---
> >  drivers/raw/ifpga/ifpga_rawdev.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/raw/ifpga/ifpga_rawdev.c
> > b/drivers/raw/ifpga/ifpga_rawdev.c
> > index 8d9db58..19c2357 100644
> > --- a/drivers/raw/ifpga/ifpga_rawdev.c
> > +++ b/drivers/raw/ifpga/ifpga_rawdev.c
> > @@ -497,7 +497,7 @@ static int set_surprise_link_check_aer(
> >  	int gsd_enable, ret;
> >  #define MS 1000
> >
> > -	while (1) {
> > +	while (__atomic_load_n(&ifpga_monitor_start,
> > __ATOMIC_RELAXED)) {
> >  		gsd_enable = 0;
> >  		for (i = 0; i < IFPGA_RAWDEV_NUM; i++) {
> >  			ifpga_rdev = &ifpga_rawdevices[i]; @@ -525,7 +525,7
> @@ static int
> > set_surprise_link_check_aer(  {
> >  	int ret;
> >
> > -	if (ifpga_monitor_start == 0) {
> > +	if (!__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) {
> >  		ret = rte_ctrl_thread_create(&ifpga_monitor_start_thread,
> >  					     "ifpga-monitor", NULL,
> >  					     ifpga_rawdev_gsd_handle, NULL);
> @@ -534,7 +534,7 @@ static
> > int set_surprise_link_check_aer(
> >  				"Fail to create ifpga monitor thread");
> >  			return -1;
> >  		}
> > -		ifpga_monitor_start = 1;
> > +		__atomic_store_n(&ifpga_monitor_start, 1,
> > __ATOMIC_RELAXED);
> >  	}
> >
> >  	return 0;
> > @@ -544,7 +544,9 @@ static int set_surprise_link_check_aer(  {
> >  	int ret;
> >
> > -	if (ifpga_monitor_start == 1) {
> > +	if (__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) {
> > +		__atomic_store_n(&ifpga_monitor_start, 0,
> > __ATOMIC_RELAXED);
> > +
> >  		ret = pthread_cancel(ifpga_monitor_start_thread);
> >  		if (ret)
> >  			IFPGA_RAWDEV_PMD_ERR("Can't cancel the
> thread"); @@ -553,8 +555,6
> > @@ static int set_surprise_link_check_aer(
> >  		if (ret)
> >  			IFPGA_RAWDEV_PMD_ERR("Can't join the thread");
> >
> > -		ifpga_monitor_start = 0;
> > -
> >  		return ret;
> >  	}
> >
> > --
> > 1.8.3.1
> 
> Acked-by: Rosen Xu <rosen.xu@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
>
diff mbox series

Patch

diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 8d9db58..19c2357 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -497,7 +497,7 @@  static int set_surprise_link_check_aer(
 	int gsd_enable, ret;
 #define MS 1000
 
-	while (1) {
+	while (__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) {
 		gsd_enable = 0;
 		for (i = 0; i < IFPGA_RAWDEV_NUM; i++) {
 			ifpga_rdev = &ifpga_rawdevices[i];
@@ -525,7 +525,7 @@  static int set_surprise_link_check_aer(
 {
 	int ret;
 
-	if (ifpga_monitor_start == 0) {
+	if (!__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) {
 		ret = rte_ctrl_thread_create(&ifpga_monitor_start_thread,
 					     "ifpga-monitor", NULL,
 					     ifpga_rawdev_gsd_handle, NULL);
@@ -534,7 +534,7 @@  static int set_surprise_link_check_aer(
 				"Fail to create ifpga monitor thread");
 			return -1;
 		}
-		ifpga_monitor_start = 1;
+		__atomic_store_n(&ifpga_monitor_start, 1, __ATOMIC_RELAXED);
 	}
 
 	return 0;
@@ -544,7 +544,9 @@  static int set_surprise_link_check_aer(
 {
 	int ret;
 
-	if (ifpga_monitor_start == 1) {
+	if (__atomic_load_n(&ifpga_monitor_start, __ATOMIC_RELAXED)) {
+		__atomic_store_n(&ifpga_monitor_start, 0, __ATOMIC_RELAXED);
+
 		ret = pthread_cancel(ifpga_monitor_start_thread);
 		if (ret)
 			IFPGA_RAWDEV_PMD_ERR("Can't cancel the thread");
@@ -553,8 +555,6 @@  static int set_surprise_link_check_aer(
 		if (ret)
 			IFPGA_RAWDEV_PMD_ERR("Can't join the thread");
 
-		ifpga_monitor_start = 0;
-
 		return ret;
 	}