Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132822/?format=api
{ "id": 132822, "url": "http://patchwork.dpdk.org/api/patches/132822/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1697574677-16578-16-git-send-email-roretzla@linux.microsoft.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1697574677-16578-16-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1697574677-16578-16-git-send-email-roretzla@linux.microsoft.com", "date": "2023-10-17T20:31:13", "name": "[v2,15/19] distributor: use rte optional stdatomic API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ca5f18dba23b7b04227bf452bd53bcc1909451da", "submitter": { "id": 2077, "url": "http://patchwork.dpdk.org/api/people/2077/?format=api", "name": "Tyler Retzlaff", "email": "roretzla@linux.microsoft.com" }, "delegate": { "id": 24651, "url": "http://patchwork.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1697574677-16578-16-git-send-email-roretzla@linux.microsoft.com/mbox/", "series": [ { "id": 29892, "url": "http://patchwork.dpdk.org/api/series/29892/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29892", "date": "2023-10-17T20:30:58", "name": "use rte optional stdatomic API", "version": 2, "mbox": "http://patchwork.dpdk.org/series/29892/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/132822/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/132822/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 96B3343190;\n\tTue, 17 Oct 2023 22:33:39 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AC96242E7B;\n\tTue, 17 Oct 2023 22:31:45 +0200 (CEST)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id D8047427D7\n for <dev@dpdk.org>; Tue, 17 Oct 2023 22:31:20 +0200 (CEST)", "by linux.microsoft.com (Postfix, from userid 1086)\n id 5506F20B74CF; Tue, 17 Oct 2023 13:31:18 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com 5506F20B74CF", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1697574679;\n bh=z0Rs5NSot0ilkYEI+ncHHjpoGPyvF3LWV91KEgWDvF4=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=Se/mNy7YO8YCyHOLfPi2na/Ut4bMTPTeFvU/uQiRk6JpOuy8REaoM+oDxLYVb4UtN\n eCBPIxGzwTCRYol0OF6AVjrxm/pJhg/KS1uETW0DYgdW7WKkiS69NNS2+GWJDGkA0G\n 8YBsDvXXF6pHsmmCrrSlZjyYqjzTksn2Hhjlmgyg=", "From": "Tyler Retzlaff <roretzla@linux.microsoft.com>", "To": "dev@dpdk.org", "Cc": "Akhil Goyal <gakhil@marvell.com>,\n Anatoly Burakov <anatoly.burakov@intel.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Chenbo Xia <chenbo.xia@intel.com>, Ciara Power <ciara.power@intel.com>,\n David Christensen <drc@linux.vnet.ibm.com>,\n David Hunt <david.hunt@intel.com>,\n Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>,\n Dmitry Malloy <dmitrym@microsoft.com>,\n Elena Agostini <eagostini@nvidia.com>,\n Erik Gabriel Carrillo <erik.g.carrillo@intel.com>,\n Fan Zhang <fanzhang.oss@gmail.com>, Ferruh Yigit <ferruh.yigit@amd.com>,\n Harman Kalra <hkalra@marvell.com>,\n Harry van Haaren <harry.van.haaren@intel.com>,\n Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,\n Jerin Jacob <jerinj@marvell.com>,\n Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,\n Matan Azrad <matan@nvidia.com>,\n Maxime Coquelin <maxime.coquelin@redhat.com>,\n Narcisa Ana Maria Vasile <navasile@linux.microsoft.com>,\n Nicolas Chautru <nicolas.chautru@intel.com>,\n Olivier Matz <olivier.matz@6wind.com>, Ori Kam <orika@nvidia.com>,\n Pallavi Kadam <pallavi.kadam@intel.com>,\n Pavan Nikhilesh <pbhagavatula@marvell.com>,\n Reshma Pattan <reshma.pattan@intel.com>,\n Sameh Gobriel <sameh.gobriel@intel.com>,\n Shijith Thotton <sthotton@marvell.com>,\n Sivaprasad Tummala <sivaprasad.tummala@amd.com>,\n Stephen Hemminger <stephen@networkplumber.org>,\n Suanming Mou <suanmingm@nvidia.com>, Sunil Kumar Kori <skori@marvell.com>,\n Thomas Monjalon <thomas@monjalon.net>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>,\n Vladimir Medvedkin <vladimir.medvedkin@intel.com>,\n Yipeng Wang <yipeng1.wang@intel.com>,\n Tyler Retzlaff <roretzla@linux.microsoft.com>", "Subject": "[PATCH v2 15/19] distributor: use rte optional stdatomic API", "Date": "Tue, 17 Oct 2023 13:31:13 -0700", "Message-Id": "<1697574677-16578-16-git-send-email-roretzla@linux.microsoft.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1697574677-16578-1-git-send-email-roretzla@linux.microsoft.com>", "References": "<1697497745-20664-1-git-send-email-roretzla@linux.microsoft.com>\n <1697574677-16578-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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Replace the use of gcc builtin __atomic_xxx intrinsics with\ncorresponding rte_atomic_xxx optional stdatomic API\n\nSigned-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>\n---\n lib/distributor/distributor_private.h | 4 +--\n lib/distributor/rte_distributor.c | 54 +++++++++++++++++------------------\n 2 files changed, 29 insertions(+), 29 deletions(-)", "diff": "diff --git a/lib/distributor/distributor_private.h b/lib/distributor/distributor_private.h\nindex 2f29343..dfeb9b5 100644\n--- a/lib/distributor/distributor_private.h\n+++ b/lib/distributor/distributor_private.h\n@@ -113,12 +113,12 @@ enum rte_distributor_match_function {\n * There is a separate cacheline for returns in the burst API.\n */\n struct rte_distributor_buffer {\n-\tvolatile int64_t bufptr64[RTE_DIST_BURST_SIZE]\n+\tvolatile RTE_ATOMIC(int64_t) bufptr64[RTE_DIST_BURST_SIZE]\n \t\t__rte_cache_aligned; /* <= outgoing to worker */\n \n \tint64_t pad1 __rte_cache_aligned; /* <= one cache line */\n \n-\tvolatile int64_t retptr64[RTE_DIST_BURST_SIZE]\n+\tvolatile RTE_ATOMIC(int64_t) retptr64[RTE_DIST_BURST_SIZE]\n \t\t__rte_cache_aligned; /* <= incoming from worker */\n \n \tint64_t pad2 __rte_cache_aligned; /* <= one cache line */\ndiff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c\nindex 5ca80dd..2ecb95c 100644\n--- a/lib/distributor/rte_distributor.c\n+++ b/lib/distributor/rte_distributor.c\n@@ -38,7 +38,7 @@\n \tstruct rte_distributor_buffer *buf = &(d->bufs[worker_id]);\n \tunsigned int i;\n \n-\tvolatile int64_t *retptr64;\n+\tvolatile RTE_ATOMIC(int64_t) *retptr64;\n \n \tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n \t\trte_distributor_request_pkt_single(d->d_single,\n@@ -50,7 +50,7 @@\n \t/* Spin while handshake bits are set (scheduler clears it).\n \t * Sync with worker on GET_BUF flag.\n \t */\n-\twhile (unlikely(__atomic_load_n(retptr64, __ATOMIC_ACQUIRE)\n+\twhile (unlikely(rte_atomic_load_explicit(retptr64, rte_memory_order_acquire)\n \t\t\t& (RTE_DISTRIB_GET_BUF | RTE_DISTRIB_RETURN_BUF))) {\n \t\trte_pause();\n \t\tuint64_t t = rte_rdtsc()+100;\n@@ -78,8 +78,8 @@\n \t * line is ready for processing\n \t * Sync with distributor to release retptrs\n \t */\n-\t__atomic_store_n(retptr64, *retptr64 | RTE_DISTRIB_GET_BUF,\n-\t\t\t__ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(retptr64, *retptr64 | RTE_DISTRIB_GET_BUF,\n+\t\t\trte_memory_order_release);\n }\n \n int\n@@ -102,7 +102,7 @@\n \t * RETURN_BUF is set when distributor must retrieve in-flight packets\n \t * Sync with distributor to acquire bufptrs\n \t */\n-\tif (__atomic_load_n(&(buf->bufptr64[0]), __ATOMIC_ACQUIRE)\n+\tif (rte_atomic_load_explicit(&(buf->bufptr64[0]), rte_memory_order_acquire)\n \t\t& (RTE_DISTRIB_GET_BUF | RTE_DISTRIB_RETURN_BUF))\n \t\treturn -1;\n \n@@ -120,8 +120,8 @@\n \t * on the next cacheline while we're working.\n \t * Sync with distributor on GET_BUF flag. Release bufptrs.\n \t */\n-\t__atomic_store_n(&(buf->bufptr64[0]),\n-\t\tbuf->bufptr64[0] | RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&(buf->bufptr64[0]),\n+\t\tbuf->bufptr64[0] | RTE_DISTRIB_GET_BUF, rte_memory_order_release);\n \n \treturn count;\n }\n@@ -177,7 +177,7 @@\n \t/* Spin while handshake bits are set (scheduler clears it).\n \t * Sync with worker on GET_BUF flag.\n \t */\n-\twhile (unlikely(__atomic_load_n(&(buf->retptr64[0]), __ATOMIC_RELAXED)\n+\twhile (unlikely(rte_atomic_load_explicit(&(buf->retptr64[0]), rte_memory_order_relaxed)\n \t\t\t& (RTE_DISTRIB_GET_BUF | RTE_DISTRIB_RETURN_BUF))) {\n \t\trte_pause();\n \t\tuint64_t t = rte_rdtsc()+100;\n@@ -187,7 +187,7 @@\n \t}\n \n \t/* Sync with distributor to acquire retptrs */\n-\t__atomic_thread_fence(__ATOMIC_ACQUIRE);\n+\t__atomic_thread_fence(rte_memory_order_acquire);\n \tfor (i = 0; i < RTE_DIST_BURST_SIZE; i++)\n \t\t/* Switch off the return bit first */\n \t\tbuf->retptr64[i] = 0;\n@@ -200,15 +200,15 @@\n \t * we won't read any mbufs from there even if GET_BUF is set.\n \t * This allows distributor to retrieve in-flight already sent packets.\n \t */\n-\t__atomic_fetch_or(&(buf->bufptr64[0]), RTE_DISTRIB_RETURN_BUF,\n-\t\t__ATOMIC_ACQ_REL);\n+\trte_atomic_fetch_or_explicit(&(buf->bufptr64[0]), RTE_DISTRIB_RETURN_BUF,\n+\t\trte_memory_order_acq_rel);\n \n \t/* set the RETURN_BUF on retptr64 even if we got no returns.\n \t * Sync with distributor on RETURN_BUF flag. Release retptrs.\n \t * Notify distributor that we don't request more packets any more.\n \t */\n-\t__atomic_store_n(&(buf->retptr64[0]),\n-\t\tbuf->retptr64[0] | RTE_DISTRIB_RETURN_BUF, __ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&(buf->retptr64[0]),\n+\t\tbuf->retptr64[0] | RTE_DISTRIB_RETURN_BUF, rte_memory_order_release);\n \n \treturn 0;\n }\n@@ -297,7 +297,7 @@\n \t * to worker which does not require new packets.\n \t * They must be retrieved and assigned to another worker.\n \t */\n-\tif (!(__atomic_load_n(&(buf->bufptr64[0]), __ATOMIC_ACQUIRE)\n+\tif (!(rte_atomic_load_explicit(&(buf->bufptr64[0]), rte_memory_order_acquire)\n \t\t& RTE_DISTRIB_GET_BUF))\n \t\tfor (i = 0; i < RTE_DIST_BURST_SIZE; i++)\n \t\t\tif (buf->bufptr64[i] & RTE_DISTRIB_VALID_BUF)\n@@ -310,8 +310,8 @@\n \t * with new packets if worker will make a new request.\n \t * - clear RETURN_BUF to unlock reads on worker side.\n \t */\n-\t__atomic_store_n(&(buf->bufptr64[0]), RTE_DISTRIB_GET_BUF,\n-\t\t__ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&(buf->bufptr64[0]), RTE_DISTRIB_GET_BUF,\n+\t\trte_memory_order_release);\n \n \t/* Collect backlog packets from worker */\n \tfor (i = 0; i < d->backlog[wkr].count; i++)\n@@ -348,7 +348,7 @@\n \tunsigned int i;\n \n \t/* Sync on GET_BUF flag. Acquire retptrs. */\n-\tif (__atomic_load_n(&(buf->retptr64[0]), __ATOMIC_ACQUIRE)\n+\tif (rte_atomic_load_explicit(&(buf->retptr64[0]), rte_memory_order_acquire)\n \t\t& (RTE_DISTRIB_GET_BUF | RTE_DISTRIB_RETURN_BUF)) {\n \t\tfor (i = 0; i < RTE_DIST_BURST_SIZE; i++) {\n \t\t\tif (buf->retptr64[i] & RTE_DISTRIB_VALID_BUF) {\n@@ -379,7 +379,7 @@\n \t\t/* Clear for the worker to populate with more returns.\n \t\t * Sync with distributor on GET_BUF flag. Release retptrs.\n \t\t */\n-\t\t__atomic_store_n(&(buf->retptr64[0]), 0, __ATOMIC_RELEASE);\n+\t\trte_atomic_store_explicit(&(buf->retptr64[0]), 0, rte_memory_order_release);\n \t}\n \treturn count;\n }\n@@ -404,7 +404,7 @@\n \t\treturn 0;\n \n \t/* Sync with worker on GET_BUF flag */\n-\twhile (!(__atomic_load_n(&(d->bufs[wkr].bufptr64[0]), __ATOMIC_ACQUIRE)\n+\twhile (!(rte_atomic_load_explicit(&(d->bufs[wkr].bufptr64[0]), rte_memory_order_acquire)\n \t\t& RTE_DISTRIB_GET_BUF)) {\n \t\thandle_returns(d, wkr);\n \t\tif (unlikely(!d->active[wkr]))\n@@ -430,8 +430,8 @@\n \t/* Clear the GET bit.\n \t * Sync with worker on GET_BUF flag. Release bufptrs.\n \t */\n-\t__atomic_store_n(&(buf->bufptr64[0]),\n-\t\tbuf->bufptr64[0] & ~RTE_DISTRIB_GET_BUF, __ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&(buf->bufptr64[0]),\n+\t\tbuf->bufptr64[0] & ~RTE_DISTRIB_GET_BUF, rte_memory_order_release);\n \treturn buf->count;\n \n }\n@@ -463,8 +463,8 @@\n \t\t/* Flush out all non-full cache-lines to workers. */\n \t\tfor (wid = 0 ; wid < d->num_workers; wid++) {\n \t\t\t/* Sync with worker on GET_BUF flag. */\n-\t\t\tif (__atomic_load_n(&(d->bufs[wid].bufptr64[0]),\n-\t\t\t\t__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF) {\n+\t\t\tif (rte_atomic_load_explicit(&(d->bufs[wid].bufptr64[0]),\n+\t\t\t\trte_memory_order_acquire) & RTE_DISTRIB_GET_BUF) {\n \t\t\t\td->bufs[wid].count = 0;\n \t\t\t\trelease(d, wid);\n \t\t\t\thandle_returns(d, wid);\n@@ -598,8 +598,8 @@\n \t/* Flush out all non-full cache-lines to workers. */\n \tfor (wid = 0 ; wid < d->num_workers; wid++)\n \t\t/* Sync with worker on GET_BUF flag. */\n-\t\tif ((__atomic_load_n(&(d->bufs[wid].bufptr64[0]),\n-\t\t\t__ATOMIC_ACQUIRE) & RTE_DISTRIB_GET_BUF)) {\n+\t\tif ((rte_atomic_load_explicit(&(d->bufs[wid].bufptr64[0]),\n+\t\t\trte_memory_order_acquire) & RTE_DISTRIB_GET_BUF)) {\n \t\t\td->bufs[wid].count = 0;\n \t\t\trelease(d, wid);\n \t\t}\n@@ -700,8 +700,8 @@\n \t/* throw away returns, so workers can exit */\n \tfor (wkr = 0; wkr < d->num_workers; wkr++)\n \t\t/* Sync with worker. Release retptrs. */\n-\t\t__atomic_store_n(&(d->bufs[wkr].retptr64[0]), 0,\n-\t\t\t\t__ATOMIC_RELEASE);\n+\t\trte_atomic_store_explicit(&(d->bufs[wkr].retptr64[0]), 0,\n+\t\t\t\trte_memory_order_release);\n \n \td->returns.start = d->returns.count = 0;\n }\n", "prefixes": [ "v2", "15/19" ] }