Skip to contentSkip to conversation

eal: fix build with conflicting libc variable memory_order

PATCH Superseded Eli Britstein 4 participants 4 messages Oct 14, 2020 – Oct 15, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eal: fix build with conflicting libc variable memory_order

The cited commit introduced functions with 'int memory_order' argument. The C11 standard section 7.17.1.4 defines 'memory_order' as the "enumerated type whose enumerators identify memory ordering constraints". Applications that use the standard enum (includes stdatomic.h), will fail compilation with:
error: declaration of 'memory_order' shadows a global declaration
[-Werror=shadow]
rte_atomic_thread_fence(int memory_order)
Fix it by changing the argument name 'memory_order' to 'memorder'.

Fixes 672a15056380 ("eal: add wrapper for C11 atomic thread fence")
---
 lib/librte_eal/arm/include/rte_atomic_32.h  | 4 ++--
 lib/librte_eal/arm/include/rte_atomic_64.h  | 4 ++--
 lib/librte_eal/include/generic/rte_atomic.h | 2 +-
 lib/librte_eal/ppc/include/rte_atomic.h     | 4 ++--
 lib/librte_eal/x86/include/rte_atomic.h     | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)
lib/librte_eal/arm/include/rte_atomic_32.h +2 -2
index 9d0568d497..fe48ab428e 100644
@@ -34,9 +34,9 @@ extern "C" {
 #define rte_io_rmb() rte_rmb()
 
 static __rte_always_inline void
-rte_atomic_thread_fence(int memory_order)
+rte_atomic_thread_fence(int memorder)
 {
-	__atomic_thread_fence(memory_order);
+	__atomic_thread_fence(memorder);
 }
 
 #ifdef __cplusplus
lib/librte_eal/arm/include/rte_atomic_64.h +2 -2
index c518559bc9..20dd6c75dd 100644
@@ -38,9 +38,9 @@ extern "C" {
 #define rte_io_rmb() rte_rmb()
 
 static __rte_always_inline void
-rte_atomic_thread_fence(int memory_order)
+rte_atomic_thread_fence(int memorder)
 {
-	__atomic_thread_fence(memory_order);
+	__atomic_thread_fence(memorder);
 }
 
 /*------------------------ 128 bit atomic operations -------------------------*/
lib/librte_eal/include/generic/rte_atomic.h +1 -1
index d1255b2d8c..276272f40b 100644
@@ -122,7 +122,7 @@ static inline void rte_io_rmb(void);
 /**
  * Synchronization fence between threads based on the specified memory order.
  */
-static inline void rte_atomic_thread_fence(int memory_order);
+static inline void rte_atomic_thread_fence(int memorder);
 
 /*------------------------- 16 bit atomic operations -------------------------*/
 
lib/librte_eal/ppc/include/rte_atomic.h +2 -2
index a91989930b..6a7e65210c 100644
@@ -37,9 +37,9 @@ extern "C" {
 #define rte_io_rmb() rte_rmb()
 
 static __rte_always_inline void
-rte_atomic_thread_fence(int memory_order)
+rte_atomic_thread_fence(int memorder)
 {
-	__atomic_thread_fence(memory_order);
+	__atomic_thread_fence(memorder);
 }
 
 /*------------------------- 16 bit atomic operations -------------------------*/
lib/librte_eal/x86/include/rte_atomic.h +3 -3
index b7d6b06ddf..915afd9d27 100644
@@ -87,12 +87,12 @@ rte_smp_mb(void)
  * used instead.
  */
 static __rte_always_inline void
-rte_atomic_thread_fence(int memory_order)
+rte_atomic_thread_fence(int memorder)
 {
-	if (memory_order == __ATOMIC_SEQ_CST)
+	if (memorder == __ATOMIC_SEQ_CST)
 		rte_smp_mb();
 	else
-		__atomic_thread_fence(memory_order);
+		__atomic_thread_fence(memorder);
 }
 
 /*------------------------- 16 bit atomic operations -------------------------*/
Signature · 1 line
2.28.0.546.g385c171
Reviewed-by on v1 1/1
#1 lore raw
Quoted 19 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Eli Britstein
Sent: Wednesday, October 14, 2020 9:19 AM
To: [email protected]
Cc: Eli Britstein <[email protected]>
Subject: [dpdk-dev] [PATCH] eal: fix build with conflicting libc variable memory_order

The cited commit introduced functions with 'int memory_order' argument. The C11 standard section 7.17.1.4 defines 'memory_order' as the "enumerated type whose enumerators identify memory ordering constraints".
Applications that use the standard enum (includes stdatomic.h), will fail compilation with:
error: declaration of 'memory_order' shadows a global declaration
[-Werror=shadow]
rte_atomic_thread_fence(int memory_order) Fix it by changing the
argument name 'memory_order' to 'memorder'.

Quoted 2 lines
Fixes 672a15056380 ("eal: add wrapper for C11 atomic thread fence")
Quoted 97 lines

---

lib/librte_eal/arm/include/rte_atomic_32.h  | 4 ++--
lib/librte_eal/arm/include/rte_atomic_64.h  | 4 ++--
lib/librte_eal/include/generic/rte_atomic.h | 2 +-
lib/librte_eal/ppc/include/rte_atomic.h     | 4 ++--
lib/librte_eal/x86/include/rte_atomic.h     | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
lib/librte_eal/arm/include/rte_atomic_32.h +0 -0
index 9d0568d497..fe48ab428e 100644
@@ -34,9 +34,9 @@ extern "C" {
 #define rte_io_rmb() rte_rmb()
 

static __rte_always_inline void

lib/librte_eal/arm/include/rte_atomic_32.h +1 -1
-rte_atomic_thread_fence(int memory_order)
+rte_atomic_thread_fence(int memorder)

{

lib/librte_eal/arm/include/rte_atomic_32.h +1 -1
-	__atomic_thread_fence(memory_order);
+	__atomic_thread_fence(memorder);

}

#ifdef __cplusplus

lib/librte_eal/arm/include/rte_atomic_64.h +0 -0
index c518559bc9..20dd6c75dd 100644
@@ -38,9 +38,9 @@ extern "C" {
 #define rte_io_rmb() rte_rmb()
 

static __rte_always_inline void

lib/librte_eal/arm/include/rte_atomic_64.h +1 -1
-rte_atomic_thread_fence(int memory_order)
+rte_atomic_thread_fence(int memorder)

{

lib/librte_eal/arm/include/rte_atomic_64.h +1 -1
-	__atomic_thread_fence(memory_order);
+	__atomic_thread_fence(memorder);

}

/*------------------------ 128 bit atomic operations -------------------------*/ diff -- git a/lib/librte_eal/include/generic/rte_atomic.h b/lib/librte_eal/include/generic/rte_atomic.h
index d1255b2d8c..276272f40b 100644

lib/librte_eal/include/generic/rte_atomic.h +0 -0
@@ -122,7 +122,7 @@ static inline void rte_io_rmb(void);
 /**
 * Synchronization fence between threads based on the specified memory

order.
*/

lib/librte_eal/include/generic/rte_atomic.h +1 -1
-static inline void rte_atomic_thread_fence(int memory_order);
+static inline void rte_atomic_thread_fence(int memorder);

/*------------------------- 16 bit atomic operations -------------------------*/

lib/librte_eal/ppc/include/rte_atomic.h +0 -0
index a91989930b..6a7e65210c 100644
@@ -37,9 +37,9 @@ extern "C" {
 #define rte_io_rmb() rte_rmb()
 

static __rte_always_inline void

lib/librte_eal/ppc/include/rte_atomic.h +1 -1
-rte_atomic_thread_fence(int memory_order)
+rte_atomic_thread_fence(int memorder)

{

lib/librte_eal/ppc/include/rte_atomic.h +1 -1
-	__atomic_thread_fence(memory_order);
+	__atomic_thread_fence(memorder);

}

/*------------------------- 16 bit atomic operations -------------------------*/ diff -- git a/lib/librte_eal/x86/include/rte_atomic.h b/lib/librte_eal/x86/include/rte_atomic.h
index b7d6b06ddf..915afd9d27 100644

lib/librte_eal/x86/include/rte_atomic.h +0 -0
@@ -87,12 +87,12 @@ rte_smp_mb(void)
 * used instead.
 */

static __rte_always_inline void

lib/librte_eal/x86/include/rte_atomic.h +1 -1
-rte_atomic_thread_fence(int memory_order)
+rte_atomic_thread_fence(int memorder)

{

lib/librte_eal/x86/include/rte_atomic.h +1 -1
-	if (memory_order == __ATOMIC_SEQ_CST)
+	if (memorder == __ATOMIC_SEQ_CST)
		rte_smp_mb();
	else
lib/librte_eal/x86/include/rte_atomic.h +1 -1
-		__atomic_thread_fence(memory_order);
+		__atomic_thread_fence(memorder);

}

/*------------------------- 16 bit atomic operations -------------------------*/ --
2.28.0.546.g385c171

Acked-by on v1 1/1
#2 lore raw
In reply to Eli Britstein

14/10/2020 08:19, Eli Britstein:

Quoted 9 lines

The cited commit introduced functions with 'int memory_order' argument. The C11 standard section 7.17.1.4 defines 'memory_order' as the "enumerated type whose enumerators identify memory ordering constraints". Applications that use the standard enum (includes stdatomic.h), will fail compilation with:
error: declaration of 'memory_order' shadows a global declaration
[-Werror=shadow]
rte_atomic_thread_fence(int memory_order)
Fix it by changing the argument name 'memory_order' to 'memorder'.

Not clear why it builds fine with most compilers,
but the fix does not hurt.

Quoted 1 line
Fixes 672a15056380 ("eal: add wrapper for C11 atomic thread fence")

A blank line should be inserted here.

Quoted 1 line
#3 lore raw
Quoted 7 lines · Thomas Monjalon

14/10/2020 08:19, Eli Britstein:

Quoted 5 lines

The cited commit introduced functions with 'int memory_order' argument. The C11 standard section 7.17.1.4 defines 'memory_order' as the "enumerated type whose enumerators identify memory ordering constraints". Applications that use the standard enum (includes stdatomic.h), will fail compilation with:

Simply including stdatomic.h does not trigger the problem. Can you rework this commitlog with below info?

Quoted 6 lines
Quoted 4 lines

error: declaration of 'memory_order' shadows a global declaration
[-Werror=shadow]
rte_atomic_thread_fence(int memory_order)
Fix it by changing the argument name 'memory_order' to 'memorder'.

Not clear why it builds fine with most compilers,

I can reproduce in two cases:
- with a gcc that provides a stdatomic.h header + passing -Wsystem-headers in the CFLAGS,
- with a compiler that does not provide stdatomic.h and you redefine memory_order in your code (like OVS does),

Quoted 1 line

but the fix does not hurt.

Otherwise, yes, lgtm.

Quoted 7 lines
Quoted 1 line
Fixes 672a15056380 ("eal: add wrapper for C11 atomic thread fence")

A blank line should be inserted here.

Quoted 1 line
Signature · 1 line
David Marchand