From: "Mattias Rönnblom" <mattias.ronnblom@ericsson.com>
To: <dev@dpdk.org>
Cc: hofors@lysator.liu.se, "Heng Wang" <heng.wang@ericsson.com>,
"Stephen Hemminger" <stephen@networkplumber.org>,
"Tyler Retzlaff" <roretzla@linux.microsoft.com>,
"Morten Brørup" <mb@smartsharesystems.com>,
"Jack Bond-Preston" <jack.bond-preston@foss.arm.com>,
"David Marchand" <david.marchand@redhat.com>,
"Chengwen Feng" <fengchengwen@huawei.com>,
"Mattias Rönnblom" <mattias.ronnblom@ericsson.com>
Subject: [PATCH v9 6/6] eal: extend bitops to handle volatile pointers
Date: Wed, 18 Sep 2024 11:04:45 +0200 [thread overview]
Message-ID: <20240918090445.725283-7-mattias.ronnblom@ericsson.com> (raw)
In-Reply-To: <20240918090445.725283-1-mattias.ronnblom@ericsson.com>
Have rte_bit_[test|set|clear|assign|flip]() and rte_bit_atomic_*()
handle volatile-marked pointers.
Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Jack Bond-Preston <jack.bond-preston@foss.arm.com>
--
PATCH v3:
* Updated to reflect removed 'fun' parameter in __RTE_GEN_BIT_*()
(Jack Bond-Preston).
PATCH v2:
* Actually run the test_bit_atomic_v_access*() test functions.
---
app/test/test_bitops.c | 32 +++-
lib/eal/include/rte_bitops.h | 301 +++++++++++++++++++++++------------
2 files changed, 222 insertions(+), 111 deletions(-)
diff --git a/app/test/test_bitops.c b/app/test/test_bitops.c
index b80216a0a1..10e87f6776 100644
--- a/app/test/test_bitops.c
+++ b/app/test/test_bitops.c
@@ -14,13 +14,13 @@
#include "test.h"
#define GEN_TEST_BIT_ACCESS(test_name, set_fun, clear_fun, assign_fun, \
- flip_fun, test_fun, size) \
+ flip_fun, test_fun, size, mod) \
static int \
test_name(void) \
{ \
uint ## size ## _t reference = (uint ## size ## _t)rte_rand(); \
unsigned int bit_nr; \
- uint ## size ## _t word = (uint ## size ## _t)rte_rand(); \
+ mod uint ## size ## _t word = (uint ## size ## _t)rte_rand(); \
\
for (bit_nr = 0; bit_nr < size; bit_nr++) { \
bool reference_bit = (reference >> bit_nr) & 1; \
@@ -41,7 +41,7 @@
"Bit %d had unflipped value", bit_nr); \
flip_fun(&word, bit_nr); \
\
- const uint ## size ## _t *const_ptr = &word; \
+ const mod uint ## size ## _t *const_ptr = &word; \
TEST_ASSERT(test_fun(const_ptr, bit_nr) == \
reference_bit, \
"Bit %d had unexpected value", bit_nr); \
@@ -59,10 +59,16 @@
}
GEN_TEST_BIT_ACCESS(test_bit_access32, rte_bit_set, rte_bit_clear,
- rte_bit_assign, rte_bit_flip, rte_bit_test, 32)
+ rte_bit_assign, rte_bit_flip, rte_bit_test, 32,)
GEN_TEST_BIT_ACCESS(test_bit_access64, rte_bit_set, rte_bit_clear,
- rte_bit_assign, rte_bit_flip, rte_bit_test, 64)
+ rte_bit_assign, rte_bit_flip, rte_bit_test, 64,)
+
+GEN_TEST_BIT_ACCESS(test_bit_v_access32, rte_bit_set, rte_bit_clear,
+ rte_bit_assign, rte_bit_flip, rte_bit_test, 32, volatile)
+
+GEN_TEST_BIT_ACCESS(test_bit_v_access64, rte_bit_set, rte_bit_clear,
+ rte_bit_assign, rte_bit_flip, rte_bit_test, 64, volatile)
#define bit_atomic_set(addr, nr) \
rte_bit_atomic_set(addr, nr, rte_memory_order_relaxed)
@@ -81,11 +87,19 @@ GEN_TEST_BIT_ACCESS(test_bit_access64, rte_bit_set, rte_bit_clear,
GEN_TEST_BIT_ACCESS(test_bit_atomic_access32, bit_atomic_set,
bit_atomic_clear, bit_atomic_assign,
- bit_atomic_flip, bit_atomic_test, 32)
+ bit_atomic_flip, bit_atomic_test, 32,)
GEN_TEST_BIT_ACCESS(test_bit_atomic_access64, bit_atomic_set,
bit_atomic_clear, bit_atomic_assign,
- bit_atomic_flip, bit_atomic_test, 64)
+ bit_atomic_flip, bit_atomic_test, 64,)
+
+GEN_TEST_BIT_ACCESS(test_bit_atomic_v_access32, bit_atomic_set,
+ bit_atomic_clear, bit_atomic_assign,
+ bit_atomic_flip, bit_atomic_test, 32, volatile)
+
+GEN_TEST_BIT_ACCESS(test_bit_atomic_v_access64, bit_atomic_set,
+ bit_atomic_clear, bit_atomic_assign,
+ bit_atomic_flip, bit_atomic_test, 64, volatile)
#define PARALLEL_TEST_RUNTIME 0.25
@@ -480,8 +494,12 @@ static struct unit_test_suite test_suite = {
TEST_CASE(test_bit_access64),
TEST_CASE(test_bit_access32),
TEST_CASE(test_bit_access64),
+ TEST_CASE(test_bit_v_access32),
+ TEST_CASE(test_bit_v_access64),
TEST_CASE(test_bit_atomic_access32),
TEST_CASE(test_bit_atomic_access64),
+ TEST_CASE(test_bit_atomic_v_access32),
+ TEST_CASE(test_bit_atomic_v_access64),
TEST_CASE(test_bit_atomic_parallel_assign32),
TEST_CASE(test_bit_atomic_parallel_assign64),
TEST_CASE(test_bit_atomic_parallel_test_and_modify32),
diff --git a/lib/eal/include/rte_bitops.h b/lib/eal/include/rte_bitops.h
index 3ad6795fd1..d7a07c4099 100644
--- a/lib/eal/include/rte_bitops.h
+++ b/lib/eal/include/rte_bitops.h
@@ -127,12 +127,16 @@ extern "C" {
* @param nr
* The index of the bit.
*/
-#define rte_bit_test(addr, nr) \
- _Generic((addr), \
- uint32_t *: __rte_bit_test32, \
- const uint32_t *: __rte_bit_test32, \
- uint64_t *: __rte_bit_test64, \
- const uint64_t *: __rte_bit_test64)(addr, nr)
+#define rte_bit_test(addr, nr) \
+ _Generic((addr), \
+ uint32_t *: __rte_bit_test32, \
+ const uint32_t *: __rte_bit_test32, \
+ volatile uint32_t *: __rte_bit_v_test32, \
+ const volatile uint32_t *: __rte_bit_v_test32, \
+ uint64_t *: __rte_bit_test64, \
+ const uint64_t *: __rte_bit_test64, \
+ volatile uint64_t *: __rte_bit_v_test64, \
+ const volatile uint64_t *: __rte_bit_v_test64)(addr, nr)
/**
* @warning
@@ -152,10 +156,12 @@ extern "C" {
* @param nr
* The index of the bit.
*/
-#define rte_bit_set(addr, nr) \
- _Generic((addr), \
- uint32_t *: __rte_bit_set32, \
- uint64_t *: __rte_bit_set64)(addr, nr)
+#define rte_bit_set(addr, nr) \
+ _Generic((addr), \
+ uint32_t *: __rte_bit_set32, \
+ volatile uint32_t *: __rte_bit_v_set32, \
+ uint64_t *: __rte_bit_set64, \
+ volatile uint64_t *: __rte_bit_v_set64)(addr, nr)
/**
* @warning
@@ -175,10 +181,12 @@ extern "C" {
* @param nr
* The index of the bit.
*/
-#define rte_bit_clear(addr, nr) \
- _Generic((addr), \
- uint32_t *: __rte_bit_clear32, \
- uint64_t *: __rte_bit_clear64)(addr, nr)
+#define rte_bit_clear(addr, nr) \
+ _Generic((addr), \
+ uint32_t *: __rte_bit_clear32, \
+ volatile uint32_t *: __rte_bit_v_clear32, \
+ uint64_t *: __rte_bit_clear64, \
+ volatile uint64_t *: __rte_bit_v_clear64)(addr, nr)
/**
* @warning
@@ -202,7 +210,9 @@ extern "C" {
#define rte_bit_assign(addr, nr, value) \
_Generic((addr), \
uint32_t *: __rte_bit_assign32, \
- uint64_t *: __rte_bit_assign64)(addr, nr, value)
+ volatile uint32_t *: __rte_bit_v_assign32, \
+ uint64_t *: __rte_bit_assign64, \
+ volatile uint64_t *: __rte_bit_v_assign64)(addr, nr, value)
/**
* @warning
@@ -225,7 +235,9 @@ extern "C" {
#define rte_bit_flip(addr, nr) \
_Generic((addr), \
uint32_t *: __rte_bit_flip32, \
- uint64_t *: __rte_bit_flip64)(addr, nr)
+ volatile uint32_t *: __rte_bit_v_flip32, \
+ uint64_t *: __rte_bit_flip64, \
+ volatile uint64_t *: __rte_bit_v_flip64)(addr, nr)
/**
* @warning
@@ -250,9 +262,13 @@ extern "C" {
_Generic((addr), \
uint32_t *: __rte_bit_atomic_test32, \
const uint32_t *: __rte_bit_atomic_test32, \
+ volatile uint32_t *: __rte_bit_atomic_v_test32, \
+ const volatile uint32_t *: __rte_bit_atomic_v_test32, \
uint64_t *: __rte_bit_atomic_test64, \
- const uint64_t *: __rte_bit_atomic_test64)(addr, nr, \
- memory_order)
+ const uint64_t *: __rte_bit_atomic_test64, \
+ volatile uint64_t *: __rte_bit_atomic_v_test64, \
+ const volatile uint64_t *: __rte_bit_atomic_v_test64) \
+ (addr, nr, memory_order)
/**
* @warning
@@ -274,7 +290,10 @@ extern "C" {
#define rte_bit_atomic_set(addr, nr, memory_order) \
_Generic((addr), \
uint32_t *: __rte_bit_atomic_set32, \
- uint64_t *: __rte_bit_atomic_set64)(addr, nr, memory_order)
+ volatile uint32_t *: __rte_bit_atomic_v_set32, \
+ uint64_t *: __rte_bit_atomic_set64, \
+ volatile uint64_t *: __rte_bit_atomic_v_set64)(addr, nr, \
+ memory_order)
/**
* @warning
@@ -296,7 +315,10 @@ extern "C" {
#define rte_bit_atomic_clear(addr, nr, memory_order) \
_Generic((addr), \
uint32_t *: __rte_bit_atomic_clear32, \
- uint64_t *: __rte_bit_atomic_clear64)(addr, nr, memory_order)
+ volatile uint32_t *: __rte_bit_atomic_v_clear32, \
+ uint64_t *: __rte_bit_atomic_clear64, \
+ volatile uint64_t *: __rte_bit_atomic_v_clear64)(addr, nr, \
+ memory_order)
/**
* @warning
@@ -320,8 +342,11 @@ extern "C" {
#define rte_bit_atomic_assign(addr, nr, value, memory_order) \
_Generic((addr), \
uint32_t *: __rte_bit_atomic_assign32, \
- uint64_t *: __rte_bit_atomic_assign64)(addr, nr, value, \
- memory_order)
+ volatile uint32_t *: __rte_bit_atomic_v_assign32, \
+ uint64_t *: __rte_bit_atomic_assign64, \
+ volatile uint64_t *: __rte_bit_atomic_v_assign64)(addr, nr, \
+ value, \
+ memory_order)
/**
* @warning
@@ -344,7 +369,10 @@ extern "C" {
#define rte_bit_atomic_flip(addr, nr, memory_order) \
_Generic((addr), \
uint32_t *: __rte_bit_atomic_flip32, \
- uint64_t *: __rte_bit_atomic_flip64)(addr, nr, memory_order)
+ volatile uint32_t *: __rte_bit_atomic_v_flip32, \
+ uint64_t *: __rte_bit_atomic_flip64, \
+ volatile uint64_t *: __rte_bit_atomic_v_flip64)(addr, nr, \
+ memory_order)
/**
* @warning
@@ -368,8 +396,10 @@ extern "C" {
#define rte_bit_atomic_test_and_set(addr, nr, memory_order) \
_Generic((addr), \
uint32_t *: __rte_bit_atomic_test_and_set32, \
- uint64_t *: __rte_bit_atomic_test_and_set64)(addr, nr, \
- memory_order)
+ volatile uint32_t *: __rte_bit_atomic_v_test_and_set32, \
+ uint64_t *: __rte_bit_atomic_test_and_set64, \
+ volatile uint64_t *: __rte_bit_atomic_v_test_and_set64) \
+ (addr, nr, memory_order)
/**
* @warning
@@ -393,8 +423,10 @@ extern "C" {
#define rte_bit_atomic_test_and_clear(addr, nr, memory_order) \
_Generic((addr), \
uint32_t *: __rte_bit_atomic_test_and_clear32, \
- uint64_t *: __rte_bit_atomic_test_and_clear64)(addr, nr, \
- memory_order)
+ volatile uint32_t *: __rte_bit_atomic_v_test_and_clear32, \
+ uint64_t *: __rte_bit_atomic_test_and_clear64, \
+ volatile uint64_t *: __rte_bit_atomic_v_test_and_clear64) \
+ (addr, nr, memory_order)
/**
* @warning
@@ -421,9 +453,10 @@ extern "C" {
#define rte_bit_atomic_test_and_assign(addr, nr, value, memory_order) \
_Generic((addr), \
uint32_t *: __rte_bit_atomic_test_and_assign32, \
- uint64_t *: __rte_bit_atomic_test_and_assign64)(addr, nr, \
- value, \
- memory_order)
+ volatile uint32_t *: __rte_bit_atomic_v_test_and_assign32, \
+ uint64_t *: __rte_bit_atomic_test_and_assign64, \
+ volatile uint64_t *: __rte_bit_atomic_v_test_and_assign64) \
+ (addr, nr, value, memory_order)
#define __RTE_GEN_BIT_TEST(variant, qualifier, size) \
__rte_experimental \
@@ -493,7 +526,8 @@ extern "C" {
__RTE_GEN_BIT_FLIP(v, qualifier, size)
#define __RTE_GEN_BIT_OPS_SIZE(size) \
- __RTE_GEN_BIT_OPS(,, size)
+ __RTE_GEN_BIT_OPS(,, size) \
+ __RTE_GEN_BIT_OPS(v_, volatile, size)
__RTE_GEN_BIT_OPS_SIZE(32)
__RTE_GEN_BIT_OPS_SIZE(64)
@@ -633,7 +667,8 @@ __RTE_GEN_BIT_OPS_SIZE(64)
__RTE_GEN_BIT_ATOMIC_FLIP(variant, qualifier, size)
#define __RTE_GEN_BIT_ATOMIC_OPS_SIZE(size) \
- __RTE_GEN_BIT_ATOMIC_OPS(,, size)
+ __RTE_GEN_BIT_ATOMIC_OPS(,, size) \
+ __RTE_GEN_BIT_ATOMIC_OPS(v_, volatile, size)
__RTE_GEN_BIT_ATOMIC_OPS_SIZE(32)
__RTE_GEN_BIT_ATOMIC_OPS_SIZE(64)
@@ -1342,120 +1377,178 @@ rte_log2_u64(uint64_t v)
#undef rte_bit_atomic_test_and_clear
#undef rte_bit_atomic_test_and_assign
-#define __RTE_BIT_OVERLOAD_SZ_2(fun, qualifier, size, arg1_type, arg1_name) \
+#define __RTE_BIT_OVERLOAD_V_2(family, v, fun, c, size, arg1_type, arg1_name) \
static inline void \
- rte_bit_ ## fun(qualifier uint ## size ## _t *addr, \
- arg1_type arg1_name) \
+ rte_bit_ ## family ## fun(c uint ## size ## _t *addr, \
+ arg1_type arg1_name) \
{ \
- __rte_bit_ ## fun ## size(addr, arg1_name); \
+ __rte_bit_ ## family ## v ## fun ## size(addr, arg1_name); \
}
-#define __RTE_BIT_OVERLOAD_2(fun, qualifier, arg1_type, arg1_name) \
- __RTE_BIT_OVERLOAD_SZ_2(fun, qualifier, 32, arg1_type, arg1_name) \
- __RTE_BIT_OVERLOAD_SZ_2(fun, qualifier, 64, arg1_type, arg1_name)
+#define __RTE_BIT_OVERLOAD_SZ_2(family, fun, c, size, arg1_type, arg1_name) \
+ __RTE_BIT_OVERLOAD_V_2(family,, fun, c, size, arg1_type, \
+ arg1_name) \
+ __RTE_BIT_OVERLOAD_V_2(family, v_, fun, c volatile, size, \
+ arg1_type, arg1_name)
-#define __RTE_BIT_OVERLOAD_SZ_2R(fun, qualifier, size, ret_type, arg1_type, \
- arg1_name) \
+#define __RTE_BIT_OVERLOAD_2(family, fun, c, arg1_type, arg1_name) \
+ __RTE_BIT_OVERLOAD_SZ_2(family, fun, c, 32, arg1_type, arg1_name) \
+ __RTE_BIT_OVERLOAD_SZ_2(family, fun, c, 64, arg1_type, arg1_name)
+
+#define __RTE_BIT_OVERLOAD_V_2R(family, v, fun, c, size, ret_type, arg1_type, \
+ arg1_name) \
static inline ret_type \
- rte_bit_ ## fun(qualifier uint ## size ## _t *addr, \
+ rte_bit_ ## family ## fun(c uint ## size ## _t *addr, \
arg1_type arg1_name) \
{ \
- return __rte_bit_ ## fun ## size(addr, arg1_name); \
+ return __rte_bit_ ## family ## v ## fun ## size(addr, \
+ arg1_name); \
}
-#define __RTE_BIT_OVERLOAD_2R(fun, qualifier, ret_type, arg1_type, arg1_name) \
- __RTE_BIT_OVERLOAD_SZ_2R(fun, qualifier, 32, ret_type, arg1_type, \
+#define __RTE_BIT_OVERLOAD_SZ_2R(family, fun, c, size, ret_type, arg1_type, \
+ arg1_name) \
+ __RTE_BIT_OVERLOAD_V_2R(family,, fun, c, size, ret_type, arg1_type, \
+ arg1_name) \
+ __RTE_BIT_OVERLOAD_V_2R(family, v_, fun, c volatile, \
+ size, ret_type, arg1_type, arg1_name)
+
+#define __RTE_BIT_OVERLOAD_2R(family, fun, c, ret_type, arg1_type, arg1_name) \
+ __RTE_BIT_OVERLOAD_SZ_2R(family, fun, c, 32, ret_type, arg1_type, \
arg1_name) \
- __RTE_BIT_OVERLOAD_SZ_2R(fun, qualifier, 64, ret_type, arg1_type, \
+ __RTE_BIT_OVERLOAD_SZ_2R(family, fun, c, 64, ret_type, arg1_type, \
arg1_name)
-#define __RTE_BIT_OVERLOAD_SZ_3(fun, qualifier, size, arg1_type, arg1_name, \
- arg2_type, arg2_name) \
+#define __RTE_BIT_OVERLOAD_V_3(family, v, fun, c, size, arg1_type, arg1_name, \
+ arg2_type, arg2_name) \
static inline void \
- rte_bit_ ## fun(uint ## size ## _t *addr, arg1_type arg1_name, \
- arg2_type arg2_name) \
+ rte_bit_ ## family ## fun(c uint ## size ## _t *addr, \
+ arg1_type arg1_name, arg2_type arg2_name) \
{ \
- __rte_bit_ ## fun ## size(addr, arg1_name, arg2_name); \
+ __rte_bit_ ## family ## v ## fun ## size(addr, arg1_name, \
+ arg2_name); \
}
-#define __RTE_BIT_OVERLOAD_3(fun, qualifier, arg1_type, arg1_name, arg2_type, \
+#define __RTE_BIT_OVERLOAD_SZ_3(family, fun, c, size, arg1_type, arg1_name, \
+ arg2_type, arg2_name) \
+ __RTE_BIT_OVERLOAD_V_3(family,, fun, c, size, arg1_type, arg1_name, \
+ arg2_type, arg2_name) \
+ __RTE_BIT_OVERLOAD_V_3(family, v_, fun, c volatile, size, arg1_type, \
+ arg1_name, arg2_type, arg2_name)
+
+#define __RTE_BIT_OVERLOAD_3(family, fun, c, arg1_type, arg1_name, arg2_type, \
arg2_name) \
- __RTE_BIT_OVERLOAD_SZ_3(fun, qualifier, 32, arg1_type, arg1_name, \
+ __RTE_BIT_OVERLOAD_SZ_3(family, fun, c, 32, arg1_type, arg1_name, \
arg2_type, arg2_name) \
- __RTE_BIT_OVERLOAD_SZ_3(fun, qualifier, 64, arg1_type, arg1_name, \
+ __RTE_BIT_OVERLOAD_SZ_3(family, fun, c, 64, arg1_type, arg1_name, \
arg2_type, arg2_name)
-#define __RTE_BIT_OVERLOAD_SZ_3R(fun, qualifier, size, ret_type, arg1_type, \
- arg1_name, arg2_type, arg2_name) \
+#define __RTE_BIT_OVERLOAD_V_3R(family, v, fun, c, size, ret_type, arg1_type, \
+ arg1_name, arg2_type, arg2_name) \
static inline ret_type \
- rte_bit_ ## fun(uint ## size ## _t *addr, arg1_type arg1_name, \
- arg2_type arg2_name) \
+ rte_bit_ ## family ## fun(c uint ## size ## _t *addr, \
+ arg1_type arg1_name, arg2_type arg2_name) \
{ \
- return __rte_bit_ ## fun ## size(addr, arg1_name, arg2_name); \
+ return __rte_bit_ ## family ## v ## fun ## size(addr, \
+ arg1_name, \
+ arg2_name); \
}
-#define __RTE_BIT_OVERLOAD_3R(fun, qualifier, ret_type, arg1_type, arg1_name, \
- arg2_type, arg2_name) \
- __RTE_BIT_OVERLOAD_SZ_3R(fun, qualifier, 32, ret_type, arg1_type, \
+#define __RTE_BIT_OVERLOAD_SZ_3R(family, fun, c, size, ret_type, arg1_type, \
arg1_name, arg2_type, arg2_name) \
- __RTE_BIT_OVERLOAD_SZ_3R(fun, qualifier, 64, ret_type, arg1_type, \
- arg1_name, arg2_type, arg2_name)
+ __RTE_BIT_OVERLOAD_V_3R(family,, fun, c, size, ret_type, \
+ arg1_type, arg1_name, arg2_type, arg2_name) \
+ __RTE_BIT_OVERLOAD_V_3R(family, v_, fun, c volatile, size, \
+ ret_type, arg1_type, arg1_name, arg2_type, \
+ arg2_name)
-#define __RTE_BIT_OVERLOAD_SZ_4(fun, qualifier, size, arg1_type, arg1_name, \
- arg2_type, arg2_name, arg3_type, arg3_name) \
+#define __RTE_BIT_OVERLOAD_3R(family, fun, c, ret_type, arg1_type, arg1_name, \
+ arg2_type, arg2_name) \
+ __RTE_BIT_OVERLOAD_SZ_3R(family, fun, c, 32, ret_type, \
+ arg1_type, arg1_name, arg2_type, arg2_name) \
+ __RTE_BIT_OVERLOAD_SZ_3R(family, fun, c, 64, ret_type, \
+ arg1_type, arg1_name, arg2_type, arg2_name)
+
+#define __RTE_BIT_OVERLOAD_V_4(family, v, fun, c, size, arg1_type, arg1_name, \
+ arg2_type, arg2_name, arg3_type, arg3_name) \
static inline void \
- rte_bit_ ## fun(uint ## size ## _t *addr, arg1_type arg1_name, \
- arg2_type arg2_name, arg3_type arg3_name) \
+ rte_bit_ ## family ## fun(c uint ## size ## _t *addr, \
+ arg1_type arg1_name, arg2_type arg2_name, \
+ arg3_type arg3_name) \
{ \
- __rte_bit_ ## fun ## size(addr, arg1_name, arg2_name, \
- arg3_name); \
+ __rte_bit_ ## family ## v ## fun ## size(addr, arg1_name, \
+ arg2_name, \
+ arg3_name); \
}
-#define __RTE_BIT_OVERLOAD_4(fun, qualifier, arg1_type, arg1_name, arg2_type, \
- arg2_name, arg3_type, arg3_name) \
- __RTE_BIT_OVERLOAD_SZ_4(fun, qualifier, 32, arg1_type, arg1_name, \
+#define __RTE_BIT_OVERLOAD_SZ_4(family, fun, c, size, arg1_type, arg1_name, \
arg2_type, arg2_name, arg3_type, arg3_name) \
- __RTE_BIT_OVERLOAD_SZ_4(fun, qualifier, 64, arg1_type, arg1_name, \
- arg2_type, arg2_name, arg3_type, arg3_name)
-
-#define __RTE_BIT_OVERLOAD_SZ_4R(fun, qualifier, size, ret_type, arg1_type, \
- arg1_name, arg2_type, arg2_name, arg3_type, \
- arg3_name) \
+ __RTE_BIT_OVERLOAD_V_4(family,, fun, c, size, arg1_type, \
+ arg1_name, arg2_type, arg2_name, arg3_type, \
+ arg3_name) \
+ __RTE_BIT_OVERLOAD_V_4(family, v_, fun, c volatile, size, \
+ arg1_type, arg1_name, arg2_type, arg2_name, \
+ arg3_type, arg3_name)
+
+#define __RTE_BIT_OVERLOAD_4(family, fun, c, arg1_type, arg1_name, arg2_type, \
+ arg2_name, arg3_type, arg3_name) \
+ __RTE_BIT_OVERLOAD_SZ_4(family, fun, c, 32, arg1_type, \
+ arg1_name, arg2_type, arg2_name, arg3_type, \
+ arg3_name) \
+ __RTE_BIT_OVERLOAD_SZ_4(family, fun, c, 64, arg1_type, \
+ arg1_name, arg2_type, arg2_name, arg3_type, \
+ arg3_name)
+
+#define __RTE_BIT_OVERLOAD_V_4R(family, v, fun, c, size, ret_type, arg1_type, \
+ arg1_name, arg2_type, arg2_name, arg3_type, \
+ arg3_name) \
static inline ret_type \
- rte_bit_ ## fun(uint ## size ## _t *addr, arg1_type arg1_name, \
- arg2_type arg2_name, arg3_type arg3_name) \
+ rte_bit_ ## family ## fun(c uint ## size ## _t *addr, \
+ arg1_type arg1_name, arg2_type arg2_name, \
+ arg3_type arg3_name) \
{ \
- return __rte_bit_ ## fun ## size(addr, arg1_name, arg2_name, \
- arg3_name); \
+ return __rte_bit_ ## family ## v ## fun ## size(addr, \
+ arg1_name, \
+ arg2_name, \
+ arg3_name); \
}
-#define __RTE_BIT_OVERLOAD_4R(fun, qualifier, ret_type, arg1_type, arg1_name, \
- arg2_type, arg2_name, arg3_type, arg3_name) \
- __RTE_BIT_OVERLOAD_SZ_4R(fun, qualifier, 32, ret_type, arg1_type, \
+#define __RTE_BIT_OVERLOAD_SZ_4R(family, fun, c, size, ret_type, arg1_type, \
arg1_name, arg2_type, arg2_name, arg3_type, \
arg3_name) \
- __RTE_BIT_OVERLOAD_SZ_4R(fun, qualifier, 64, ret_type, arg1_type, \
- arg1_name, arg2_type, arg2_name, arg3_type, \
- arg3_name)
-
-__RTE_BIT_OVERLOAD_2R(test, const, bool, unsigned int, nr)
-__RTE_BIT_OVERLOAD_2(set,, unsigned int, nr)
-__RTE_BIT_OVERLOAD_2(clear,, unsigned int, nr)
-__RTE_BIT_OVERLOAD_3(assign,, unsigned int, nr, bool, value)
-__RTE_BIT_OVERLOAD_2(flip,, unsigned int, nr)
-
-__RTE_BIT_OVERLOAD_3R(atomic_test, const, bool, unsigned int, nr,
+ __RTE_BIT_OVERLOAD_V_4R(family,, fun, c, size, ret_type, arg1_type, \
+ arg1_name, arg2_type, arg2_name, arg3_type, \
+ arg3_name) \
+ __RTE_BIT_OVERLOAD_V_4R(family, v_, fun, c volatile, size, \
+ ret_type, arg1_type, arg1_name, arg2_type, \
+ arg2_name, arg3_type, arg3_name)
+
+#define __RTE_BIT_OVERLOAD_4R(family, fun, c, ret_type, arg1_type, arg1_name, \
+ arg2_type, arg2_name, arg3_type, arg3_name) \
+ __RTE_BIT_OVERLOAD_SZ_4R(family, fun, c, 32, ret_type, \
+ arg1_type, arg1_name, arg2_type, arg2_name, \
+ arg3_type, arg3_name) \
+ __RTE_BIT_OVERLOAD_SZ_4R(family, fun, c, 64, ret_type, \
+ arg1_type, arg1_name, arg2_type, arg2_name, \
+ arg3_type, arg3_name)
+
+__RTE_BIT_OVERLOAD_2R(, test, const, bool, unsigned int, nr)
+__RTE_BIT_OVERLOAD_2(, set,, unsigned int, nr)
+__RTE_BIT_OVERLOAD_2(, clear,, unsigned int, nr)
+__RTE_BIT_OVERLOAD_3(, assign,, unsigned int, nr, bool, value)
+__RTE_BIT_OVERLOAD_2(, flip,, unsigned int, nr)
+
+__RTE_BIT_OVERLOAD_3R(atomic_, test, const, bool, unsigned int, nr,
int, memory_order)
-__RTE_BIT_OVERLOAD_3(atomic_set,, unsigned int, nr, int, memory_order)
-__RTE_BIT_OVERLOAD_3(atomic_clear,, unsigned int, nr, int, memory_order)
-__RTE_BIT_OVERLOAD_4(atomic_assign,, unsigned int, nr, bool, value,
+__RTE_BIT_OVERLOAD_3(atomic_, set,, unsigned int, nr, int, memory_order)
+__RTE_BIT_OVERLOAD_3(atomic_, clear,, unsigned int, nr, int, memory_order)
+__RTE_BIT_OVERLOAD_4(atomic_, assign,, unsigned int, nr, bool, value,
int, memory_order)
-__RTE_BIT_OVERLOAD_3(atomic_flip,, unsigned int, nr, int, memory_order)
-__RTE_BIT_OVERLOAD_3R(atomic_test_and_set,, bool, unsigned int, nr,
+__RTE_BIT_OVERLOAD_3(atomic_, flip,, unsigned int, nr, int, memory_order)
+__RTE_BIT_OVERLOAD_3R(atomic_, test_and_set,, bool, unsigned int, nr,
int, memory_order)
-__RTE_BIT_OVERLOAD_3R(atomic_test_and_clear,, bool, unsigned int, nr,
+__RTE_BIT_OVERLOAD_3R(atomic_, test_and_clear,, bool, unsigned int, nr,
int, memory_order)
-__RTE_BIT_OVERLOAD_4R(atomic_test_and_assign,, bool, unsigned int, nr,
+__RTE_BIT_OVERLOAD_4R(atomic_, test_and_assign,, bool, unsigned int, nr,
bool, value, int, memory_order)
#endif
--
2.34.1
next prev parent reply other threads:[~2024-09-18 9:14 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-31 13:13 [RFC v3] eal: add bitset type Mattias Rönnblom
2024-01-31 16:02 ` Stephen Hemminger
2024-01-31 16:28 ` Mattias Rönnblom
2024-01-31 16:06 ` Stephen Hemminger
2024-01-31 18:45 ` Mattias Rönnblom
2024-02-01 8:04 ` Morten Brørup
2024-02-02 10:19 ` Mattias Rönnblom
2024-02-02 12:42 ` Morten Brørup
2024-02-16 10:23 ` [RFC v4 1/4] " Mattias Rönnblom
2024-02-16 10:23 ` [RFC v4 2/4] eal: add bitset test suite Mattias Rönnblom
2024-02-16 10:23 ` [RFC v4 3/4] service: use multi-word bitset to represent service flags Mattias Rönnblom
2024-02-16 10:23 ` [RFC v4 4/4] event/dsw: optimize serving port logic Mattias Rönnblom
2024-05-05 7:33 ` [RFC v5 1/6] eal: add bitset type Mattias Rönnblom
2024-05-05 7:33 ` [RFC v5 2/6] eal: add bitset test suite Mattias Rönnblom
2024-05-05 7:33 ` [RFC v5 3/6] eal: add atomic bitset functions Mattias Rönnblom
2024-05-05 7:33 ` [RFC v5 4/6] eal: add unit tests for atomic bitset operations Mattias Rönnblom
2024-05-05 7:33 ` [RFC v5 5/6] service: use multi-word bitset to represent service flags Mattias Rönnblom
2024-05-05 7:33 ` [RFC v5 6/6] event/dsw: optimize serving port logic Mattias Rönnblom
2024-08-09 20:14 ` [PATCH 1/6] eal: add bitset type Mattias Rönnblom
2024-08-09 20:14 ` [PATCH 2/6] eal: add bitset test suite Mattias Rönnblom
2024-09-12 4:51 ` Tyler Retzlaff
2024-08-09 20:14 ` [PATCH 3/6] eal: add atomic bitset functions Mattias Rönnblom
2024-09-12 4:51 ` Tyler Retzlaff
2024-08-09 20:14 ` [PATCH 4/6] eal: add unit tests for atomic bitset operations Mattias Rönnblom
2024-09-12 4:52 ` Tyler Retzlaff
2024-10-09 20:29 ` Morten Brørup
2024-08-09 20:14 ` [PATCH 5/6] service: use multi-word bitset to represent service flags Mattias Rönnblom
2024-09-12 4:52 ` Tyler Retzlaff
2024-08-09 20:14 ` [PATCH 6/6] event/dsw: add support for larger port count Mattias Rönnblom
2024-09-12 4:53 ` Tyler Retzlaff
2024-08-20 17:09 ` [PATCH 1/6] eal: add bitset type Mattias Rönnblom
2024-09-02 13:55 ` Morten Brørup
2024-09-02 14:46 ` Mattias Rönnblom
2024-09-02 14:49 ` Mattias Rönnblom
2024-09-12 4:51 ` Tyler Retzlaff
2024-09-17 9:36 ` [PATCH v7 0/6] Improve EAL bit operations API Mattias Rönnblom
2024-09-17 9:36 ` [PATCH v7 1/6] dpdk: do not force C linkage on include file dependencies Mattias Rönnblom
2024-09-17 10:48 ` [PATCH v8 0/6] Improve EAL bit operations API Mattias Rönnblom
2024-09-17 10:48 ` [PATCH v8 1/6] dpdk: do not force C linkage on include file dependencies Mattias Rönnblom
2024-09-18 9:04 ` [PATCH v9 0/6] Improve EAL bit operations API Mattias Rönnblom
2024-09-18 9:04 ` [PATCH v9 1/6] dpdk: do not force C linkage on include file dependencies Mattias Rönnblom
2024-09-19 19:31 ` [PATCH v10 0/7] Improve EAL bit operations API Mattias Rönnblom
2024-09-19 19:31 ` [PATCH v10 1/7] buildtools/chkincs: relax C linkage requirement Mattias Rönnblom
2024-09-20 6:24 ` [PATCH v11 0/7] Improve EAL bit operations API Mattias Rönnblom
2024-09-20 6:24 ` [PATCH v11 1/7] buildtools/chkincs: relax C linkage requirement Mattias Rönnblom
2024-09-20 10:47 ` [PATCH v12 0/7] Improve EAL bit operations API Mattias Rönnblom
2024-09-20 10:47 ` [PATCH v12 1/7] buildtools/chkincs: relax C linkage requirement Mattias Rönnblom
2024-10-03 16:47 ` Robin Jarry
2024-10-04 7:31 ` Mattias Rönnblom
2024-10-04 8:05 ` Robin Jarry
2024-10-04 8:40 ` Mattias Rönnblom
2024-10-04 11:51 ` Robin Jarry
2024-10-04 12:19 ` Thomas Monjalon
2024-10-06 8:55 ` Mattias Rönnblom
2024-10-06 9:47 ` Mattias Rönnblom
2024-10-06 12:25 ` Robin Jarry
2024-10-06 13:09 ` Robin Jarry
2024-10-06 14:17 ` Mattias Rönnblom
2024-10-06 15:58 ` Robin Jarry
2024-10-10 10:24 ` Mattias Rönnblom
2024-10-10 10:39 ` Bruce Richardson
2024-09-20 10:47 ` [PATCH v12 2/7] dpdk: use C linkage only where appropriate Mattias Rönnblom
2024-09-20 10:47 ` [PATCH v12 3/7] eal: extend bit manipulation functionality Mattias Rönnblom
2024-09-20 10:47 ` [PATCH v12 4/7] eal: add unit tests for bit operations Mattias Rönnblom
2024-09-20 10:47 ` [PATCH v12 5/7] eal: add atomic " Mattias Rönnblom
2024-09-20 10:47 ` [PATCH v12 6/7] eal: add unit tests for atomic bit access functions Mattias Rönnblom
2024-10-10 10:45 ` David Marchand
2024-10-10 11:55 ` Mattias Rönnblom
2024-10-10 12:14 ` David Marchand
2024-10-10 12:35 ` Mattias Rönnblom
2024-10-10 13:07 ` Thomas Monjalon
2024-10-11 8:35 ` David Marchand
2024-10-11 15:06 ` Morten Brørup
2024-10-11 15:11 ` David Marchand
2024-10-11 15:15 ` Morten Brørup
2024-10-11 15:18 ` David Marchand
2024-09-20 10:47 ` [PATCH v12 7/7] eal: extend bitops to handle volatile pointers Mattias Rönnblom
2024-10-09 20:18 ` [PATCH v12 0/7] Improve EAL bit operations API David Marchand
2024-09-20 6:24 ` [PATCH v11 2/7] dpdk: use C linkage only where appropriate Mattias Rönnblom
2024-09-20 6:24 ` [PATCH v11 3/7] eal: extend bit manipulation functionality Mattias Rönnblom
2024-09-20 6:24 ` [PATCH v11 4/7] eal: add unit tests for bit operations Mattias Rönnblom
2024-09-20 6:24 ` [PATCH v11 5/7] eal: add atomic " Mattias Rönnblom
2024-09-20 6:24 ` [PATCH v11 6/7] eal: add unit tests for atomic bit access functions Mattias Rönnblom
2024-09-20 6:24 ` [PATCH v11 7/7] eal: extend bitops to handle volatile pointers Mattias Rönnblom
2024-09-19 19:31 ` [PATCH v10 2/7] dpdk: use C linkage only where appropriate Mattias Rönnblom
2024-09-19 19:31 ` [PATCH v10 3/7] eal: extend bit manipulation functionality Mattias Rönnblom
2024-09-19 19:31 ` [PATCH v10 4/7] eal: add unit tests for bit operations Mattias Rönnblom
2024-09-19 19:31 ` [PATCH v10 5/7] eal: add atomic " Mattias Rönnblom
2024-09-19 19:31 ` [PATCH v10 6/7] eal: add unit tests for atomic bit access functions Mattias Rönnblom
2024-09-19 19:31 ` [PATCH v10 7/7] eal: extend bitops to handle volatile pointers Mattias Rönnblom
2024-09-18 9:04 ` [PATCH v9 2/6] eal: extend bit manipulation functionality Mattias Rönnblom
2024-09-18 9:04 ` [PATCH v9 3/6] eal: add unit tests for bit operations Mattias Rönnblom
2024-09-18 9:04 ` [PATCH v9 4/6] eal: add atomic " Mattias Rönnblom
2024-09-18 9:04 ` [PATCH v9 5/6] eal: add unit tests for atomic bit access functions Mattias Rönnblom
2024-09-18 9:04 ` Mattias Rönnblom [this message]
2024-09-17 10:48 ` [PATCH v8 2/6] eal: extend bit manipulation functionality Mattias Rönnblom
2024-09-17 10:48 ` [PATCH v8 3/6] eal: add unit tests for bit operations Mattias Rönnblom
2024-09-17 10:48 ` [PATCH v8 4/6] eal: add atomic " Mattias Rönnblom
2024-09-17 10:48 ` [PATCH v8 5/6] eal: add unit tests for atomic bit access functions Mattias Rönnblom
2024-09-17 10:48 ` [PATCH v8 6/6] eal: extend bitops to handle volatile pointers Mattias Rönnblom
2024-09-17 9:36 ` [PATCH v7 2/6] eal: extend bit manipulation functionality Mattias Rönnblom
2024-09-17 9:36 ` [PATCH v7 3/6] eal: add unit tests for bit operations Mattias Rönnblom
2024-09-17 9:36 ` [PATCH v7 4/6] eal: add atomic " Mattias Rönnblom
2024-09-17 9:36 ` [PATCH v7 5/6] eal: add unit tests for atomic bit access functions Mattias Rönnblom
2024-09-17 9:36 ` [PATCH v7 6/6] eal: extend bitops to handle volatile pointers Mattias Rönnblom
2024-10-10 8:30 ` [PATCH v2 0/4] Add bitset type David Marchand
2024-10-10 8:30 ` [PATCH v2 1/4] eal: add " David Marchand
2024-10-11 9:35 ` Mattias Rönnblom
2024-10-16 11:30 ` David Marchand
2024-10-16 13:37 ` Mattias Rönnblom
2024-10-10 8:30 ` [PATCH v2 2/4] bitset: add atomic functions David Marchand
2024-10-10 8:30 ` [PATCH v2 3/4] service: use multi-word bitset to represent service flags David Marchand
2024-10-10 8:30 ` [PATCH v2 4/4] event/dsw: add support for larger port count David Marchand
2024-10-14 15:08 ` [PATCH v2 0/4] Add bitset type David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240918090445.725283-7-mattias.ronnblom@ericsson.com \
--to=mattias.ronnblom@ericsson.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=fengchengwen@huawei.com \
--cc=heng.wang@ericsson.com \
--cc=hofors@lysator.liu.se \
--cc=jack.bond-preston@foss.arm.com \
--cc=mb@smartsharesystems.com \
--cc=roretzla@linux.microsoft.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).