Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138594/?format=api
{ "id": 138594, "url": "http://patchwork.dpdk.org/api/patches/138594/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1710967892-7046-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": "<1710967892-7046-16-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1710967892-7046-16-git-send-email-roretzla@linux.microsoft.com", "date": "2024-03-20T20:51:01", "name": "[15/46] net/sfc: use rte stdatomic API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e55d2c3337f1a5d63aa74c3588276864fff26bc8", "submitter": { "id": 2077, "url": "http://patchwork.dpdk.org/api/people/2077/?format=api", "name": "Tyler Retzlaff", "email": "roretzla@linux.microsoft.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1710967892-7046-16-git-send-email-roretzla@linux.microsoft.com/mbox/", "series": [ { "id": 31572, "url": "http://patchwork.dpdk.org/api/series/31572/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31572", "date": "2024-03-20T20:50:46", "name": "use stdatomic API", "version": 1, "mbox": "http://patchwork.dpdk.org/series/31572/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/138594/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/138594/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 6605243D09;\n\tWed, 20 Mar 2024 21:53:31 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C752242E41;\n\tWed, 20 Mar 2024 21:51:56 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id D8AEA4114B\n for <dev@dpdk.org>; Wed, 20 Mar 2024 21:51:37 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id 3EC9320B74CF; Wed, 20 Mar 2024 13:51:33 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com 3EC9320B74CF", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1710967894;\n bh=8KzPUNlQEaL2u+f9sn1iYCUGoibUAq8twXkhwPg0E28=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=ImRiGmOuoQuyCCuD71F5IoIKnsu6lfy0PAAzaM6TIR3SjQD2kUpSWwWi01fHpgdEe\n BQFR/hUqHkduryQNbzeCWQ0VNT4VZ1R8Ilkf5lLbUuU1C0R3QgS+X+PmrzJJPlKcYu\n nIGEBfqOZ7ZFiAPoKUhJe9k6Ucf3231BXUeZ7mUk=", "From": "Tyler Retzlaff <roretzla@linux.microsoft.com>", "To": "dev@dpdk.org", "Cc": "=?utf-8?q?Mattias_R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>,\n\t=?utf-8?q?Morten_Br=C3=B8rup?= <mb@smartsharesystems.com>,\n Abdullah Sevincer <abdullah.sevincer@intel.com>,\n Ajit Khaparde <ajit.khaparde@broadcom.com>, Alok Prasad <palok@marvell.com>,\n Anatoly Burakov <anatoly.burakov@intel.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Anoob Joseph <anoobj@marvell.com>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Byron Marohn <byron.marohn@intel.com>, Chenbo Xia <chenbox@nvidia.com>,\n Chengwen Feng <fengchengwen@huawei.com>,\n Ciara Loftus <ciara.loftus@intel.com>, Ciara Power <ciara.power@intel.com>,\n Dariusz Sosnowski <dsosnowski@nvidia.com>, David Hunt <david.hunt@intel.com>,\n Devendra Singh Rawat <dsinghrawat@marvell.com>,\n Erik Gabriel Carrillo <erik.g.carrillo@intel.com>,\n Guoyang Zhou <zhouguoyang@huawei.com>, Harman Kalra <hkalra@marvell.com>,\n Harry van Haaren <harry.van.haaren@intel.com>,\n Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,\n Jakub Grajciar <jgrajcia@cisco.com>, Jerin Jacob <jerinj@marvell.com>,\n Jeroen de Borst <jeroendb@google.com>, Jian Wang <jianwang@trustnetic.com>,\n Jiawen Wu <jiawenwu@trustnetic.com>, Jie Hai <haijie1@huawei.com>,\n Jingjing Wu <jingjing.wu@intel.com>, Joshua Washington <joshwash@google.com>,\n Joyce Kong <joyce.kong@arm.com>, Junfeng Guo <junfeng.guo@intel.com>,\n Kevin Laatz <kevin.laatz@intel.com>,\n Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,\n Liang Ma <liangma@liangbit.com>, Long Li <longli@microsoft.com>,\n Maciej Czekaj <mczekaj@marvell.com>, Matan Azrad <matan@nvidia.com>,\n Maxime Coquelin <maxime.coquelin@redhat.com>,\n Nicolas Chautru <nicolas.chautru@intel.com>, Ori Kam <orika@nvidia.com>,\n Pavan Nikhilesh <pbhagavatula@marvell.com>,\n Peter Mccarthy <peter.mccarthy@intel.com>,\n Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,\n Reshma Pattan <reshma.pattan@intel.com>, Rosen Xu <rosen.xu@intel.com>,\n Ruifeng Wang <ruifeng.wang@arm.com>, Rushil Gupta <rushilg@google.com>,\n Sameh Gobriel <sameh.gobriel@intel.com>,\n Sivaprasad Tummala <sivaprasad.tummala@amd.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Stephen Hemminger <stephen@networkplumber.org>,\n Suanming Mou <suanmingm@nvidia.com>, Sunil Kumar Kori <skori@marvell.com>,\n Sunil Uttarwar <sunilprakashrao.uttarwar@amd.com>,\n Tetsuya Mukawa <mtetsuyah@gmail.com>, Vamsi Attunuru <vattunuru@marvell.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>,\n Vladimir Medvedkin <vladimir.medvedkin@intel.com>,\n Xiaoyun Wang <cloud.wangxiaoyun@huawei.com>,\n Yipeng Wang <yipeng1.wang@intel.com>, Yisen Zhuang <yisen.zhuang@huawei.com>,\n Yuying Zhang <Yuying.Zhang@intel.com>, Yuying Zhang <yuying.zhang@intel.com>,\n Ziyang Xuan <xuanziyang2@huawei.com>,\n Tyler Retzlaff <roretzla@linux.microsoft.com>", "Subject": "[PATCH 15/46] net/sfc: use rte stdatomic API", "Date": "Wed, 20 Mar 2024 13:51:01 -0700", "Message-Id": "<1710967892-7046-16-git-send-email-roretzla@linux.microsoft.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1710967892-7046-1-git-send-email-roretzla@linux.microsoft.com>", "References": "<1710967892-7046-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 rte stdatomic API.\n\nSigned-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>\n---\n drivers/net/sfc/meson.build | 5 ++---\n drivers/net/sfc/sfc_mae_counter.c | 30 +++++++++++++++---------------\n drivers/net/sfc/sfc_repr_proxy.c | 8 ++++----\n drivers/net/sfc/sfc_stats.h | 8 ++++----\n 4 files changed, 25 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build\nindex 5adde68..d3603a0 100644\n--- a/drivers/net/sfc/meson.build\n+++ b/drivers/net/sfc/meson.build\n@@ -47,9 +47,8 @@ int main(void)\n __int128 a = 0;\n __int128 b;\n \n- b = __atomic_load_n(&a, __ATOMIC_RELAXED);\n- __atomic_store(&b, &a, __ATOMIC_RELAXED);\n- __atomic_store_n(&b, a, __ATOMIC_RELAXED);\n+ b = rte_atomic_load_explicit(&a, rte_memory_order_relaxed);\n+ rte_atomic_store_explicit(&b, a, rte_memory_order_relaxed);\n return 0;\n }\n '''\ndiff --git a/drivers/net/sfc/sfc_mae_counter.c b/drivers/net/sfc/sfc_mae_counter.c\nindex ba17295..a32da84 100644\n--- a/drivers/net/sfc/sfc_mae_counter.c\n+++ b/drivers/net/sfc/sfc_mae_counter.c\n@@ -131,8 +131,8 @@\n \t * And it does not depend on different stores/loads in other threads.\n \t * Paired with relaxed ordering in counter increment.\n \t */\n-\t__atomic_store(&p->reset.pkts_bytes.int128,\n-\t\t &p->value.pkts_bytes.int128, __ATOMIC_RELAXED);\n+\trte_atomic_store_explicit(&p->reset.pkts_bytes.int128,\n+\t\t p->value.pkts_bytes.int128, rte_memory_order_relaxed);\n \tp->generation_count = generation_count;\n \n \tp->ft_switch_hit_counter = counterp->ft_switch_hit_counter;\n@@ -142,7 +142,7 @@\n \t * at the beginning of delete operation. Release ordering is\n \t * paired with acquire ordering on load in counter increment operation.\n \t */\n-\t__atomic_store_n(&p->inuse, true, __ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&p->inuse, true, rte_memory_order_release);\n \n \tsfc_info(sa, \"enabled MAE counter 0x%x-#%u with reset pkts=%\" PRIu64\n \t\t \" bytes=%\" PRIu64, counterp->type, mae_counter.id,\n@@ -189,7 +189,7 @@\n \t * paired with acquire ordering on load in counter increment operation.\n \t */\n \tp = &counters->mae_counters[mae_counter->id];\n-\t__atomic_store_n(&p->inuse, false, __ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&p->inuse, false, rte_memory_order_release);\n \n \trc = efx_mae_counters_free_type(sa->nic, counter->type, 1, &unused,\n \t\t\t\t\tmae_counter, NULL);\n@@ -228,7 +228,7 @@\n \t * Acquire ordering is paired with release ordering in counter add\n \t * and delete operations.\n \t */\n-\t__atomic_load(&p->inuse, &inuse, __ATOMIC_ACQUIRE);\n+\tinuse = rte_atomic_load_explicit(&p->inuse, rte_memory_order_acquire);\n \tif (!inuse) {\n \t\t/*\n \t\t * Two possible cases include:\n@@ -258,15 +258,15 @@\n \t * And it does not depend on different stores/loads in other threads.\n \t * Paired with relaxed ordering on counter reset.\n \t */\n-\t__atomic_store(&p->value.pkts_bytes,\n-\t\t &cnt_val.pkts_bytes, __ATOMIC_RELAXED);\n+\trte_atomic_store_explicit(&p->value.pkts_bytes,\n+\t\t cnt_val.pkts_bytes, rte_memory_order_relaxed);\n \n \tif (p->ft_switch_hit_counter != NULL) {\n \t\tuint64_t ft_switch_hit_counter;\n \n \t\tft_switch_hit_counter = *p->ft_switch_hit_counter + pkts;\n-\t\t__atomic_store_n(p->ft_switch_hit_counter, ft_switch_hit_counter,\n-\t\t\t\t __ATOMIC_RELAXED);\n+\t\trte_atomic_store_explicit(p->ft_switch_hit_counter, ft_switch_hit_counter,\n+\t\t\t\t rte_memory_order_relaxed);\n \t}\n \n \tsfc_info(sa, \"update MAE counter 0x%x-#%u: pkts+%\" PRIu64 \"=%\" PRIu64\n@@ -498,8 +498,8 @@\n \t\t&sa->mae.counter_registry;\n \tint32_t rc;\n \n-\twhile (__atomic_load_n(&counter_registry->polling.thread.run,\n-\t\t\t __ATOMIC_ACQUIRE)) {\n+\twhile (rte_atomic_load_explicit(&counter_registry->polling.thread.run,\n+\t\t\t rte_memory_order_acquire)) {\n \t\trc = sfc_mae_counter_poll_packets(sa);\n \t\tif (rc == 0) {\n \t\t\t/*\n@@ -684,8 +684,8 @@\n \tint rc;\n \n \t/* Ensure that flag is set before attempting to join thread */\n-\t__atomic_store_n(&counter_registry->polling.thread.run, false,\n-\t\t\t __ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&counter_registry->polling.thread.run, false,\n+\t\t\t rte_memory_order_release);\n \n \trc = rte_thread_join(counter_registry->polling.thread.id, NULL);\n \tif (rc != 0)\n@@ -1024,8 +1024,8 @@\n \t * And it does not depend on different stores/loads in other threads.\n \t * Paired with relaxed ordering in counter increment.\n \t */\n-\tvalue.pkts_bytes.int128 = __atomic_load_n(&p->value.pkts_bytes.int128,\n-\t\t\t\t\t\t __ATOMIC_RELAXED);\n+\tvalue.pkts_bytes.int128 = rte_atomic_load_explicit(&p->value.pkts_bytes.int128,\n+\t\t\t\t\t\t rte_memory_order_relaxed);\n \n \tdata->hits_set = 1;\n \tdata->hits = value.pkts - p->reset.pkts;\ndiff --git a/drivers/net/sfc/sfc_repr_proxy.c b/drivers/net/sfc/sfc_repr_proxy.c\nindex ff13795..7275901 100644\n--- a/drivers/net/sfc/sfc_repr_proxy.c\n+++ b/drivers/net/sfc/sfc_repr_proxy.c\n@@ -83,7 +83,7 @@\n \t * Release ordering enforces marker set after data is populated.\n \t * Paired with acquire ordering in sfc_repr_proxy_mbox_handle().\n \t */\n-\t__atomic_store_n(&mbox->write_marker, true, __ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&mbox->write_marker, true, rte_memory_order_release);\n \n \t/*\n \t * Wait for the representor routine to process the request.\n@@ -94,7 +94,7 @@\n \t\t * Paired with release ordering in sfc_repr_proxy_mbox_handle()\n \t\t * on acknowledge write.\n \t\t */\n-\t\tif (__atomic_load_n(&mbox->ack, __ATOMIC_ACQUIRE))\n+\t\tif (rte_atomic_load_explicit(&mbox->ack, rte_memory_order_acquire))\n \t\t\tbreak;\n \n \t\trte_delay_ms(1);\n@@ -119,7 +119,7 @@\n \t * Paired with release ordering in sfc_repr_proxy_mbox_send()\n \t * on marker set.\n \t */\n-\tif (!__atomic_load_n(&mbox->write_marker, __ATOMIC_ACQUIRE))\n+\tif (!rte_atomic_load_explicit(&mbox->write_marker, rte_memory_order_acquire))\n \t\treturn;\n \n \tmbox->write_marker = false;\n@@ -146,7 +146,7 @@\n \t * Paired with acquire ordering in sfc_repr_proxy_mbox_send()\n \t * on acknowledge read.\n \t */\n-\t__atomic_store_n(&mbox->ack, true, __ATOMIC_RELEASE);\n+\trte_atomic_store_explicit(&mbox->ack, true, rte_memory_order_release);\n }\n \n static void\ndiff --git a/drivers/net/sfc/sfc_stats.h b/drivers/net/sfc/sfc_stats.h\nindex 597e14d..25c2b9e 100644\n--- a/drivers/net/sfc/sfc_stats.h\n+++ b/drivers/net/sfc/sfc_stats.h\n@@ -51,8 +51,8 @@\n \t * Store the result atomically to guarantee that the reader\n \t * core sees both counter updates together.\n \t */\n-\t__atomic_store_n(&st->pkts_bytes.int128, result.pkts_bytes.int128,\n-\t\t\t __ATOMIC_RELAXED);\n+\trte_atomic_store_explicit(&st->pkts_bytes.int128, result.pkts_bytes.int128,\n+\t\t\t rte_memory_order_relaxed);\n #else\n \tst->pkts += pkts;\n \tst->bytes += bytes;\n@@ -66,8 +66,8 @@\n sfc_pkts_bytes_get(const union sfc_pkts_bytes *st, union sfc_pkts_bytes *result)\n {\n #if SFC_SW_STATS_ATOMIC\n-\tresult->pkts_bytes.int128 = __atomic_load_n(&st->pkts_bytes.int128,\n-\t\t\t\t\t\t __ATOMIC_RELAXED);\n+\tresult->pkts_bytes.int128 = rte_atomic_load_explicit(&st->pkts_bytes.int128,\n+\t\t\t\t\t\t rte_memory_order_relaxed);\n #else\n \t*result = *st;\n #endif\n", "prefixes": [ "15/46" ] }