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 33614CD5BB8 for ; Sat, 23 May 2026 19:59:34 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B05240A75; Sat, 23 May 2026 21:58:56 +0200 (CEST) Received: from mail-dl1-f49.google.com (mail-dl1-f49.google.com [74.125.82.49]) by mails.dpdk.org (Postfix) with ESMTP id 4609F40696 for ; Sat, 23 May 2026 21:58:51 +0200 (CEST) Received: by mail-dl1-f49.google.com with SMTP id a92af1059eb24-1334825de43so7408913c88.0 for ; Sat, 23 May 2026 12:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20251104.gappssmtp.com; s=20251104; t=1779566330; x=1780171130; 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; bh=139gzksGNvb60vjMHCV5bmGXdpR7VUEdRflMop0rtSU=; b=DNcl0hU0LQV6EKbEbLnnp+eh71+xOtOxoPzAzD7cOchfojd3+Goew2gY0cCfdNZmnO Rn2BpXZtw855sdYA+W0QWlCOjHCrRtPzdUa9qIxtbZluXLX25l7qAXG/Kgf82uf+iwFx lPvg3S5il4lSOetgjjXSy7wRY8hp+z5/+YqtMJ6PPoOlANgYBUtoIk1iONCHeMrmtsIM J9N1imtY/XfOrcv1bmHkLniPcoIVtq8H1IkOMBovmQCEb1b4+oHsmG0YPl7xzTS3dDWk dWkhyXkvhvVvkCOtGUslgPfV//zMJulNI4JlzPLX6cF6RHLtW00C1Y63ownaJS1qKNLP aKMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779566330; x=1780171130; 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; bh=139gzksGNvb60vjMHCV5bmGXdpR7VUEdRflMop0rtSU=; b=YjMx4yZSpUrNVVI5lXaLz15iHsC3lpf0yYOS/i1yYZDvzsZ5La/c+FD+npxzzSuo15 Za1CNoZWM/o01nDwTD75ZJ0eGspOBoWAf66H1vVVjWNvK4dDs1H9PxiYcWPjT80vRGRn EDBtCV44KWCH8CcbmNq3VAM/e1vWBBVnXByJYdglTiYR5gwzfxqPsbtp+lumjv7Qz8Ie 97JP2R8L/Qwj4adZpdIWUMVPI7Cv7We481RsdNN4kpZmK4nbE38L3ReEHEnwxphp9rYy aIzRYvVN8DwNKjhZx7Qq3iLpU4vc8Oe13jPRqHlQamZL2SLSx08lrc4eGB1Gf1b77ktb BY2A== X-Gm-Message-State: AOJu0Yx+ZiXNdKKqm7ikR/QqeELjE4dVwYp8108wTdf1gFvAerg2SdDE +ecmNHyS/V0No0bUJQGJUfRRzqFVlvlDyLiEQkh7M1VZkwh7o2meG7oJ/yI395g3Xd6ikaTy5Wt bc10m X-Gm-Gg: Acq92OHku/zISwk05EcRIyFFAyLoQjKJuEXKCgHMcNCWatQXRH/1VXbZn9b9B3dKwCq 2EL4JU7f7zaPANmeX59bLx3BSzslmpfA46u6wBd46Hm+xToIIOOunwx7XJ0s3wvgA5ATzUvTu7Y uLuxfPR+BTFiiicusxsqRlHAqeEvP3ZJx/a60O0cRdw/FA0xnkXaW5xj06Z4Oh2k+oEwx+wBvFw oqmzK4if8Ici94pxz2AIy7ftIL3r8qXpi3F80YMMpziPqXNZ0GCyS1JbCLwBGZjIBXKFchdcTVg 2aidYsE4yeH/7VK8IPsDSAWnzIl/qwNpadQssMRWxJpvvy1Z+bOXZwKkIHq2m0zimt/5m0Ml7/9 Cg6dSxClu+zghuxOBMZWNSuZczkSlHAXxdk9rCEjIioJmUufE20fJ7W+jQzafda5mdF75giwp8K j2nhrNE/TkMjXUc+/VgEEIpM+yBjayHbKaoEYw87p3sfupVRCDgjYt4lOHwSxtQoUzSJZtDtch X-Received: by 2002:a05:7300:6da7:b0:2ef:8b72:1b9 with SMTP id 5a478bee46e88-30448d6218amr4314519eec.0.1779566330372; Sat, 23 May 2026 12:58:50 -0700 (PDT) Received: from phoenix.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30452255234sm4838428eec.20.2026.05.23.12.58.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2026 12:58:50 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gaetan Rivet Subject: [PATCH v3 08/27] net/failsafe: convert to stdatomic Date: Sat, 23 May 2026 12:56:22 -0700 Message-ID: <20260523195839.454952-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260523195839.454952-1-stephen@networkplumber.org> References: <20260521042043.1590536-1-stephen@networkplumber.org> <20260523195839.454952-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