From: Daniel Gregory <daniel.gregory@bytedance.com>
To: Ruifeng Wang <ruifeng.wang@arm.com>
Cc: dev@dpdk.org, Punit Agrawal <punit.agrawal@bytedance.com>,
Liang Ma <liangma@bytedance.com>,
Daniel Gregory <daniel.gregory@bytedance.com>,
feifei.wang2@arm.com
Subject: [PATCH v2] eal/arm: replace RTE_BUILD_BUG on non-constant
Date: Fri, 3 May 2024 19:27:30 +0100 [thread overview]
Message-ID: <20240503182730.31693-1-daniel.gregory@bytedance.com> (raw)
In-Reply-To: <20240502142116.63760-1-daniel.gregory@bytedance.com>
The ARM implementation of rte_pause uses RTE_BUILD_BUG_ON to check
memorder, which is not constant. This causes compile errors when it is
enabled with RTE_ARM_USE_WFE. eg.
../lib/eal/arm/include/rte_pause_64.h: In function ‘rte_wait_until_equal_16’:
../lib/eal/include/rte_common.h:530:56: error: expression in static assertion is not constant
530 | #define RTE_BUILD_BUG_ON(condition) do { static_assert(!(condition), #condition); } while (0)
| ^~~~~~~~~~~~
../lib/eal/arm/include/rte_pause_64.h:156:9: note: in expansion of macro ‘RTE_BUILD_BUG_ON’
156 | RTE_BUILD_BUG_ON(memorder != rte_memory_order_acquire &&
| ^~~~~~~~~~~~~~~~
Fix the compile errors by replacing the check with an assert, like in
the generic implementation (lib/eal/include/generic/rte_pause.h).
Fixes: 875f350924b8 ("eal: add a new helper for wait until scheme")
Signed-off-by: Daniel Gregory <daniel.gregory@bytedance.com>
---
Cc: feifei.wang2@arm.com
---
lib/eal/arm/include/rte_pause_64.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/eal/arm/include/rte_pause_64.h b/lib/eal/arm/include/rte_pause_64.h
index 5cb8b59056..852660091a 100644
--- a/lib/eal/arm/include/rte_pause_64.h
+++ b/lib/eal/arm/include/rte_pause_64.h
@@ -10,6 +10,8 @@
extern "C" {
#endif
+#include <assert.h>
+
#include <rte_common.h>
#ifdef RTE_ARM_USE_WFE
@@ -153,7 +155,7 @@ rte_wait_until_equal_16(volatile uint16_t *addr, uint16_t expected,
{
uint16_t value;
- RTE_BUILD_BUG_ON(memorder != rte_memory_order_acquire &&
+ assert(memorder != rte_memory_order_acquire &&
memorder != rte_memory_order_relaxed);
__RTE_ARM_LOAD_EXC_16(addr, value, memorder)
@@ -172,7 +174,7 @@ rte_wait_until_equal_32(volatile uint32_t *addr, uint32_t expected,
{
uint32_t value;
- RTE_BUILD_BUG_ON(memorder != rte_memory_order_acquire &&
+ assert(memorder != rte_memory_order_acquire &&
memorder != rte_memory_order_relaxed);
__RTE_ARM_LOAD_EXC_32(addr, value, memorder)
@@ -191,7 +193,7 @@ rte_wait_until_equal_64(volatile uint64_t *addr, uint64_t expected,
{
uint64_t value;
- RTE_BUILD_BUG_ON(memorder != rte_memory_order_acquire &&
+ assert(memorder != rte_memory_order_acquire &&
memorder != rte_memory_order_relaxed);
__RTE_ARM_LOAD_EXC_64(addr, value, memorder)
--
2.39.2
next prev parent reply other threads:[~2024-05-03 18:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 14:21 [PATCH] " Daniel Gregory
2024-05-02 16:20 ` Stephen Hemminger
2024-05-02 17:44 ` Daniel Gregory
2024-05-02 18:27 ` Stephen Hemminger
2024-05-02 21:48 ` Stephen Hemminger
2024-05-03 9:46 ` Daniel Gregory
2024-05-04 0:56 ` Stephen Hemminger
2024-05-09 11:02 ` Daniel Gregory
2024-05-03 13:32 ` David Marchand
2024-05-03 14:21 ` Daniel Gregory
2024-05-03 18:27 ` Daniel Gregory [this message]
2024-05-03 18:30 ` [PATCH v2] " Daniel Gregory
2024-05-04 0:59 ` Stephen Hemminger
2024-05-06 9:30 ` Ruifeng Wang
2024-05-11 17:00 ` Wathsala Wathawana Vithanage
2024-05-04 1:02 ` [PATCH] " Stephen Hemminger
2024-05-09 11:11 ` Daniel Gregory
2024-05-09 16:47 ` Tyler Retzlaff
2024-05-11 16:48 ` Wathsala Wathawana Vithanage
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=20240503182730.31693-1-daniel.gregory@bytedance.com \
--to=daniel.gregory@bytedance.com \
--cc=dev@dpdk.org \
--cc=feifei.wang2@arm.com \
--cc=liangma@bytedance.com \
--cc=punit.agrawal@bytedance.com \
--cc=ruifeng.wang@arm.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).