From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 4548143EB4;
Sat, 20 Apr 2024 01:08:39 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id CDF5A40EE7;
Sat, 20 Apr 2024 01:07:12 +0200 (CEST)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 1670E40A7F
for <dev@dpdk.org>; Sat, 20 Apr 2024 01:06:52 +0200 (CEST)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id 21D0120FE658; Fri, 19 Apr 2024 16:06:48 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 21D0120FE658
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1713568009;
bh=evovStAWa47l/uRXKLNqrxg0oIg5/czUKEfgdUBuCg4=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=M1vc3UTqDGa7QkHatUStoEVReMKtspy4ONgvAy6jAUEbZ2b28F4utlOkgN+3aToob
vuVggLBNYUPjM1nvF5BTf0i+OH9ArYqs6JPHQrlM6nvelTufmZINsXMgjzYVjrs1Fl
5BYiYZYKDjLHjJZR+dsaIduFr65R2DD5UBjUi8tY=
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>,
=?UTF-8?q?Morten=20Br=C3=B8rup?= <mb@smartsharesystems.com>,
Abdullah Sevincer <abdullah.sevincer@intel.com>,
Ajit Khaparde <ajit.khaparde@broadcom.com>,
Alok Prasad <palok@marvell.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
Anoob Joseph <anoobj@marvell.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Byron Marohn <byron.marohn@intel.com>, Chenbo Xia <chenbox@nvidia.com>,
Chengwen Feng <fengchengwen@huawei.com>,
Ciara Loftus <ciara.loftus@intel.com>, Ciara Power <ciara.power@intel.com>,
Dariusz Sosnowski <dsosnowski@nvidia.com>,
David Hunt <david.hunt@intel.com>,
Devendra Singh Rawat <dsinghrawat@marvell.com>,
Erik Gabriel Carrillo <erik.g.carrillo@intel.com>,
Guoyang Zhou <zhouguoyang@huawei.com>, Harman Kalra <hkalra@marvell.com>,
Harry van Haaren <harry.van.haaren@intel.com>,
Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,
Jakub Grajciar <jgrajcia@cisco.com>, Jerin Jacob <jerinj@marvell.com>,
Jeroen de Borst <jeroendb@google.com>, Jian Wang <jianwang@trustnetic.com>,
Jiawen Wu <jiawenwu@trustnetic.com>, Jie Hai <haijie1@huawei.com>,
Jingjing Wu <jingjing.wu@intel.com>,
Joshua Washington <joshwash@google.com>, Joyce Kong <joyce.kong@arm.com>,
Junfeng Guo <junfeng.guo@intel.com>, Kevin Laatz <kevin.laatz@intel.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
Liang Ma <liangma@liangbit.com>, Long Li <longli@microsoft.com>,
Maciej Czekaj <mczekaj@marvell.com>, Matan Azrad <matan@nvidia.com>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
Nicolas Chautru <nicolas.chautru@intel.com>, Ori Kam <orika@nvidia.com>,
Pavan Nikhilesh <pbhagavatula@marvell.com>,
Peter Mccarthy <peter.mccarthy@intel.com>,
Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,
Reshma Pattan <reshma.pattan@intel.com>, Rosen Xu <rosen.xu@intel.com>,
Ruifeng Wang <ruifeng.wang@arm.com>, Rushil Gupta <rushilg@google.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Sivaprasad Tummala <sivaprasad.tummala@amd.com>,
Somnath Kotur <somnath.kotur@broadcom.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Suanming Mou <suanmingm@nvidia.com>, Sunil Kumar Kori <skori@marvell.com>,
Sunil Uttarwar <sunilprakashrao.uttarwar@amd.com>,
Tetsuya Mukawa <mtetsuyah@gmail.com>,
Vamsi Attunuru <vattunuru@marvell.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>,
Xiaoyun Wang <cloud.wangxiaoyun@huawei.com>,
Yipeng Wang <yipeng1.wang@intel.com>,
Yisen Zhuang <yisen.zhuang@huawei.com>,
Yuying Zhang <Yuying.Zhang@intel.com>,
Yuying Zhang <yuying.zhang@intel.com>,
Ziyang Xuan <xuanziyang2@huawei.com>,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH v4 14/45] net/memif: use rte stdatomic API
Date: Fri, 19 Apr 2024 16:06:12 -0700
Message-Id: <1713568003-30453-15-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1713568003-30453-1-git-send-email-roretzla@linux.microsoft.com>
References: <1710967892-7046-1-git-send-email-roretzla@linux.microsoft.com>
<1713568003-30453-1-git-send-email-roretzla@linux.microsoft.com>
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Replace the use of gcc builtin __atomic_xxx intrinsics with
corresponding rte_atomic_xxx optional rte stdatomic API.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/memif/memif.h | 4 ++--
drivers/net/memif/rte_eth_memif.c | 50 +++++++++++++++++++--------------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/drivers/net/memif/memif.h b/drivers/net/memif/memif.h
index f5a4693..3f5b407 100644
--- a/drivers/net/memif/memif.h
+++ b/drivers/net/memif/memif.h
@@ -169,9 +169,9 @@ typedef struct __rte_packed __rte_aligned(128)
uint32_t cookie; /**< MEMIF_COOKIE */
uint16_t flags; /**< flags */
#define MEMIF_RING_FLAG_MASK_INT 1 /**< disable interrupt mode */
- uint16_t head; /**< pointer to ring buffer head */
+ RTE_ATOMIC(uint16_t) head; /**< pointer to ring buffer head */
MEMIF_CACHELINE_ALIGN_MARK(cacheline1);
- uint16_t tail; /**< pointer to ring buffer tail */
+ RTE_ATOMIC(uint16_t) tail; /**< pointer to ring buffer tail */
MEMIF_CACHELINE_ALIGN_MARK(cacheline2);
memif_desc_t desc[0]; /**< buffer descriptors */
} memif_ring_t;
diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c
index 18377d9..16da22b 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -262,7 +262,7 @@ struct mp_region_msg {
* threads, so using load-acquire pairs with store-release
* in function eth_memif_rx for C2S queues.
*/
- cur_tail = __atomic_load_n(&ring->tail, __ATOMIC_ACQUIRE);
+ cur_tail = rte_atomic_load_explicit(&ring->tail, rte_memory_order_acquire);
while (mq->last_tail != cur_tail) {
RTE_MBUF_PREFETCH_TO_FREE(mq->buffers[(mq->last_tail + 1) & mask]);
rte_pktmbuf_free_seg(mq->buffers[mq->last_tail & mask]);
@@ -334,10 +334,10 @@ struct mp_region_msg {
if (type == MEMIF_RING_C2S) {
cur_slot = mq->last_head;
- last_slot = __atomic_load_n(&ring->head, __ATOMIC_ACQUIRE);
+ last_slot = rte_atomic_load_explicit(&ring->head, rte_memory_order_acquire);
} else {
cur_slot = mq->last_tail;
- last_slot = __atomic_load_n(&ring->tail, __ATOMIC_ACQUIRE);
+ last_slot = rte_atomic_load_explicit(&ring->tail, rte_memory_order_acquire);
}
if (cur_slot == last_slot)
@@ -473,7 +473,7 @@ struct mp_region_msg {
no_free_bufs:
if (type == MEMIF_RING_C2S) {
- __atomic_store_n(&ring->tail, cur_slot, __ATOMIC_RELEASE);
+ rte_atomic_store_explicit(&ring->tail, cur_slot, rte_memory_order_release);
mq->last_head = cur_slot;
} else {
mq->last_tail = cur_slot;
@@ -485,7 +485,7 @@ struct mp_region_msg {
* is called in the context of receiver thread. The loads in
* the receiver do not need to synchronize with its own stores.
*/
- head = __atomic_load_n(&ring->head, __ATOMIC_RELAXED);
+ head = rte_atomic_load_explicit(&ring->head, rte_memory_order_relaxed);
n_slots = ring_size - head + mq->last_tail;
while (n_slots--) {
@@ -493,7 +493,7 @@ struct mp_region_msg {
d0 = &ring->desc[s0];
d0->length = pmd->run.pkt_buffer_size;
}
- __atomic_store_n(&ring->head, head, __ATOMIC_RELEASE);
+ rte_atomic_store_explicit(&ring->head, head, rte_memory_order_release);
}
mq->n_pkts += n_rx_pkts;
@@ -541,7 +541,7 @@ struct mp_region_msg {
* threads, so using load-acquire pairs with store-release
* to synchronize it between threads.
*/
- last_slot = __atomic_load_n(&ring->tail, __ATOMIC_ACQUIRE);
+ last_slot = rte_atomic_load_explicit(&ring->tail, rte_memory_order_acquire);
if (cur_slot == last_slot)
goto refill;
n_slots = last_slot - cur_slot;
@@ -591,7 +591,7 @@ struct mp_region_msg {
* is called in the context of receiver thread. The loads in
* the receiver do not need to synchronize with its own stores.
*/
- head = __atomic_load_n(&ring->head, __ATOMIC_RELAXED);
+ head = rte_atomic_load_explicit(&ring->head, rte_memory_order_relaxed);
n_slots = ring_size - head + mq->last_tail;
if (n_slots < 32)
@@ -620,7 +620,7 @@ struct mp_region_msg {
* threads, so using store-release pairs with load-acquire
* in function eth_memif_tx.
*/
- __atomic_store_n(&ring->head, head, __ATOMIC_RELEASE);
+ rte_atomic_store_explicit(&ring->head, head, rte_memory_order_release);
mq->n_pkts += n_rx_pkts;
@@ -668,9 +668,9 @@ struct mp_region_msg {
* its own stores. Hence, the following load can be a
* relaxed load.
*/
- slot = __atomic_load_n(&ring->head, __ATOMIC_RELAXED);
+ slot = rte_atomic_load_explicit(&ring->head, rte_memory_order_relaxed);
n_free = ring_size - slot +
- __atomic_load_n(&ring->tail, __ATOMIC_ACQUIRE);
+ rte_atomic_load_explicit(&ring->tail, rte_memory_order_acquire);
} else {
/* For S2C queues ring->tail is updated by the sender and
* this function is called in the context of sending thread.
@@ -678,8 +678,8 @@ struct mp_region_msg {
* its own stores. Hence, the following load can be a
* relaxed load.
*/
- slot = __atomic_load_n(&ring->tail, __ATOMIC_RELAXED);
- n_free = __atomic_load_n(&ring->head, __ATOMIC_ACQUIRE) - slot;
+ slot = rte_atomic_load_explicit(&ring->tail, rte_memory_order_relaxed);
+ n_free = rte_atomic_load_explicit(&ring->head, rte_memory_order_acquire) - slot;
}
uint16_t i;
@@ -792,9 +792,9 @@ struct mp_region_msg {
no_free_slots:
if (type == MEMIF_RING_C2S)
- __atomic_store_n(&ring->head, slot, __ATOMIC_RELEASE);
+ rte_atomic_store_explicit(&ring->head, slot, rte_memory_order_release);
else
- __atomic_store_n(&ring->tail, slot, __ATOMIC_RELEASE);
+ rte_atomic_store_explicit(&ring->tail, slot, rte_memory_order_release);
if (((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) &&
(rte_intr_fd_get(mq->intr_handle) >= 0)) {
@@ -882,7 +882,7 @@ struct mp_region_msg {
* its own stores. Hence, the following load can be a
* relaxed load.
*/
- slot = __atomic_load_n(&ring->head, __ATOMIC_RELAXED);
+ slot = rte_atomic_load_explicit(&ring->head, rte_memory_order_relaxed);
n_free = ring_size - slot + mq->last_tail;
int used_slots;
@@ -942,7 +942,7 @@ struct mp_region_msg {
* threads, so using store-release pairs with load-acquire
* in function eth_memif_rx for C2S rings.
*/
- __atomic_store_n(&ring->head, slot, __ATOMIC_RELEASE);
+ rte_atomic_store_explicit(&ring->head, slot, rte_memory_order_release);
/* Send interrupt, if enabled. */
if ((ring->flags & MEMIF_RING_FLAG_MASK_INT) == 0) {
@@ -1155,8 +1155,8 @@ struct mp_region_msg {
for (i = 0; i < pmd->run.num_c2s_rings; i++) {
ring = memif_get_ring(pmd, proc_private, MEMIF_RING_C2S, i);
- __atomic_store_n(&ring->head, 0, __ATOMIC_RELAXED);
- __atomic_store_n(&ring->tail, 0, __ATOMIC_RELAXED);
+ rte_atomic_store_explicit(&ring->head, 0, rte_memory_order_relaxed);
+ rte_atomic_store_explicit(&ring->tail, 0, rte_memory_order_relaxed);
ring->cookie = MEMIF_COOKIE;
ring->flags = 0;
@@ -1175,8 +1175,8 @@ struct mp_region_msg {
for (i = 0; i < pmd->run.num_s2c_rings; i++) {
ring = memif_get_ring(pmd, proc_private, MEMIF_RING_S2C, i);
- __atomic_store_n(&ring->head, 0, __ATOMIC_RELAXED);
- __atomic_store_n(&ring->tail, 0, __ATOMIC_RELAXED);
+ rte_atomic_store_explicit(&ring->head, 0, rte_memory_order_relaxed);
+ rte_atomic_store_explicit(&ring->tail, 0, rte_memory_order_relaxed);
ring->cookie = MEMIF_COOKIE;
ring->flags = 0;
@@ -1314,8 +1314,8 @@ struct mp_region_msg {
MIF_LOG(ERR, "Wrong ring");
return -1;
}
- __atomic_store_n(&ring->head, 0, __ATOMIC_RELAXED);
- __atomic_store_n(&ring->tail, 0, __ATOMIC_RELAXED);
+ rte_atomic_store_explicit(&ring->head, 0, rte_memory_order_relaxed);
+ rte_atomic_store_explicit(&ring->tail, 0, rte_memory_order_relaxed);
mq->last_head = 0;
mq->last_tail = 0;
/* enable polling mode */
@@ -1330,8 +1330,8 @@ struct mp_region_msg {
MIF_LOG(ERR, "Wrong ring");
return -1;
}
- __atomic_store_n(&ring->head, 0, __ATOMIC_RELAXED);
- __atomic_store_n(&ring->tail, 0, __ATOMIC_RELAXED);
+ rte_atomic_store_explicit(&ring->head, 0, rte_memory_order_relaxed);
+ rte_atomic_store_explicit(&ring->tail, 0, rte_memory_order_relaxed);
mq->last_head = 0;
mq->last_tail = 0;
/* enable polling mode */
--
1.8.3.1