From patchwork Mon Dec 11 07:39:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Hai X-Patchwork-Id: 135005 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 67D3D436C6; Mon, 11 Dec 2023 08:42:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2282540DF5; Mon, 11 Dec 2023 08:42:51 +0100 (CET) Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by mails.dpdk.org (Postfix) with ESMTP id D54B340041 for ; Mon, 11 Dec 2023 08:42:48 +0100 (CET) Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4SpYbS1QQyz29fpJ; Mon, 11 Dec 2023 15:41:40 +0800 (CST) Received: from kwepemd100004.china.huawei.com (unknown [7.221.188.31]) by mail.maildlp.com (Postfix) with ESMTPS id C96621A016F; Mon, 11 Dec 2023 15:42:45 +0800 (CST) Received: from localhost.localdomain (10.67.165.2) by kwepemd100004.china.huawei.com (7.221.188.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.28; Mon, 11 Dec 2023 15:42:45 +0800 From: Jie Hai To: , =?utf-8?q?Morten_Br=C3=B8rup?= , Tyler Retzlaff , Konstantin Ananyev CC: , , , Subject: [PATCH 1/2] eal: fix constraints on stdatomic API Date: Mon, 11 Dec 2023 15:39:03 +0800 Message-ID: <20231211073904.811243-2-haijie1@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20231211073904.811243-1-haijie1@huawei.com> References: <20231211073904.811243-1-haijie1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemd100004.china.huawei.com (7.221.188.31) X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 --- 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); }