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 6496E43D14;
Thu, 21 Mar 2024 20:21:07 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 5787C42F8B;
Thu, 21 Mar 2024 20:18:23 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 2C94D42E72
for <dev@dpdk.org>; Thu, 21 Mar 2024 20:17:42 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id 0B9B920B74E1; Thu, 21 Mar 2024 12:17:34 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0B9B920B74E1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1711048656;
bh=PV+wPLzeSwfFbD9vBkE1o5/+iDb3COWnkfXfLvwCEvU=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=YrHyVETJoSqY/FjrbFsfsRlPdaUdR9TnYCWVpOtKjh1GAs6/ZVb8kD/84rHgUmVxK
gF4x6ShATvQEJh9CyrLan1MgyIPUTafe/e0zAzBpt1qk+tJOxG/kvW6cx2zD0M/W0R
ZKnfkFs64OGur4YdXAMJG/WVXyFmfRUStD0/mQyg=
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 v2 32/45] net/txgbe: use rte stdatomic API
Date: Thu, 21 Mar 2024 12:17:19 -0700
Message-Id: <1711048652-7512-33-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1711048652-7512-1-git-send-email-roretzla@linux.microsoft.com>
References: <1710967892-7046-1-git-send-email-roretzla@linux.microsoft.com>
<1711048652-7512-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>
---
drivers/net/txgbe/txgbe_ethdev.c | 12 +++++++-----
drivers/net/txgbe/txgbe_ethdev.h | 2 +-
drivers/net/txgbe/txgbe_ethdev_vf.c | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index b75e889..a58f197 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -595,7 +595,7 @@ static int txgbe_dev_interrupt_action(struct rte_eth_dev *dev,
return 0;
}
- __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST);
+ rte_atomic_store_explicit(&ad->link_thread_running, 0, rte_memory_order_seq_cst);
rte_eth_copy_pci_info(eth_dev, pci_dev);
hw->hw_addr = (void *)pci_dev->mem_resource[0].addr;
@@ -2834,7 +2834,7 @@ static int txgbe_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
struct txgbe_adapter *ad = TXGBE_DEV_ADAPTER(dev);
uint32_t timeout = timeout_ms ? timeout_ms : WARNING_TIMEOUT;
- while (__atomic_load_n(&ad->link_thread_running, __ATOMIC_SEQ_CST)) {
+ while (rte_atomic_load_explicit(&ad->link_thread_running, rte_memory_order_seq_cst)) {
msec_delay(1);
timeout--;
@@ -2859,7 +2859,7 @@ static int txgbe_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
rte_thread_detach(rte_thread_self());
txgbe_dev_setup_link_alarm_handler(dev);
- __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST);
+ rte_atomic_store_explicit(&ad->link_thread_running, 0, rte_memory_order_seq_cst);
return 0;
}
@@ -2908,7 +2908,8 @@ static int txgbe_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
} else if (hw->phy.media_type == txgbe_media_type_fiber &&
dev->data->dev_conf.intr_conf.lsc != 0) {
txgbe_dev_wait_setup_link_complete(dev, 0);
- if (!__atomic_test_and_set(&ad->link_thread_running, __ATOMIC_SEQ_CST)) {
+ if (!rte_atomic_exchange_explicit(&ad->link_thread_running, 1,
+ rte_memory_order_seq_cst)) {
/* To avoid race condition between threads, set
* the TXGBE_FLAG_NEED_LINK_CONFIG flag only
* when there is no link thread running.
@@ -2918,7 +2919,8 @@ static int txgbe_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
"txgbe-link",
txgbe_dev_setup_link_thread_handler, dev) < 0) {
PMD_DRV_LOG(ERR, "Create link thread failed!");
- __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST);
+ rte_atomic_store_explicit(&ad->link_thread_running, 0,
+ rte_memory_order_seq_cst);
}
} else {
PMD_DRV_LOG(ERR,
diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
index 7e8067c..e8f55f7 100644
--- a/drivers/net/txgbe/txgbe_ethdev.h
+++ b/drivers/net/txgbe/txgbe_ethdev.h
@@ -372,7 +372,7 @@ struct txgbe_adapter {
/* For RSS reta table update */
uint8_t rss_reta_updated;
- uint32_t link_thread_running;
+ RTE_ATOMIC(uint32_t) link_thread_running;
rte_thread_t link_thread_tid;
};
diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
index f1341fb..1abc190 100644
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -206,7 +206,7 @@ static int txgbevf_dev_link_update(struct rte_eth_dev *dev,
return 0;
}
- __atomic_clear(&ad->link_thread_running, __ATOMIC_SEQ_CST);
+ rte_atomic_store_explicit(&ad->link_thread_running, 0, rte_memory_order_seq_cst);
rte_eth_copy_pci_info(eth_dev, pci_dev);
hw->device_id = pci_dev->id.device_id;
--
1.8.3.1