From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88CF8C55167 for ; Fri, 31 Jul 2026 05:00:32 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70BAC40A6E; Fri, 31 Jul 2026 06:59:59 +0200 (CEST) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mails.dpdk.org (Postfix) with ESMTP id D74364066C for ; Fri, 31 Jul 2026 06:59:57 +0200 (CEST) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-ca97d139d5fso341075a12.0 for ; Thu, 30 Jul 2026 21:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20251104.gappssmtp.com; s=20251104; t=1785473997; x=1786078797; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=139gzksGNvb60vjMHCV5bmGXdpR7VUEdRflMop0rtSU=; b=WO8P42W4rwJ6F1heNRNcbZIcNAbImWI852/Nc5yUBJ3x/WeLnDCkCu3GsEuo1M6GSF Mpj0VqGiiwqY8L3a0AZVQqLAtfgeuQYeBjhct69Yrdk+4+SoNJ/hcwJCo53lbAF9VbUL 4hBCJtFXJzplc/qn7W5KzTvQZQfqGnLEbeWZ8hvw/QUSq534h78clqRlV3dxo6V98LSW wGxXs4wvVFfyUo0atiqZqi3NGPj9qCcbjR4RzJXbuNwaHEuFSuyeCFd4D4IMgS4nBzWV lBu7lLyuK3S1Tp8zHP5PUd0wi43KDUegcJaC/MxtwpY3sLVUbPeGaa+l1BVKSBmN6oMd d8Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785473997; x=1786078797; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=139gzksGNvb60vjMHCV5bmGXdpR7VUEdRflMop0rtSU=; b=hmz6xgOMr0odikCE0EwD9F91yniyloGPUJ3hmShdxCxc8s3CHDq5oGCEU7qPrc7vGV OJfiREsgnVpbt68suvp1B2te7+Mhl6pydZM37/WHT2iPEY/tm87+jCm4G5qONyphpWt+ mfNigJplRI6LkTy96dLeieAlNO8MMAgTxXWCAnybHt0PphYuqGBgaVB6TSOY/naPELdm VMY9xLZLUpBTN7r0G2S7IGj+yhV98PQIb19ysOXpmADpeGF1AJw93JIN9pOuFcLStFwg 7Omi+OqztE1bO6aUP+lqvn9dQaZcqbh0BbBwSgfYZ7CwRY9IP0LiuZy5hapzA8QOerS5 wetA== X-Gm-Message-State: AOJu0YyeWKNyJDDOFTYE3sWIa310E0o3XUUbDBkUWzNd8TaL2ba7r6qx svIRvx/nqosyeU2bqLVa97O0U0dHiADEa07qvUm8JaXl129r7M1iuMc5PypSKz6BvFpqdzUUZnV dUb+H X-Gm-Gg: AR+sD10dUIlIscWCRmoUuRwQz3X0I5TFIXh0HNS9k8LSPi7FeapLoy+r4XosP6AZQv+ oPPBdx+Le47h2IutSCBS3a3Doxuv51l4pNVBgeiDHFkDUBamNUD1iAObiF8TX88rWxXTd/Y+OgH 5YlPm5zDhTt1LbljMGrsnvtaMHpYnoPmYihkGiYpQy7VeoNMjf5FWSNkB6aYz/lyZf3x/Fbbr+X oG5L8M1wUt3Zyn9HY7wcCSfLE6dOsx4gtKZNJVfqFZKD9bWXh0Q4l9Hflo9IIiLucuEaz+vm7tx G674bkfQU3gTAExTw7nwe28aS0NCt9EHuHXTqeuWyY3uoc42iep1L3U5yzYP48TXf9TamfAZea0 CFGgMxFo75kfH/8Bw2qLI9DWs7I7kyzixaDoCLtcCucla1tN107H9lK5HZm+8P+HhZyCwB4QpO0 Qm2v2Cn/RRaVH64RGnGaAFH7jMD+nQE264QEBQ67XEgoegAqowEK5rVXbboWqqliQjDvlZYIMrs m6fJ/B3XIuh7ovdQaNCoEBfGy0= X-Received: by 2002:a05:6a21:690:b0:3c0:9c19:6590 with SMTP id adf61e73a8af0-3c91b3feb2emr423756637.74.1785473997077; Thu, 30 Jul 2026 21:59:57 -0700 (PDT) Received: from phoenix.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3153e06f0f9sm823245eec.23.2026.07.30.21.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 21:59:56 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gaetan Rivet Subject: [PATCH v6 05/24] net/failsafe: convert to stdatomic Date: Thu, 30 Jul 2026 21:57:43 -0700 Message-ID: <20260731045948.769926-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260731045948.769926-1-stephen@networkplumber.org> References: <20260521042043.1590536-1-stephen@networkplumber.org> <20260731045948.769926-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 The functions rte_atomic64 are deprecated, convert this code to use stdatomic for reference count. Use the memory order implied by naming P/V. No need for initialization since refcnt is in space allocated with rte_zmalloc(). Signed-off-by: Stephen Hemminger --- drivers/net/failsafe/failsafe_ops.c | 12 +++++----- drivers/net/failsafe/failsafe_private.h | 29 ++++++++++++++----------- drivers/net/failsafe/failsafe_rxtx.c | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c index ddc8808ebe..fcb0051777 100644 --- a/drivers/net/failsafe/failsafe_ops.c +++ b/drivers/net/failsafe/failsafe_ops.c @@ -11,7 +11,7 @@ #endif #include -#include +#include #include #include #include @@ -440,14 +440,13 @@ fs_rx_queue_setup(struct rte_eth_dev *dev, } rxq = rte_zmalloc(NULL, sizeof(*rxq) + - sizeof(rte_atomic64_t) * PRIV(dev)->subs_tail, + sizeof(uint64_t) * PRIV(dev)->subs_tail, RTE_CACHE_LINE_SIZE); if (rxq == NULL) { fs_unlock(dev, 0); return -ENOMEM; } - FOREACH_SUBDEV(sdev, i, dev) - rte_atomic64_init(&rxq->refcnt[i]); + rxq->qid = rx_queue_id; rxq->socket_id = socket_id; rxq->info.mp = mb_pool; @@ -617,14 +616,13 @@ fs_tx_queue_setup(struct rte_eth_dev *dev, } txq = rte_zmalloc("ethdev TX queue", sizeof(*txq) + - sizeof(rte_atomic64_t) * PRIV(dev)->subs_tail, + sizeof(uint64_t) * PRIV(dev)->subs_tail, RTE_CACHE_LINE_SIZE); if (txq == NULL) { fs_unlock(dev, 0); return -ENOMEM; } - FOREACH_SUBDEV(sdev, i, dev) - rte_atomic64_init(&txq->refcnt[i]); + txq->qid = tx_queue_id; txq->socket_id = socket_id; txq->info.conf = *tx_conf; diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h index babea6016e..89b06f9756 100644 --- a/drivers/net/failsafe/failsafe_private.h +++ b/drivers/net/failsafe/failsafe_private.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -75,7 +75,7 @@ struct rxq { int event_fd; unsigned int enable_events:1; struct rte_eth_rxq_info info; - rte_atomic64_t refcnt[]; + RTE_ATOMIC(uint64_t) refcnt[]; }; struct txq { @@ -83,7 +83,7 @@ struct txq { uint16_t qid; unsigned int socket_id; struct rte_eth_txq_info info; - rte_atomic64_t refcnt[]; + RTE_ATOMIC(uint64_t) refcnt[]; }; struct rte_flow { @@ -320,33 +320,36 @@ extern int failsafe_mac_from_arg; */ /** - * a: (rte_atomic64_t) + * a: _Atomic uint64_t */ #define FS_ATOMIC_P(a) \ - rte_atomic64_set(&(a), 1) + rte_atomic_exchange_explicit(&(a), 1, rte_memory_order_acquire) /** - * a: (rte_atomic64_t) + * a: _Atomic uint64_t */ #define FS_ATOMIC_V(a) \ - rte_atomic64_set(&(a), 0) + rte_atomic_store_explicit(&(a), 0, rte_memory_order_release) /** * s: (struct sub_device *) * i: uint16_t qid */ #define FS_ATOMIC_RX(s, i) \ - rte_atomic64_read( \ - &((struct rxq *) \ - (fs_dev(s)->data->rx_queues[i]))->refcnt[(s)->sid]) + rte_atomic_load_explicit( \ + &((struct rxq *) \ + (fs_dev(s)->data->rx_queues[i]))->refcnt[(s)->sid], \ + rte_memory_order_seq_cst) + /** * s: (struct sub_device *) * i: uint16_t qid */ #define FS_ATOMIC_TX(s, i) \ - rte_atomic64_read( \ - &((struct txq *) \ - (fs_dev(s)->data->tx_queues[i]))->refcnt[(s)->sid]) + rte_atomic_load_explicit( \ + &((struct txq *) \ + (fs_dev(s)->data->tx_queues[i]))->refcnt[(s)->sid], \ + rte_memory_order_seq_cst) #ifdef RTE_EXEC_ENV_FREEBSD #define FS_THREADID_TYPE void* diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/failsafe_rxtx.c index fe67293299..500483bda3 100644 --- a/drivers/net/failsafe/failsafe_rxtx.c +++ b/drivers/net/failsafe/failsafe_rxtx.c @@ -3,7 +3,7 @@ * Copyright 2017 Mellanox Technologies, Ltd */ -#include +#include #include #include #include -- 2.53.0