Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138915/?format=api
{ "id": 138915, "url": "http://patches.dpdk.org/api/patches/138915/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1711579078-10624-40-git-send-email-roretzla@linux.microsoft.com/", "project": { "id": 1, "url": "http://patches.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": "<1711579078-10624-40-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1711579078-10624-40-git-send-email-roretzla@linux.microsoft.com", "date": "2024-03-27T22:37:52", "name": "[v3,39/45] examples: use rte stdatomic API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a5d87c497672f4b31560d6acda1b0a8eb48f23c3", "submitter": { "id": 2077, "url": "http://patches.dpdk.org/api/people/2077/?format=api", "name": "Tyler Retzlaff", "email": "roretzla@linux.microsoft.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1711579078-10624-40-git-send-email-roretzla@linux.microsoft.com/mbox/", "series": [ { "id": 31633, "url": "http://patches.dpdk.org/api/series/31633/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31633", "date": "2024-03-27T22:37:13", "name": "use stdatomic API", "version": 3, "mbox": "http://patches.dpdk.org/series/31633/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/138915/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/138915/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 055AD43D55;\n\tWed, 27 Mar 2024 23:41:56 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0E13242E44;\n\tWed, 27 Mar 2024 23:38:53 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id DF8C342D55\n for <dev@dpdk.org>; Wed, 27 Mar 2024 23:38:09 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id 9943C20E6F32; Wed, 27 Mar 2024 15:38:00 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com 9943C20E6F32", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1711579082;\n bh=Y1YMJkI+gPOq6CHzIpKjO03yNUl3z44GihB71r8VosI=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=S0PQXanZ02pFjiMa6BmLYx13VDPfLQaNXUqJtmvAareqPmIWshW5W+ATmJzrQqVQb\n 8KUyjS1o2u10bbUqheg41ZBLLmb8Z7m/ox1RTWvmXCUASL0N6n+w6LbPPLhEn2wntB\n 2Nv+cayW9s7n+a1/feB/Q+eIijsNfapEP89kaX/Q=", "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 v3 39/45] examples: use rte stdatomic API", "Date": "Wed, 27 Mar 2024 15:37:52 -0700", "Message-Id": "<1711579078-10624-40-git-send-email-roretzla@linux.microsoft.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1711579078-10624-1-git-send-email-roretzla@linux.microsoft.com>", "References": "<1710967892-7046-1-git-send-email-roretzla@linux.microsoft.com>\n <1711579078-10624-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>\nAcked-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n examples/bbdev_app/main.c | 13 +++++----\n examples/l2fwd-event/l2fwd_common.h | 4 +--\n examples/l2fwd-event/l2fwd_event.c | 24 ++++++++--------\n examples/l2fwd-jobstats/main.c | 11 ++++----\n .../client_server_mp/mp_server/main.c | 6 ++--\n examples/server_node_efd/efd_server/main.c | 6 ++--\n examples/vhost/main.c | 32 +++++++++++-----------\n examples/vhost/main.h | 4 +--\n examples/vhost/virtio_net.c | 13 +++++----\n examples/vhost_blk/vhost_blk.c | 8 +++---\n examples/vm_power_manager/channel_monitor.c | 9 +++---\n 11 files changed, 68 insertions(+), 62 deletions(-)", "diff": "diff --git a/examples/bbdev_app/main.c b/examples/bbdev_app/main.c\nindex 16599ae..214fdf2 100644\n--- a/examples/bbdev_app/main.c\n+++ b/examples/bbdev_app/main.c\n@@ -165,7 +165,7 @@ struct stats_lcore_params {\n \t.num_dec_cores = 1,\n };\n \n-static uint16_t global_exit_flag;\n+static RTE_ATOMIC(uint16_t) global_exit_flag;\n \n /* display usage */\n static inline void\n@@ -277,7 +277,7 @@ uint16_t bbdev_parse_number(const char *mask)\n signal_handler(int signum)\n {\n \tprintf(\"\\nSignal %d received\\n\", signum);\n-\t__atomic_store_n(&global_exit_flag, 1, __ATOMIC_RELAXED);\n+\trte_atomic_store_explicit(&global_exit_flag, 1, rte_memory_order_relaxed);\n }\n \n static void\n@@ -321,7 +321,8 @@ uint16_t bbdev_parse_number(const char *mask)\n \tfflush(stdout);\n \n \tfor (count = 0; count <= MAX_CHECK_TIME &&\n-\t\t\t!__atomic_load_n(&global_exit_flag, __ATOMIC_RELAXED); count++) {\n+\t\t\t!rte_atomic_load_explicit(&global_exit_flag,\n+\t\t\t rte_memory_order_relaxed); count++) {\n \t\tmemset(&link, 0, sizeof(link));\n \t\tlink_get_err = rte_eth_link_get_nowait(port_id, &link);\n \n@@ -675,7 +676,7 @@ uint16_t bbdev_parse_number(const char *mask)\n {\n \tstruct stats_lcore_params *stats_lcore = arg;\n \n-\twhile (!__atomic_load_n(&global_exit_flag, __ATOMIC_RELAXED)) {\n+\twhile (!rte_atomic_load_explicit(&global_exit_flag, rte_memory_order_relaxed)) {\n \t\tprint_stats(stats_lcore);\n \t\trte_delay_ms(500);\n \t}\n@@ -921,7 +922,7 @@ uint16_t bbdev_parse_number(const char *mask)\n \tconst bool run_decoder = (lcore_conf->core_type &\n \t\t\t(1 << RTE_BBDEV_OP_TURBO_DEC));\n \n-\twhile (!__atomic_load_n(&global_exit_flag, __ATOMIC_RELAXED)) {\n+\twhile (!rte_atomic_load_explicit(&global_exit_flag, rte_memory_order_relaxed)) {\n \t\tif (run_encoder)\n \t\t\trun_encoding(lcore_conf);\n \t\tif (run_decoder)\n@@ -1055,7 +1056,7 @@ uint16_t bbdev_parse_number(const char *mask)\n \t\t.align = alignof(struct rte_mbuf *),\n \t};\n \n-\t__atomic_store_n(&global_exit_flag, 0, __ATOMIC_RELAXED);\n+\trte_atomic_store_explicit(&global_exit_flag, 0, rte_memory_order_relaxed);\n \n \tsigret = signal(SIGTERM, signal_handler);\n \tif (sigret == SIG_ERR)\ndiff --git a/examples/l2fwd-event/l2fwd_common.h b/examples/l2fwd-event/l2fwd_common.h\nindex 07f84cb..3d2e303 100644\n--- a/examples/l2fwd-event/l2fwd_common.h\n+++ b/examples/l2fwd-event/l2fwd_common.h\n@@ -61,8 +61,8 @@\n /* Per-port statistics struct */\n struct l2fwd_port_statistics {\n \tuint64_t dropped;\n-\tuint64_t tx;\n-\tuint64_t rx;\n+\tRTE_ATOMIC(uint64_t) tx;\n+\tRTE_ATOMIC(uint64_t) rx;\n } __rte_cache_aligned;\n \n /* Event vector attributes */\ndiff --git a/examples/l2fwd-event/l2fwd_event.c b/examples/l2fwd-event/l2fwd_event.c\nindex 4b5a032..2247202 100644\n--- a/examples/l2fwd-event/l2fwd_event.c\n+++ b/examples/l2fwd-event/l2fwd_event.c\n@@ -163,8 +163,8 @@\n \tdst_port = rsrc->dst_ports[mbuf->port];\n \n \tif (timer_period > 0)\n-\t\t__atomic_fetch_add(&rsrc->port_stats[mbuf->port].rx,\n-\t\t\t\t1, __ATOMIC_RELAXED);\n+\t\trte_atomic_fetch_add_explicit(&rsrc->port_stats[mbuf->port].rx,\n+\t\t\t\t1, rte_memory_order_relaxed);\n \tmbuf->port = dst_port;\n \n \tif (flags & L2FWD_EVENT_UPDT_MAC)\n@@ -179,8 +179,8 @@\n \t\trte_event_eth_tx_adapter_txq_set(mbuf, 0);\n \n \tif (timer_period > 0)\n-\t\t__atomic_fetch_add(&rsrc->port_stats[mbuf->port].tx,\n-\t\t\t\t1, __ATOMIC_RELAXED);\n+\t\trte_atomic_fetch_add_explicit(&rsrc->port_stats[mbuf->port].tx,\n+\t\t\t\t1, rte_memory_order_relaxed);\n }\n \n static __rte_always_inline void\n@@ -367,8 +367,8 @@\n \t\t\tvec->queue = 0;\n \n \t\tif (timer_period > 0)\n-\t\t\t__atomic_fetch_add(&rsrc->port_stats[mbufs[0]->port].rx,\n-\t\t\t\t\t vec->nb_elem, __ATOMIC_RELAXED);\n+\t\t\trte_atomic_fetch_add_explicit(&rsrc->port_stats[mbufs[0]->port].rx,\n+\t\t\t\t\t vec->nb_elem, rte_memory_order_relaxed);\n \n \t\tfor (i = 0, j = 1; i < vec->nb_elem; i++, j++) {\n \t\t\tif (j < vec->nb_elem)\n@@ -382,14 +382,14 @@\n \t\t}\n \n \t\tif (timer_period > 0)\n-\t\t\t__atomic_fetch_add(&rsrc->port_stats[vec->port].tx,\n-\t\t\t\t\t vec->nb_elem, __ATOMIC_RELAXED);\n+\t\t\trte_atomic_fetch_add_explicit(&rsrc->port_stats[vec->port].tx,\n+\t\t\t\t\t vec->nb_elem, rte_memory_order_relaxed);\n \t} else {\n \t\tfor (i = 0, j = 1; i < vec->nb_elem; i++, j++) {\n \t\t\tif (timer_period > 0)\n-\t\t\t\t__atomic_fetch_add(\n+\t\t\t\trte_atomic_fetch_add_explicit(\n \t\t\t\t\t&rsrc->port_stats[mbufs[i]->port].rx, 1,\n-\t\t\t\t\t__ATOMIC_RELAXED);\n+\t\t\t\t\trte_memory_order_relaxed);\n \n \t\t\tif (j < vec->nb_elem)\n \t\t\t\trte_prefetch0(\n@@ -406,9 +406,9 @@\n \t\t\t\trte_event_eth_tx_adapter_txq_set(mbufs[i], 0);\n \n \t\t\tif (timer_period > 0)\n-\t\t\t\t__atomic_fetch_add(\n+\t\t\t\trte_atomic_fetch_add_explicit(\n \t\t\t\t\t&rsrc->port_stats[mbufs[i]->port].tx, 1,\n-\t\t\t\t\t__ATOMIC_RELAXED);\n+\t\t\t\t\trte_memory_order_relaxed);\n \t\t}\n \t}\n }\ndiff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c\nindex 2653db4..9a094ef 100644\n--- a/examples/l2fwd-jobstats/main.c\n+++ b/examples/l2fwd-jobstats/main.c\n@@ -80,7 +80,7 @@ struct lcore_queue_conf {\n \tstruct rte_jobstats idle_job;\n \tstruct rte_jobstats_context jobs_context;\n \n-\tuint16_t stats_read_pending;\n+\tRTE_ATOMIC(uint16_t) stats_read_pending;\n \trte_spinlock_t lock;\n } __rte_cache_aligned;\n /* >8 End of list of queues to be polled for given lcore. */\n@@ -151,9 +151,9 @@ struct l2fwd_port_statistics {\n \tuint64_t collection_time = rte_get_timer_cycles();\n \n \t/* Ask forwarding thread to give us stats. */\n-\t__atomic_store_n(&qconf->stats_read_pending, 1, __ATOMIC_RELAXED);\n+\trte_atomic_store_explicit(&qconf->stats_read_pending, 1, rte_memory_order_relaxed);\n \trte_spinlock_lock(&qconf->lock);\n-\t__atomic_store_n(&qconf->stats_read_pending, 0, __ATOMIC_RELAXED);\n+\trte_atomic_store_explicit(&qconf->stats_read_pending, 0, rte_memory_order_relaxed);\n \n \t/* Collect context statistics. */\n \tstats_period = ctx->state_time - ctx->start_time;\n@@ -522,8 +522,9 @@ struct l2fwd_port_statistics {\n \t\t\t\trepeats++;\n \t\t\t\tneed_manage = qconf->flush_timer.expire < now;\n \t\t\t\t/* Check if we was esked to give a stats. */\n-\t\t\t\tstats_read_pending = __atomic_load_n(&qconf->stats_read_pending,\n-\t\t\t\t\t\t__ATOMIC_RELAXED);\n+\t\t\t\tstats_read_pending = rte_atomic_load_explicit(\n+\t\t\t\t\t&qconf->stats_read_pending,\n+\t\t\t\t\trte_memory_order_relaxed);\n \t\t\t\tneed_manage |= stats_read_pending;\n \n \t\t\t\tfor (i = 0; i < qconf->n_rx_port && !need_manage; i++)\ndiff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c\nindex f54bb8b..ebfc2fe 100644\n--- a/examples/multi_process/client_server_mp/mp_server/main.c\n+++ b/examples/multi_process/client_server_mp/mp_server/main.c\n@@ -157,12 +157,12 @@ struct client_rx_buf {\n sleep_lcore(__rte_unused void *dummy)\n {\n \t/* Used to pick a display thread - static, so zero-initialised */\n-\tstatic uint32_t display_stats;\n+\tstatic RTE_ATOMIC(uint32_t) display_stats;\n \n \tuint32_t status = 0;\n \t/* Only one core should display stats */\n-\tif (__atomic_compare_exchange_n(&display_stats, &status, 1, 0,\n-\t\t\t__ATOMIC_RELAXED, __ATOMIC_RELAXED)) {\n+\tif (rte_atomic_compare_exchange_strong_explicit(&display_stats, &status, 1,\n+\t\t\trte_memory_order_relaxed, rte_memory_order_relaxed)) {\n \t\tconst unsigned sleeptime = 1;\n \t\tprintf(\"Core %u displaying statistics\\n\", rte_lcore_id());\n \ndiff --git a/examples/server_node_efd/efd_server/main.c b/examples/server_node_efd/efd_server/main.c\nindex fd72882..75ff0ea 100644\n--- a/examples/server_node_efd/efd_server/main.c\n+++ b/examples/server_node_efd/efd_server/main.c\n@@ -177,12 +177,12 @@ struct efd_stats {\n sleep_lcore(__rte_unused void *dummy)\n {\n \t/* Used to pick a display thread - static, so zero-initialised */\n-\tstatic uint32_t display_stats;\n+\tstatic RTE_ATOMIC(uint32_t) display_stats;\n \n \t/* Only one core should display stats */\n \tuint32_t display_init = 0;\n-\tif (__atomic_compare_exchange_n(&display_stats, &display_init, 1, 0,\n-\t\t\t__ATOMIC_RELAXED, __ATOMIC_RELAXED)) {\n+\tif (rte_atomic_compare_exchange_strong_explicit(&display_stats, &display_init, 1,\n+\t\t\trte_memory_order_relaxed, rte_memory_order_relaxed)) {\n \t\tconst unsigned int sleeptime = 1;\n \n \t\tprintf(\"Core %u displaying statistics\\n\", rte_lcore_id());\ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex 3fc1b15..4391d88 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -1052,10 +1052,10 @@ static unsigned check_ports_num(unsigned nb_ports)\n \t}\n \n \tif (enable_stats) {\n-\t\t__atomic_fetch_add(&dst_vdev->stats.rx_total_atomic, 1,\n-\t\t\t\t__ATOMIC_SEQ_CST);\n-\t\t__atomic_fetch_add(&dst_vdev->stats.rx_atomic, ret,\n-\t\t\t\t__ATOMIC_SEQ_CST);\n+\t\trte_atomic_fetch_add_explicit(&dst_vdev->stats.rx_total_atomic, 1,\n+\t\t\t\trte_memory_order_seq_cst);\n+\t\trte_atomic_fetch_add_explicit(&dst_vdev->stats.rx_atomic, ret,\n+\t\t\t\trte_memory_order_seq_cst);\n \t\tsrc_vdev->stats.tx_total++;\n \t\tsrc_vdev->stats.tx += ret;\n \t}\n@@ -1072,10 +1072,10 @@ static unsigned check_ports_num(unsigned nb_ports)\n \tret = vdev_queue_ops[vdev->vid].enqueue_pkt_burst(vdev, VIRTIO_RXQ, m, nr_xmit);\n \n \tif (enable_stats) {\n-\t\t__atomic_fetch_add(&vdev->stats.rx_total_atomic, nr_xmit,\n-\t\t\t\t__ATOMIC_SEQ_CST);\n-\t\t__atomic_fetch_add(&vdev->stats.rx_atomic, ret,\n-\t\t\t\t__ATOMIC_SEQ_CST);\n+\t\trte_atomic_fetch_add_explicit(&vdev->stats.rx_total_atomic, nr_xmit,\n+\t\t\t\trte_memory_order_seq_cst);\n+\t\trte_atomic_fetch_add_explicit(&vdev->stats.rx_atomic, ret,\n+\t\t\t\trte_memory_order_seq_cst);\n \t}\n \n \tif (!dma_bind[vid2socketid[vdev->vid]].dmas[VIRTIO_RXQ].async_enabled) {\n@@ -1404,10 +1404,10 @@ static void virtio_tx_offload(struct rte_mbuf *m)\n \t}\n \n \tif (enable_stats) {\n-\t\t__atomic_fetch_add(&vdev->stats.rx_total_atomic, rx_count,\n-\t\t\t\t__ATOMIC_SEQ_CST);\n-\t\t__atomic_fetch_add(&vdev->stats.rx_atomic, enqueue_count,\n-\t\t\t\t__ATOMIC_SEQ_CST);\n+\t\trte_atomic_fetch_add_explicit(&vdev->stats.rx_total_atomic, rx_count,\n+\t\t\t\trte_memory_order_seq_cst);\n+\t\trte_atomic_fetch_add_explicit(&vdev->stats.rx_atomic, enqueue_count,\n+\t\t\t\trte_memory_order_seq_cst);\n \t}\n \n \tif (!dma_bind[vid2socketid[vdev->vid]].dmas[VIRTIO_RXQ].async_enabled) {\n@@ -1832,10 +1832,10 @@ uint16_t sync_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n \t\t\ttx = vdev->stats.tx;\n \t\t\ttx_dropped = tx_total - tx;\n \n-\t\t\trx_total = __atomic_load_n(&vdev->stats.rx_total_atomic,\n-\t\t\t\t__ATOMIC_SEQ_CST);\n-\t\t\trx = __atomic_load_n(&vdev->stats.rx_atomic,\n-\t\t\t\t__ATOMIC_SEQ_CST);\n+\t\t\trx_total = rte_atomic_load_explicit(&vdev->stats.rx_total_atomic,\n+\t\t\t\trte_memory_order_seq_cst);\n+\t\t\trx = rte_atomic_load_explicit(&vdev->stats.rx_atomic,\n+\t\t\t\trte_memory_order_seq_cst);\n \t\t\trx_dropped = rx_total - rx;\n \n \t\t\tprintf(\"Statistics for device %d\\n\"\ndiff --git a/examples/vhost/main.h b/examples/vhost/main.h\nindex 2fcb837..b163955 100644\n--- a/examples/vhost/main.h\n+++ b/examples/vhost/main.h\n@@ -22,8 +22,8 @@\n struct device_statistics {\n \tuint64_t\ttx;\n \tuint64_t\ttx_total;\n-\tuint64_t\trx_atomic;\n-\tuint64_t\trx_total_atomic;\n+\tRTE_ATOMIC(uint64_t)\trx_atomic;\n+\tRTE_ATOMIC(uint64_t)\trx_total_atomic;\n };\n \n struct vhost_queue {\ndiff --git a/examples/vhost/virtio_net.c b/examples/vhost/virtio_net.c\nindex 514c8e0..55af6e7 100644\n--- a/examples/vhost/virtio_net.c\n+++ b/examples/vhost/virtio_net.c\n@@ -198,7 +198,8 @@\n \tqueue = &dev->queues[queue_id];\n \tvr = &queue->vr;\n \n-\tavail_idx = __atomic_load_n(&vr->avail->idx, __ATOMIC_ACQUIRE);\n+\tavail_idx = rte_atomic_load_explicit((uint16_t __rte_atomic *)&vr->avail->idx,\n+\t rte_memory_order_acquire);\n \tstart_idx = queue->last_used_idx;\n \tfree_entries = avail_idx - start_idx;\n \tcount = RTE_MIN(count, free_entries);\n@@ -231,7 +232,8 @@\n \t\t\trte_prefetch0(&vr->desc[desc_indexes[i+1]]);\n \t}\n \n-\t__atomic_fetch_add(&vr->used->idx, count, __ATOMIC_RELEASE);\n+\trte_atomic_fetch_add_explicit((uint16_t __rte_atomic *)&vr->used->idx, count,\n+\t rte_memory_order_release);\n \tqueue->last_used_idx += count;\n \n \trte_vhost_vring_call(dev->vid, queue_id);\n@@ -386,8 +388,8 @@\n \tqueue = &dev->queues[queue_id];\n \tvr = &queue->vr;\n \n-\tfree_entries = __atomic_load_n(&vr->avail->idx, __ATOMIC_ACQUIRE) -\n-\t\t\tqueue->last_avail_idx;\n+\tfree_entries = rte_atomic_load_explicit((uint16_t __rte_atomic *)&vr->avail->idx,\n+\t rte_memory_order_acquire) - queue->last_avail_idx;\n \tif (free_entries == 0)\n \t\treturn 0;\n \n@@ -442,7 +444,8 @@\n \tqueue->last_avail_idx += i;\n \tqueue->last_used_idx += i;\n \n-\t__atomic_fetch_add(&vr->used->idx, i, __ATOMIC_ACQ_REL);\n+\trte_atomic_fetch_add_explicit((uint16_t __rte_atomic *)&vr->used->idx, i,\n+\t rte_memory_order_acq_rel);\n \n \trte_vhost_vring_call(dev->vid, queue_id);\n \ndiff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c\nindex 376f7b8..03f1ac9 100644\n--- a/examples/vhost_blk/vhost_blk.c\n+++ b/examples/vhost_blk/vhost_blk.c\n@@ -85,9 +85,9 @@ struct vhost_blk_ctrlr *\n \t */\n \tused->ring[used->idx & (vq->vring.size - 1)].id = task->req_idx;\n \tused->ring[used->idx & (vq->vring.size - 1)].len = task->data_len;\n-\trte_atomic_thread_fence(__ATOMIC_SEQ_CST);\n+\trte_atomic_thread_fence(rte_memory_order_seq_cst);\n \tused->idx++;\n-\trte_atomic_thread_fence(__ATOMIC_SEQ_CST);\n+\trte_atomic_thread_fence(rte_memory_order_seq_cst);\n \n \trte_vhost_clr_inflight_desc_split(task->ctrlr->vid,\n \t\tvq->id, used->idx, task->req_idx);\n@@ -111,12 +111,12 @@ struct vhost_blk_ctrlr *\n \tdesc->id = task->buffer_id;\n \tdesc->addr = 0;\n \n-\trte_atomic_thread_fence(__ATOMIC_SEQ_CST);\n+\trte_atomic_thread_fence(rte_memory_order_seq_cst);\n \tif (vq->used_wrap_counter)\n \t\tdesc->flags |= VIRTQ_DESC_F_AVAIL | VIRTQ_DESC_F_USED;\n \telse\n \t\tdesc->flags &= ~(VIRTQ_DESC_F_AVAIL | VIRTQ_DESC_F_USED);\n-\trte_atomic_thread_fence(__ATOMIC_SEQ_CST);\n+\trte_atomic_thread_fence(rte_memory_order_seq_cst);\n \n \trte_vhost_clr_inflight_desc_packed(task->ctrlr->vid, vq->id,\n \t\t\t\t\t task->inflight_idx);\ndiff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c\nindex 5fef268..d384c86 100644\n--- a/examples/vm_power_manager/channel_monitor.c\n+++ b/examples/vm_power_manager/channel_monitor.c\n@@ -828,8 +828,9 @@ void channel_monitor_exit(void)\n \t\treturn -1;\n \n \tuint32_t channel_connected = CHANNEL_MGR_CHANNEL_CONNECTED;\n-\tif (__atomic_compare_exchange_n(&(chan_info->status), &channel_connected,\n-\t\tCHANNEL_MGR_CHANNEL_PROCESSING, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED) == 0)\n+\tif (rte_atomic_compare_exchange_strong_explicit(&(chan_info->status), &channel_connected,\n+\t\tCHANNEL_MGR_CHANNEL_PROCESSING, rte_memory_order_relaxed,\n+\t\t rte_memory_order_relaxed) == 0)\n \t\treturn -1;\n \n \tif (pkt->command == RTE_POWER_CPU_POWER) {\n@@ -934,8 +935,8 @@ void channel_monitor_exit(void)\n \t * from management thread\n \t */\n \tuint32_t channel_processing = CHANNEL_MGR_CHANNEL_PROCESSING;\n-\t__atomic_compare_exchange_n(&(chan_info->status), &channel_processing,\n-\t\tCHANNEL_MGR_CHANNEL_CONNECTED, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED);\n+\trte_atomic_compare_exchange_strong_explicit(&(chan_info->status), &channel_processing,\n+\t\tCHANNEL_MGR_CHANNEL_CONNECTED, rte_memory_order_relaxed, rte_memory_order_relaxed);\n \treturn 0;\n \n }\n", "prefixes": [ "v3", "39/45" ] }