Skip to contentSkip to conversation

raw/ifpga: fix pthread cannot join

PATCH Superseded Wei Huang 2 participants 2 messages Jan 21, 2022 1 message not in the archive

v5 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 20220121012932.9827-1-wei.huang

Wei Huang

author
#1 lore raw

PATCH v5 1/1 raw/ifpga: fix pthread cannot join

From: Tianfei Zhang <[email protected]>

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 [email protected]
Signed-off-by Tianfei Zhang <[email protected]>

---
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

---
 drivers/raw/ifpga/ifpga_rawdev.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/raw/ifpga/ifpga_rawdev.c +7 -7
index 8d9db58..b72c13a 100644
@@ -68,7 +68,7 @@
 
 static struct ifpga_rawdev ifpga_rawdevices[IFPGA_RAWDEV_NUM];
 
-static int ifpga_monitor_start;
+static rte_atomic32_t ifpga_monitor_start;
 static pthread_t ifpga_monitor_start_thread;
 
 #define IFPGA_MAX_IRQ 12

@@ -497,7 +497,7 @@ static int set_surprise_link_check_aer(
 	int gsd_enable, ret;
 #define MS 1000
 
-	while (1) {
+	while (rte_atomic32_read(&ifpga_monitor_start)) {
 		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 (!rte_atomic32_read(&ifpga_monitor_start)) {
 		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 nonitor thread");
 			return -1;
 		}
-		ifpga_monitor_start = 1;
+		rte_atomic32_set(&ifpga_monitor_start, 1);
 	}
 
 	return 0;

@@ -544,7 +544,9 @@ static int set_surprise_link_check_aer(
 {
 	int ret;
 
-	if (ifpga_monitor_start == 1) {
+	if (rte_atomic32_read(&ifpga_monitor_start)) {
+		rte_atomic32_set(&ifpga_monitor_start, 0);
+
 		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;
 	}
Signature · 1 line
1.8.3.1
#2 lore raw

drivers/raw/ifpga/ifpga_rawdev.c static int set_surprise_link_check_aer( · line 500

Quoted 6 lines · On Thu, 20 Jan 2022 22:32:46 -0500 Wei Huang <[email protected]> wrote:
drivers/raw/ifpga/ifpga_rawdev.c +1 -1
@@ -497,7 +497,7 @@ static int set_surprise_link_check_aer(
 	int gsd_enable, ret;
 #define MS 1000
 
-	while (1) {
+	while (rte_atomic32_read(&ifpga_monitor_start)) {

Better, but rte_atomic is deprecated in favor of using __atomic builtin instead. This is because there are more options possible with __atomic_load_n than rte_atomic32_read. rte_atomic32_read has to assume worst case memory ordering, and your example relaxed memory ordering is what you need.