Skip to contentSkip to conversation

net/failsafe: fix FreeBSD build

PATCH Superseded Thomas Monjalon 3 participants 6 messages Feb 13, 2018 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/failsafe: fix FreeBSD build

The type pthread_t is not portable because it is freely defined. On Linux, it is an unsigned long int which can be printed with %l.

The debug printing of the thread id is restricted to Linux only.

Fixes 655fcd68c7d2 ("net/failsafe: fix hotplug races")
---
 drivers/net/failsafe/failsafe_private.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/failsafe/failsafe_private.h +7 -2
index 5b84db905..86ade029f 100644
@@ -374,8 +374,10 @@ fs_lock(struct rte_eth_dev *dev, unsigned int is_alarm)
 			return ret;
 		}
 	}
+#ifdef RTE_EXEC_ENV_LINUXAPP
 	DEBUG("Hot-plug mutex was locked by thread %lu%s", pthread_self(),
 	      PRIV(dev)->alarm_lock ? " by the hot-plug alarm" : "");
+#endif
 	return ret;
 }
 
@@ -387,7 +389,6 @@ static inline void
 fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm)
 {
 	int ret;
-	unsigned int prev_alarm_lock = PRIV(dev)->alarm_lock;
 
 	if (is_alarm) {
 		RTE_ASSERT(PRIV(dev)->alarm_lock == 1);
@@ -396,10 +397,14 @@ fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm)
 	ret = pthread_mutex_unlock(&PRIV(dev)->hotplug_mutex);
 	if (ret)
 		ERROR("Cannot unlock hot-plug mutex(%s)", strerror(ret));
-	else
+#ifdef RTE_EXEC_ENV_LINUXAPP
+	else {
+		unsigned int prev_alarm_lock = PRIV(dev)->alarm_lock;
 		DEBUG("Hot-plug mutex was unlocked by thread %lu%s",
 		      pthread_self(),
 		      prev_alarm_lock ? " by the hot-plug alarm" : "");
+	}
+#endif
 }
 
 /*
Signature · 1 line
2.15.1
#1 lore raw

13/02/2018 22:33, Thomas Monjalon:

Quoted 2 lines

The type pthread_t is not portable because it is freely defined. On Linux, it is an unsigned long int which can be printed with %l.

Forgot to add:

On FreeBSD, it is a pointer.
That's why there was this error:
drivers/net/failsafe/failsafe_private.h:377:53: error:
format specifies type 'unsigned long' but the argument has type 'pthread_t' (aka 'struct pthread *')

Quoted 6 lines

The debug printing of the thread id is restricted to Linux only.

Fixes 655fcd68c7d2 ("net/failsafe: fix hotplug races")
#2 lore raw

PATCH v2 1/1 net/failsafe: fix FreeBSD build

In reply to Thomas Monjalon

The type pthread_t is not portable because it is freely defined. On Linux, it is an unsigned long int which can be printed with %l. On FreeBSD, it is a pointer which can be printed with %p.

That's why there was this error:
drivers/net/failsafe/failsafe_private.h:377:53: error:
format specifies type 'unsigned long' but the argument has type 'pthread_t' (aka 'struct pthread *')

Fixes 655fcd68c7d2 ("net/failsafe: fix hotplug races")

---
v2: adapt printing to BSD and Linux

---
 drivers/net/failsafe/failsafe_private.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/net/failsafe/failsafe_private.h +12 -3
index 5b84db905..2d16ba4ca 100644
@@ -318,6 +318,14 @@ extern int mac_from_arg;
 	 &((struct txq *)((s)->fs_dev->data->tx_queues[i]))->refcnt[(s)->sid] \
 	)
 
+#ifdef RTE_EXEC_ENV_BSDAPP
+#define FS_THREADID_TYPE void*
+#define FS_THREADID_FMT  "p"
+#else
+#define FS_THREADID_TYPE unsigned long
+#define FS_THREADID_FMT  "lu"
+#endif
+
 #define LOG__(level, m, ...) \
 	RTE_LOG(level, PMD, "net_failsafe: " m "%c", __VA_ARGS__)
 #define LOG_(level, ...) LOG__(level, __VA_ARGS__, '\n')
@@ -374,7 +382,8 @@ fs_lock(struct rte_eth_dev *dev, unsigned int is_alarm)
 			return ret;
 		}
 	}
-	DEBUG("Hot-plug mutex was locked by thread %lu%s", pthread_self(),
+	DEBUG("Hot-plug mutex was locked by thread %" FS_THREADID_FMT "%s",
+	      (FS_THREADID_TYPE)pthread_self(),
 	      PRIV(dev)->alarm_lock ? " by the hot-plug alarm" : "");
 	return ret;
 }
@@ -397,8 +406,8 @@ fs_unlock(struct rte_eth_dev *dev, unsigned int is_alarm)
 	if (ret)
 		ERROR("Cannot unlock hot-plug mutex(%s)", strerror(ret));
 	else
-		DEBUG("Hot-plug mutex was unlocked by thread %lu%s",
-		      pthread_self(),
+		DEBUG("Hot-plug mutex was unlocked by thread %" FS_THREADID_FMT "%s",
+		      (FS_THREADID_TYPE)pthread_self(),
 		      prev_alarm_lock ? " by the hot-plug alarm" : "");
 }
 
Signature · 1 line
2.15.1
Tested-by on v2 1/1
#3 lore raw
Quoted 18 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Thomas Monjalon
Sent: Tuesday, February 13, 2018 10:13 PM
To: [email protected]
Cc: [email protected]; [email protected]
Subject: [dpdk-dev] [PATCH v2] net/failsafe: fix FreeBSD build

The type pthread_t is not portable because it is freely defined. On Linux, it is an unsigned long int which can be printed with %l. On FreeBSD, it is a pointer which can be printed with %p.

That's why there was this error:
drivers/net/failsafe/failsafe_private.h:377:53: error:
format specifies type 'unsigned long' but the argument has type 'pthread_t' (aka 'struct pthread *')

Quoted 4 lines
Fixes 655fcd68c7d2 ("net/failsafe: fix hotplug races")
Acked-by
#4 lore raw
Quoted 28 lines

-----Original Message-----
From: De Lara Guarch, Pablo [mailto:[email protected]]
Sent: Wednesday, February 14, 2018 12:19 AM
To: Thomas Monjalon <[email protected]>; Matan Azrad <[email protected]>
Cc: [email protected]; [email protected]
Subject: RE: [dpdk-dev] [PATCH v2] net/failsafe: fix FreeBSD build

Quoted 16 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Thomas Monjalon
Sent: Tuesday, February 13, 2018 10:13 PM
To: [email protected]
Cc: [email protected]; [email protected]
Subject: [dpdk-dev] [PATCH v2] net/failsafe: fix FreeBSD build

The type pthread_t is not portable because it is freely defined. On Linux, it is an unsigned long int which can be printed with %l. On FreeBSD, it is a pointer which can be printed with %p.

That's why there was this error:
drivers/net/failsafe/failsafe_private.h:377:53: error:
format specifies type 'unsigned long' but the argument has type 'pthread_t' (aka 'struct pthread *')

Quoted 7 lines
Quoted 4 lines
Fixes 655fcd68c7d2 ("net/failsafe: fix hotplug races")
author Applied
#5 lore raw
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

The type pthread_t is not portable because it is freely defined. On Linux, it is an unsigned long int which can be printed with %l. On FreeBSD, it is a pointer which can be printed with %p.

That's why there was this error:
drivers/net/failsafe/failsafe_private.h:377:53: error:
format specifies type 'unsigned long' but the argument has type 'pthread_t' (aka 'struct pthread *')

Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Fixes 655fcd68c7d2 ("net/failsafe: fix hotplug races")

Applied