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 AB56642C44;
Tue, 6 Jun 2023 23:46:27 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id A90E442D50;
Tue, 6 Jun 2023 23:45:57 +0200 (CEST)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 8E05A4067B
for <dev@dpdk.org>; Tue, 6 Jun 2023 23:45:50 +0200 (CEST)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id 29D4D20BE4A1; Tue, 6 Jun 2023 14:45:48 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 29D4D20BE4A1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1686087949;
bh=Lxhemo2pH3rc7mE4mkJx0FAz1wuSiXo89XvTSikhKDw=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=LpakH0vGokW26urweCdxHZaZH1HpsSQfNsLabMEAo872EtIVHRpv9GY0TII1HnkPc
/5HZQsdmwt1a2uVMubhAaSkf7WYOvX5lhmbG4DNK1YrDXz81jP9vXSrLoCNQG6lqZE
DBs5wuYnexCfLGyDQ7YSPDYscHJGSIQSJDZmGLOQ=
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org,
david.marchand@redhat.com
Cc: Olivier Matz <olivier.matz@6wind.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Kevin Laatz <kevin.laatz@intel.com>, Qiming Yang <qiming.yang@intel.com>,
Qi Zhang <qi.z.zhang@intel.com>, Wenjun Wu <wenjun1.wu@intel.com>,
Tetsuya Mukawa <mtetsuyah@gmail.com>, Honnappa.Nagarahalli@arm.com,
thomas@monjalon.net, Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH v5 6/6] net/ring: replace rte atomics with GCC builtin atomics
Date: Tue, 6 Jun 2023 14:45:47 -0700
Message-Id: <1686087947-15471-7-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1686087947-15471-1-git-send-email-roretzla@linux.microsoft.com>
References: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com>
<1686087947-15471-1-git-send-email-roretzla@linux.microsoft.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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 rte_atomic.h types and functions, instead use GCC
supplied C++11 memory model builtins.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/ring/rte_eth_ring.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index e8bc9b6..c43dcce 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -44,8 +44,8 @@ enum dev_action {
struct ring_queue {
struct rte_ring *rng;
- rte_atomic64_t rx_pkts;
- rte_atomic64_t tx_pkts;
+ uint64_t rx_pkts;
+ uint64_t tx_pkts;
};
struct pmd_internals {
@@ -80,9 +80,9 @@ struct pmd_internals {
const uint16_t nb_rx = (uint16_t)rte_ring_dequeue_burst(r->rng,
ptrs, nb_bufs, NULL);
if (r->rng->flags & RING_F_SC_DEQ)
- r->rx_pkts.cnt += nb_rx;
+ r->rx_pkts += nb_rx;
else
- rte_atomic64_add(&(r->rx_pkts), nb_rx);
+ __atomic_fetch_add(&r->rx_pkts, nb_rx, __ATOMIC_RELAXED);
return nb_rx;
}
@@ -94,9 +94,9 @@ struct pmd_internals {
const uint16_t nb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng,
ptrs, nb_bufs, NULL);
if (r->rng->flags & RING_F_SP_ENQ)
- r->tx_pkts.cnt += nb_tx;
+ r->tx_pkts += nb_tx;
else
- rte_atomic64_add(&(r->tx_pkts), nb_tx);
+ __atomic_fetch_add(&r->tx_pkts, nb_tx, __ATOMIC_RELAXED);
return nb_tx;
}
@@ -184,13 +184,13 @@ struct pmd_internals {
for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&
i < dev->data->nb_rx_queues; i++) {
- stats->q_ipackets[i] = internal->rx_ring_queues[i].rx_pkts.cnt;
+ stats->q_ipackets[i] = internal->rx_ring_queues[i].rx_pkts;
rx_total += stats->q_ipackets[i];
}
for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&
i < dev->data->nb_tx_queues; i++) {
- stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts.cnt;
+ stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts;
tx_total += stats->q_opackets[i];
}
@@ -207,9 +207,9 @@ struct pmd_internals {
struct pmd_internals *internal = dev->data->dev_private;
for (i = 0; i < dev->data->nb_rx_queues; i++)
- internal->rx_ring_queues[i].rx_pkts.cnt = 0;
+ internal->rx_ring_queues[i].rx_pkts = 0;
for (i = 0; i < dev->data->nb_tx_queues; i++)
- internal->tx_ring_queues[i].tx_pkts.cnt = 0;
+ internal->tx_ring_queues[i].tx_pkts = 0;
return 0;
}
--
1.8.3.1