From: Jie Hai <haijie1@huawei.com>
To: dev@dpdk.org, "Morten Brørup" <mb@smartsharesystems.com>,
"Tyler Retzlaff" <roretzla@linux.microsoft.com>,
"Konstantin Ananyev" <konstantin.v.ananyev@yandex.ru>
Cc: <lihuisong@huawei.com>, <fengchengwen@huawei.com>,
<liudongdong3@huawei.com>, <haijie1@huawei.com>
Subject: [PATCH 1/2] eal: fix constraints on stdatomic API
Date: Mon, 11 Dec 2023 15:39:03 +0800 [thread overview]
Message-ID: <20231211073904.811243-2-haijie1@huawei.com> (raw)
In-Reply-To: <20231211073904.811243-1-haijie1@huawei.com>
The first parameter of rte_atomic_exchange_explicit() must be a
pointer to _Atomic type. If run command "meson setup --werror
-Denable_stdatomic=true build && ninja -C build", error will occur.
Thia patch fixes it.
Fixes: 1ec6a845b5cb ("eal: use stdatomic API in public headers")
Cc: stable@dpdk.org
Signed-off-by: Jie Hai <haijie1@huawei.com>
---
app/test/test_atomic.c | 6 +++---
lib/eal/include/generic/rte_atomic.h | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/test/test_atomic.c b/app/test/test_atomic.c
index db07159e81ab..c3cb3ae0ea57 100644
--- a/app/test/test_atomic.c
+++ b/app/test/test_atomic.c
@@ -347,9 +347,9 @@ typedef union {
const uint8_t CRC8_POLY = 0x91;
uint8_t crc8_table[256];
-volatile uint16_t token16;
-volatile uint32_t token32;
-volatile uint64_t token64;
+volatile RTE_ATOMIC(uint16_t) token16;
+volatile RTE_ATOMIC(uint32_t) token32;
+volatile RTE_ATOMIC(uint64_t) token64;
static void
build_crc8_table(void)
diff --git a/lib/eal/include/generic/rte_atomic.h b/lib/eal/include/generic/rte_atomic.h
index 0e639dad76a4..38c3b41f9c68 100644
--- a/lib/eal/include/generic/rte_atomic.h
+++ b/lib/eal/include/generic/rte_atomic.h
@@ -207,11 +207,11 @@ rte_atomic16_cmpset(volatile uint16_t *dst, uint16_t exp, uint16_t src)
* The original value at that location
*/
static inline uint16_t
-rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val);
+rte_atomic16_exchange(volatile RTE_ATOMIC(uint16_t) *dst, uint16_t val);
#ifdef RTE_FORCE_INTRINSICS
static inline uint16_t
-rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val)
+rte_atomic16_exchange(volatile RTE_ATOMIC(uint16_t) *dst, uint16_t val)
{
return rte_atomic_exchange_explicit(dst, val, rte_memory_order_seq_cst);
}
@@ -492,11 +492,11 @@ rte_atomic32_cmpset(volatile uint32_t *dst, uint32_t exp, uint32_t src)
* The original value at that location
*/
static inline uint32_t
-rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val);
+rte_atomic32_exchange(volatile RTE_ATOMIC(uint32_t) *dst, uint32_t val);
#ifdef RTE_FORCE_INTRINSICS
static inline uint32_t
-rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val)
+rte_atomic32_exchange(volatile RTE_ATOMIC(uint32_t) *dst, uint32_t val)
{
return rte_atomic_exchange_explicit(dst, val, rte_memory_order_seq_cst);
}
@@ -776,11 +776,11 @@ rte_atomic64_cmpset(volatile uint64_t *dst, uint64_t exp, uint64_t src)
* The original value at that location
*/
static inline uint64_t
-rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val);
+rte_atomic64_exchange(volatile RTE_ATOMIC(uint64_t) *dst, uint64_t val);
#ifdef RTE_FORCE_INTRINSICS
static inline uint64_t
-rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val)
+rte_atomic64_exchange(volatile RTE_ATOMIC(uint64_t) *dst, uint64_t val)
{
return rte_atomic_exchange_explicit(dst, val, rte_memory_order_seq_cst);
}
--
2.30.0
next prev parent reply other threads:[~2023-12-11 7:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-11 7:39 [PATCH 0/2] bugfix and replace on use of " Jie Hai
2023-12-11 7:39 ` Jie Hai [this message]
2023-12-11 18:53 ` [PATCH 1/2] eal: fix constraints on " Tyler Retzlaff
2023-12-15 2:47 ` Jie Hai
2023-12-15 7:17 ` Tyler Retzlaff
2023-12-11 7:39 ` [PATCH 2/2] net/hns3: use " Jie Hai
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=20231211073904.811243-2-haijie1@huawei.com \
--to=haijie1@huawei.com \
--cc=dev@dpdk.org \
--cc=fengchengwen@huawei.com \
--cc=konstantin.v.ananyev@yandex.ru \
--cc=lihuisong@huawei.com \
--cc=liudongdong3@huawei.com \
--cc=mb@smartsharesystems.com \
--cc=roretzla@linux.microsoft.com \
/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).