From patchwork Fri Mar 17 20:19:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125233 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 1363241EC0; Fri, 17 Mar 2023 21:19:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3D94C42FE8; Fri, 17 Mar 2023 21:19:53 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 309F842FD8 for ; Fri, 17 Mar 2023 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 79BAE20C343B; Fri, 17 Mar 2023 13:19:49 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 79BAE20C343B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679084389; bh=TncISP8eKNJJGxUi4IBsWmofhtlNfnIaHVbz1n29JN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mBpguMzHk8nUSvokWCFfJITh++0weVslMEKmx3MLrMDJ0QpgtMbA4j9ne9rDAMYBv tiv2ydtooca1kjeVgSSX1nQm61EefXZVsdYZcluonu/APSrLTW16O6ugXqE9CAmBZG GMgCdK9cHYkEAZiKjtUx2CiSPSD9+sJlWFTPPyU8= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, Ruifeng.Wang@arm.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 1/7] ring: replace rte atomics with GCC builtin atomics Date: Fri, 17 Mar 2023 13:19:42 -0700 Message-Id: <1679084388-19267-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com> References: <1679084388-19267-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- lib/ring/rte_ring_core.h | 1 - lib/ring/rte_ring_generic_pvt.h | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/ring/rte_ring_core.h b/lib/ring/rte_ring_core.h index 82b2370..b9c7860 100644 --- a/lib/ring/rte_ring_core.h +++ b/lib/ring/rte_ring_core.h @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h index 5acb6e5..f9a15b6 100644 --- a/lib/ring/rte_ring_generic_pvt.h +++ b/lib/ring/rte_ring_generic_pvt.h @@ -92,8 +92,9 @@ if (is_sp) r->prod.head = *new_head, success = 1; else - success = rte_atomic32_cmpset(&r->prod.head, - *old_head, *new_head); + success = __atomic_compare_exchange_n(&r->prod.head, + old_head, *new_head, 0, + __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); } while (unlikely(success == 0)); return n; } @@ -162,8 +163,9 @@ rte_smp_rmb(); success = 1; } else { - success = rte_atomic32_cmpset(&r->cons.head, *old_head, - *new_head); + success = __atomic_compare_exchange_n(&r->cons.head, + old_head, *new_head, 0, + __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); } } while (unlikely(success == 0)); return n; From patchwork Fri Mar 17 20:19:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125234 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 80A8B41EC0; Fri, 17 Mar 2023 21:20:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 612B742FF2; Fri, 17 Mar 2023 21:19:54 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 413F242FDE for ; Fri, 17 Mar 2023 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 87BD320C343F; Fri, 17 Mar 2023 13:19:49 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 87BD320C343F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679084389; bh=1TE5yja4j8q/LgBJxCt5ymISIxt758byKjhoFlAVNIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k+AA5HJ5Dxrv7Vgvm0mxrL9NwuGREk3dNYXZCwpJqavHopS84mp0aqFySvxtwIxCp 8LwMECVSHkv75rozHAX8tR+WWT2/TS23K1YsXwYFWaHnqR3JeRIQl+rc8oyjpBtaFK 2772iN8KffAnyAWkR1hJWIrMc3QXRk/x2yRbwiV4= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, Ruifeng.Wang@arm.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 2/7] stack: replace rte atomics with GCC builtin atomics Date: Fri, 17 Mar 2023 13:19:43 -0700 Message-Id: <1679084388-19267-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com> References: <1679084388-19267-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- lib/stack/rte_stack_lf_generic.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/stack/rte_stack_lf_generic.h b/lib/stack/rte_stack_lf_generic.h index 7fa29ce..3ef0f74 100644 --- a/lib/stack/rte_stack_lf_generic.h +++ b/lib/stack/rte_stack_lf_generic.h @@ -26,8 +26,7 @@ * elements. If the mempool is near-empty to the point that this is a * concern, the user should consider increasing the mempool size. */ - return (unsigned int)rte_atomic64_read((rte_atomic64_t *) - &s->stack_lf.used.len); + return __atomic_load_n(&s->stack_lf.used.len, __ATOMIC_SEQ_CST); } static __rte_always_inline void @@ -68,7 +67,7 @@ __ATOMIC_RELAXED); } while (success == 0); - rte_atomic64_add((rte_atomic64_t *)&list->len, num); + __atomic_fetch_add(&list->len, num, __ATOMIC_SEQ_CST); } static __rte_always_inline struct rte_stack_lf_elem * @@ -82,14 +81,14 @@ /* Reserve num elements, if available */ while (1) { - uint64_t len = rte_atomic64_read((rte_atomic64_t *)&list->len); + uint64_t len = __atomic_load_n(&list->len, __ATOMIC_SEQ_CST); /* Does the list contain enough elements? */ if (unlikely(len < num)) return NULL; - if (rte_atomic64_cmpset((volatile uint64_t *)&list->len, - len, len - num)) + if (__atomic_compare_exchange_n(&list->len, &len, len - num, + 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) break; } From patchwork Fri Mar 17 20:19:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125235 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 8A5CE41EC0; Fri, 17 Mar 2023 21:20:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 712C542FFC; Fri, 17 Mar 2023 21:19:55 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 46ABD42FE2 for ; Fri, 17 Mar 2023 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 954702057678; Fri, 17 Mar 2023 13:19:49 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 954702057678 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679084389; bh=DP9UwxdQD76v+o+uTn1Q6EMyCDMuoNb6G15X6hlW1is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bXGWUhuQn5M/MxSMseOvOsr7I8OGNcqScBDQ7krfvN9OJu6RsAm7roIy5IuZfNPAH ukZngYglNXnPeHk+yiiErgpOwE2zo8ePMMRhXYfvbAiMh6Y+ycjXdKcG26wPK5vdFE mm6EQv6ZZKUEq1WyYyx6unPCPHkPJG5b7jpoPYNI= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, Ruifeng.Wang@arm.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 3/7] dma/idxd: replace rte atomics with GCC builtin atomics Date: Fri, 17 Mar 2023 13:19:44 -0700 Message-Id: <1679084388-19267-4-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com> References: <1679084388-19267-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- drivers/dma/idxd/idxd_internal.h | 3 +-- drivers/dma/idxd/idxd_pci.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/dma/idxd/idxd_internal.h b/drivers/dma/idxd/idxd_internal.h index 180a858..53a0c8e 100644 --- a/drivers/dma/idxd/idxd_internal.h +++ b/drivers/dma/idxd/idxd_internal.h @@ -7,7 +7,6 @@ #include #include -#include #include "idxd_hw_defs.h" @@ -34,7 +33,7 @@ struct idxd_pci_common { rte_spinlock_t lk; uint8_t wq_cfg_sz; - rte_atomic16_t ref_count; + int16_t ref_count; volatile struct rte_idxd_bar0 *regs; volatile uint32_t *wq_regs_base; volatile struct rte_idxd_grpcfg *grp_regs; diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c index 781fa02..e869d33 100644 --- a/drivers/dma/idxd/idxd_pci.c +++ b/drivers/dma/idxd/idxd_pci.c @@ -6,7 +6,6 @@ #include #include #include -#include #include "idxd_internal.h" @@ -136,7 +135,8 @@ /* if this is the last WQ on the device, disable the device and free * the PCI struct */ - is_last_wq = rte_atomic16_dec_and_test(&idxd->u.pci->ref_count); + is_last_wq = __atomic_fetch_sub(&idxd->u.pci->ref_count, 1, + __ATOMIC_SEQ_CST) - 1 == 0; if (is_last_wq) { /* disable the device */ err_code = idxd_pci_dev_command(idxd, idxd_disable_dev); @@ -350,7 +350,7 @@ free(idxd.u.pci); return ret; } - rte_atomic16_inc(&idxd.u.pci->ref_count); + __atomic_fetch_add(&idxd.u.pci->ref_count, 1, __ATOMIC_SEQ_CST); } return 0; From patchwork Fri Mar 17 20:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125236 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 725C641EC0; Fri, 17 Mar 2023 21:20:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 72B5C43006; Fri, 17 Mar 2023 21:19:56 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 4E92742FE4 for ; Fri, 17 Mar 2023 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id A1E7A20C56BB; Fri, 17 Mar 2023 13:19:49 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A1E7A20C56BB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679084389; bh=NR3yztk9C0vkNBKSWnqhtKK8SXKNudIaHadtuILXA4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qwepN9ZlCjcPws6z8Fu9AcrYV2FxEbX4Pp6x7Gg0t49kKqUikb0GAd8ArPdK/0aic sEAstJ4brriYtA/E98aG2MTxT/g8xlOZK4lXSYqp/cm1lU7sC/MviGx2JK9MEVMFUg RyHQXf0AdTx1X2fNncoA574a0G71CtfkIT75z5+s= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, Ruifeng.Wang@arm.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 4/7] net/ice: replace rte atomics with GCC builtin atomics Date: Fri, 17 Mar 2023 13:19:45 -0700 Message-Id: <1679084388-19267-5-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com> References: <1679084388-19267-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- drivers/net/ice/ice_dcf.c | 1 - drivers/net/ice/ice_dcf_ethdev.c | 1 - drivers/net/ice/ice_ethdev.c | 10 ++++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c index 1c3d22a..80d2cbd 100644 --- a/drivers/net/ice/ice_dcf.c +++ b/drivers/net/ice/ice_dcf.c @@ -14,7 +14,6 @@ #include #include -#include #include #include #include diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c index dcbf2af..13ff245 100644 --- a/drivers/net/ice/ice_dcf_ethdev.c +++ b/drivers/net/ice/ice_dcf_ethdev.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 9a88cf9..bdf4569 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3927,8 +3927,9 @@ static int ice_init_rss(struct ice_pf *pf) struct rte_eth_link *dst = link; struct rte_eth_link *src = &dev->data->dev_link; - if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, - *(uint64_t *)src) == 0) + if (!__atomic_compare_exchange_n((uint64_t *)dst, + (uint64_t *)dst, *(uint64_t *)src, 0, + __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) return -1; return 0; @@ -3941,8 +3942,9 @@ static int ice_init_rss(struct ice_pf *pf) struct rte_eth_link *dst = &dev->data->dev_link; struct rte_eth_link *src = link; - if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, - *(uint64_t *)src) == 0) + if (!__atomic_compare_exchange_n((uint64_t *)dst, + (uint64_t *)dst, *(uint64_t *)src, 0, + __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST)) return -1; return 0; From patchwork Fri Mar 17 20:19:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125239 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 5393B41EC0; Fri, 17 Mar 2023 21:20:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B17154301A; Fri, 17 Mar 2023 21:19:59 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id E45AC42FD8 for ; Fri, 17 Mar 2023 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id AE23D20C5A48; Fri, 17 Mar 2023 13:19:49 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com AE23D20C5A48 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679084389; bh=R4yznfYiujf38U5JXaUxhGKkz4BDYoPU5GS3yffscAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GSlARyCI+7XJsOWCGMSRRBOM/KFZrG6KR2RiVihSq7lCwW/sukW2tPUhxoYekdj1y QPXD4xk4UZail07Cszaw2kDZl2tPFjOU1tBa3EhKzQYUnafzJiWBXPLH+FoClXa51w sobh3c6LgZnYV4s97aJMC1FphUwOcLh4kXwZn7js= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, Ruifeng.Wang@arm.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 5/7] net/ixgbe: replace rte atomics with GCC builtin atomics Date: Fri, 17 Mar 2023 13:19:46 -0700 Message-Id: <1679084388-19267-6-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com> References: <1679084388-19267-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- drivers/net/ixgbe/ixgbe_bypass.c | 1 - drivers/net/ixgbe/ixgbe_ethdev.c | 12 ++++++------ drivers/net/ixgbe/ixgbe_ethdev.h | 3 ++- drivers/net/ixgbe/ixgbe_flow.c | 1 - drivers/net/ixgbe/ixgbe_rxtx.c | 1 - 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_bypass.c b/drivers/net/ixgbe/ixgbe_bypass.c index 94f34a2..f615d18 100644 --- a/drivers/net/ixgbe/ixgbe_bypass.c +++ b/drivers/net/ixgbe/ixgbe_bypass.c @@ -3,7 +3,6 @@ */ #include -#include #include #include "ixgbe_ethdev.h" #include "ixgbe_bypass_api.h" diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 88118bc..3efb5ff 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1127,7 +1127,7 @@ struct rte_ixgbe_xstats_name_off { return 0; } - rte_atomic32_clear(&ad->link_thread_running); + __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST); ixgbe_parse_devargs(eth_dev->data->dev_private, pci_dev->device.devargs); rte_eth_copy_pci_info(eth_dev, pci_dev); @@ -1625,7 +1625,7 @@ static int ixgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev) return 0; } - rte_atomic32_clear(&ad->link_thread_running); + __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST); ixgbevf_parse_devargs(eth_dev->data->dev_private, pci_dev->device.devargs); @@ -4186,7 +4186,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, struct ixgbe_adapter *ad = dev->data->dev_private; uint32_t timeout = timeout_ms ? timeout_ms : WARNING_TIMEOUT; - while (rte_atomic32_read(&ad->link_thread_running)) { + while (__atomic_load_n(&ad->link_thread_running, __ATOMIC_SEQ_CST)) { msec_delay(1); timeout--; @@ -4222,7 +4222,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, ixgbe_setup_link(hw, speed, true); intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG; - rte_atomic32_clear(&ad->link_thread_running); + __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST); return NULL; } @@ -4317,7 +4317,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, if (link_up == 0) { if (ixgbe_get_media_type(hw) == ixgbe_media_type_fiber) { ixgbe_dev_wait_setup_link_complete(dev, 0); - if (rte_atomic32_test_and_set(&ad->link_thread_running)) { + if (__atomic_test_and_set(&ad->link_thread_running, __ATOMIC_SEQ_CST)) { /* To avoid race condition between threads, set * the IXGBE_FLAG_NEED_LINK_CONFIG flag only * when there is no link thread running. @@ -4330,7 +4330,7 @@ static int ixgbevf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev, dev) < 0) { PMD_DRV_LOG(ERR, "Create link thread failed!"); - rte_atomic32_clear(&ad->link_thread_running); + __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST); } } else { PMD_DRV_LOG(ERR, diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h index 48290af..2ca6998 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -6,6 +6,7 @@ #define _IXGBE_ETHDEV_H_ #include +#include #include #include "base/ixgbe_type.h" @@ -510,7 +511,7 @@ struct ixgbe_adapter { */ uint8_t pflink_fullchk; uint8_t mac_ctrl_frame_fwd; - rte_atomic32_t link_thread_running; + bool link_thread_running; pthread_t link_thread_tid; }; diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c index eac81ee..687341c 100644 --- a/drivers/net/ixgbe/ixgbe_flow.c +++ b/drivers/net/ixgbe/ixgbe_flow.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index c9d6ca9..8d7251d 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include From patchwork Fri Mar 17 20:19:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125237 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 97DD041EC0; Fri, 17 Mar 2023 21:20:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 869A54300F; Fri, 17 Mar 2023 21:19:57 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id E0D2842F98 for ; Fri, 17 Mar 2023 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id BA69020C5A4D; Fri, 17 Mar 2023 13:19:49 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BA69020C5A4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679084389; bh=uu/mdBGwLq9q35fcLDOdOw3NiiJXuPPyGPGqvPICEOw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YtKdI7rO6hDtFi9FVG9pch25Ym9IVdH3++Gzs0pd9kcm2zB6s5imlbchrM3dqv6gs CEuB1pj2VaMMf6zH9SSqn8C3o95ilzoZAT1L8AG0Rj4QftG0n/g2iNMCFGi+cdFWQW y3sOMJrawV65yr75HgJ04DImavaIM9MQoBG7QX3Y= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, Ruifeng.Wang@arm.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 6/7] net/null: replace rte atomics with GCC builtin atomics Date: Fri, 17 Mar 2023 13:19:47 -0700 Message-Id: <1679084388-19267-7-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com> References: <1679084388-19267-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- drivers/net/null/rte_eth_null.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index 47d9554..195c3bd 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -37,8 +37,8 @@ struct null_queue { struct rte_mempool *mb_pool; struct rte_mbuf *dummy_packet; - rte_atomic64_t rx_pkts; - rte_atomic64_t tx_pkts; + int64_t rx_pkts; + int64_t tx_pkts; }; struct pmd_options { @@ -101,7 +101,7 @@ struct pmd_internals { bufs[i]->port = h->internals->port_id; } - rte_atomic64_add(&(h->rx_pkts), i); + __atomic_fetch_add(&h->rx_pkts, i, __ATOMIC_SEQ_CST); return i; } @@ -128,7 +128,7 @@ struct pmd_internals { bufs[i]->port = h->internals->port_id; } - rte_atomic64_add(&(h->rx_pkts), i); + __atomic_fetch_add(&h->rx_pkts, i, __ATOMIC_SEQ_CST); return i; } @@ -152,7 +152,7 @@ struct pmd_internals { for (i = 0; i < nb_bufs; i++) rte_pktmbuf_free(bufs[i]); - rte_atomic64_add(&(h->tx_pkts), i); + __atomic_fetch_add(&h->tx_pkts, i, __ATOMIC_SEQ_CST); return i; } @@ -174,7 +174,7 @@ struct pmd_internals { rte_pktmbuf_free(bufs[i]); } - rte_atomic64_add(&(h->tx_pkts), i); + __atomic_fetch_add(&h->tx_pkts, i, __ATOMIC_SEQ_CST); return i; } @@ -317,7 +317,7 @@ struct pmd_internals { RTE_DIM(internal->rx_null_queues))); for (i = 0; i < num_stats; i++) { igb_stats->q_ipackets[i] = - internal->rx_null_queues[i].rx_pkts.cnt; + internal->rx_null_queues[i].rx_pkts; rx_total += igb_stats->q_ipackets[i]; } @@ -326,7 +326,7 @@ struct pmd_internals { RTE_DIM(internal->tx_null_queues))); for (i = 0; i < num_stats; i++) { igb_stats->q_opackets[i] = - internal->tx_null_queues[i].tx_pkts.cnt; + internal->tx_null_queues[i].tx_pkts; tx_total += igb_stats->q_opackets[i]; } @@ -347,9 +347,9 @@ struct pmd_internals { internal = dev->data->dev_private; for (i = 0; i < RTE_DIM(internal->rx_null_queues); i++) - internal->rx_null_queues[i].rx_pkts.cnt = 0; + internal->rx_null_queues[i].rx_pkts = 0; for (i = 0; i < RTE_DIM(internal->tx_null_queues); i++) - internal->tx_null_queues[i].tx_pkts.cnt = 0; + internal->tx_null_queues[i].tx_pkts = 0; return 0; } From patchwork Fri Mar 17 20:19:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 125238 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 53F9141EC0; Fri, 17 Mar 2023 21:20:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ADDC443014; Fri, 17 Mar 2023 21:19:58 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 01EA542FDE for ; Fri, 17 Mar 2023 21:19:51 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id C67E22057BE5; Fri, 17 Mar 2023 13:19:49 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com C67E22057BE5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679084389; bh=qZSyEXfpTVJGPVhxnf5mnntfDFNG2ZYJQqEnDfm/rlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HzkK0Zb/93o8fN/GauOjpHWdrXYC6HHcW9uI5byrmALjjgm6H2FWMPVlwK+ieqGFa Dbbmfy7i/LC3JA8EDEVKMputx59CBN/L0XXdQ31c0EFVl4PExNVhCYLtBH5Vtk9s99 tQpWTwZFGpwljPUeP3TUVqK13bIW4KR+eJCpxVfo= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, Ruifeng.Wang@arm.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH 7/7] net/ring: replace rte atomics with GCC builtin atomics Date: Fri, 17 Mar 2023 13:19:48 -0700 Message-Id: <1679084388-19267-8-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com> References: <1679084388-19267-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- 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..15d4a3d 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; + int64_t rx_pkts; + int64_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_SEQ_CST); 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_SEQ_CST); 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; }