From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8B0014280D; Thu, 23 Mar 2023 23:35:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3A6B942D0E; Thu, 23 Mar 2023 23:34:50 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 4CAF540689 for ; Thu, 23 Mar 2023 23:34:44 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 19F4120E99CB; Thu, 23 Mar 2023 15:34:42 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 19F4120E99CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1679610883; bh=8sFZdnAp9Cch9BFmthu2aOK0kRrABoXYXDzHTiURWkI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SUSVDwVCo7ls+lL7iqxuXbDqKIwldA02jjvCx0qrX95E4BQxC8Xhxsw1dp1imeu3J LauhWtoofcBcu+feP9faPx2aWzKtLOFfJ23myUCAtSln4OAX3k7326BBXcsw2S/xWZ 5Zj538NRFRdURBnZuuaGn80Yv+c/RE0qxsyXHDgc= From: Tyler Retzlaff To: dev@dpdk.org Cc: Honnappa.Nagarahalli@arm.com, Ruifeng.Wang@arm.com, thomas@monjalon.net, stephen@networkplumber.org, mb@smartsharesystems.com, Tyler Retzlaff Subject: [PATCH v2 5/7] net/ixgbe: replace rte atomics with GCC builtin atomics Date: Thu, 23 Mar 2023 15:34:39 -0700 Message-Id: <1679610881-25997-6-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679610881-25997-1-git-send-email-roretzla@linux.microsoft.com> References: <1679084388-19267-1-git-send-email-roretzla@linux.microsoft.com> <1679610881-25997-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 | 18 ++++++++++++------ drivers/net/ixgbe/ixgbe_ethdev.h | 3 ++- drivers/net/ixgbe/ixgbe_flow.c | 1 - drivers/net/ixgbe/ixgbe_rxtx.c | 1 - 5 files changed, 14 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..2d575f5 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1127,7 +1127,8 @@ struct rte_ixgbe_xstats_name_off { return 0; } - rte_atomic32_clear(&ad->link_thread_running); + // NOTE: review for potential ordering optimization + __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 +1626,8 @@ static int ixgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev) return 0; } - rte_atomic32_clear(&ad->link_thread_running); + // NOTE: review for potential ordering optimization + __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST); ixgbevf_parse_devargs(eth_dev->data->dev_private, pci_dev->device.devargs); @@ -4186,7 +4188,8 @@ 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)) { + // NOTE: review for potential ordering optimization + while (__atomic_load_n(&ad->link_thread_running, __ATOMIC_SEQ_CST)) { msec_delay(1); timeout--; @@ -4222,7 +4225,8 @@ 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); + // NOTE: review for potential ordering optimization + __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST); return NULL; } @@ -4317,7 +4321,8 @@ 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)) { + // NOTE: review for potential ordering optimization + 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 +4335,8 @@ 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); + // NOTE: review for potential ordering optimization + __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 -- 1.8.3.1