Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138885/?format=api
{ "id": 138885, "url": "http://patches.dpdk.org/api/patches/138885/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1711579078-10624-11-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-11-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1711579078-10624-11-git-send-email-roretzla@linux.microsoft.com", "date": "2024-03-27T22:37:23", "name": "[v3,10/45] net/octeon_ep: use rte stdatomic API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "84ee8157479b636568c75d1808a559408cbd9dd4", "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-11-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/138885/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/138885/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 72DF743D55;\n\tWed, 27 Mar 2024 23:39:04 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 07CD242831;\n\tWed, 27 Mar 2024 23:38:18 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id 41CFA402C0\n for <dev@dpdk.org>; Wed, 27 Mar 2024 23:38:02 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id 8137620E6AC1; Wed, 27 Mar 2024 15:38:00 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com 8137620E6AC1", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1711579080;\n bh=4gwEltKQqewbDE3XEuj2/KXfdyfHudjAa5YRv2GBZF0=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=n0QBKhQNiQmoNV8CjxPwSveU5W+Gd9NPYscJZ/k2kY0IBinc63Te9x6AmBwnl2/Ui\n KuUqJH5en0WfkAdTjOKpBV583Ibejij+TmLizc2ojJbxsDqbAPZ3uFYuo6u/u6I/z+\n waCOD/z86ERnE7o5934xuzahJ+YDU0xVoqqfhzg8=", "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 10/45] net/octeon_ep: use rte stdatomic API", "Date": "Wed, 27 Mar 2024 15:37:23 -0700", "Message-Id": "<1711579078-10624-11-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 drivers/net/octeon_ep/cnxk_ep_rx.h | 5 +++--\n drivers/net/octeon_ep/cnxk_ep_tx.c | 5 +++--\n drivers/net/octeon_ep/cnxk_ep_vf.c | 8 ++++----\n drivers/net/octeon_ep/otx2_ep_vf.c | 8 ++++----\n drivers/net/octeon_ep/otx_ep_common.h | 4 ++--\n drivers/net/octeon_ep/otx_ep_rxtx.c | 6 ++++--\n 6 files changed, 20 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/octeon_ep/cnxk_ep_rx.h b/drivers/net/octeon_ep/cnxk_ep_rx.h\nindex ecf95cd..9422042 100644\n--- a/drivers/net/octeon_ep/cnxk_ep_rx.h\n+++ b/drivers/net/octeon_ep/cnxk_ep_rx.h\n@@ -98,7 +98,7 @@\n \t * This adds an extra local variable, but almost halves the\n \t * number of PCIe writes.\n \t */\n-\tval = __atomic_load_n(droq->pkts_sent_ism, __ATOMIC_RELAXED);\n+\tval = rte_atomic_load_explicit(droq->pkts_sent_ism, rte_memory_order_relaxed);\n \n \tnew_pkts = val - droq->pkts_sent_prev;\n \tdroq->pkts_sent_prev = val;\n@@ -111,7 +111,8 @@\n \t\trte_mb();\n \n \t\trte_write64(OTX2_SDP_REQUEST_ISM, droq->pkts_sent_reg);\n-\t\twhile (__atomic_load_n(droq->pkts_sent_ism, __ATOMIC_RELAXED) >= val) {\n+\t\twhile (rte_atomic_load_explicit(droq->pkts_sent_ism,\n+\t\t rte_memory_order_relaxed) >= val) {\n \t\t\trte_write64(OTX2_SDP_REQUEST_ISM, droq->pkts_sent_reg);\n \t\t\trte_mb();\n \t\t}\ndiff --git a/drivers/net/octeon_ep/cnxk_ep_tx.c b/drivers/net/octeon_ep/cnxk_ep_tx.c\nindex 233c8aa..e093140 100644\n--- a/drivers/net/octeon_ep/cnxk_ep_tx.c\n+++ b/drivers/net/octeon_ep/cnxk_ep_tx.c\n@@ -15,7 +15,7 @@\n \t * This adds an extra local variable, but almost halves the\n \t * number of PCIe writes.\n \t */\n-\tval = __atomic_load_n(iq->inst_cnt_ism, __ATOMIC_RELAXED);\n+\tval = rte_atomic_load_explicit(iq->inst_cnt_ism, rte_memory_order_relaxed);\n \tiq->inst_cnt += val - iq->inst_cnt_prev;\n \tiq->inst_cnt_prev = val;\n \n@@ -27,7 +27,8 @@\n \t\trte_mb();\n \n \t\trte_write64(OTX2_SDP_REQUEST_ISM, iq->inst_cnt_reg);\n-\t\twhile (__atomic_load_n(iq->inst_cnt_ism, __ATOMIC_RELAXED) >= val) {\n+\t\twhile (rte_atomic_load_explicit(iq->inst_cnt_ism,\n+\t\t rte_memory_order_relaxed) >= val) {\n \t\t\trte_write64(OTX2_SDP_REQUEST_ISM, iq->inst_cnt_reg);\n \t\t\trte_mb();\n \t\t}\ndiff --git a/drivers/net/octeon_ep/cnxk_ep_vf.c b/drivers/net/octeon_ep/cnxk_ep_vf.c\nindex 39f357e..39b28de 100644\n--- a/drivers/net/octeon_ep/cnxk_ep_vf.c\n+++ b/drivers/net/octeon_ep/cnxk_ep_vf.c\n@@ -150,10 +150,10 @@\n \trte_write64(ism_addr, (uint8_t *)otx_ep->hw_addr +\n \t\t CNXK_EP_R_IN_CNTS_ISM(iq_no));\n \tiq->inst_cnt_ism =\n-\t\t(uint32_t *)((uint8_t *)otx_ep->ism_buffer_mz->addr\n+\t\t(uint32_t __rte_atomic *)((uint8_t *)otx_ep->ism_buffer_mz->addr\n \t\t\t + CNXK_EP_IQ_ISM_OFFSET(iq_no));\n \totx_ep_err(\"SDP_R[%d] INST Q ISM virt: %p, dma: 0x%\" PRIX64, iq_no,\n-\t\t (void *)iq->inst_cnt_ism, ism_addr);\n+\t\t (void *)(uintptr_t)iq->inst_cnt_ism, ism_addr);\n \t*iq->inst_cnt_ism = 0;\n \tiq->inst_cnt_prev = 0;\n \tiq->partial_ih = ((uint64_t)otx_ep->pkind) << 36;\n@@ -235,10 +235,10 @@\n \trte_write64(ism_addr, (uint8_t *)otx_ep->hw_addr +\n \t\t CNXK_EP_R_OUT_CNTS_ISM(oq_no));\n \tdroq->pkts_sent_ism =\n-\t\t(uint32_t *)((uint8_t *)otx_ep->ism_buffer_mz->addr\n+\t\t(uint32_t __rte_atomic *)((uint8_t *)otx_ep->ism_buffer_mz->addr\n \t\t\t + CNXK_EP_OQ_ISM_OFFSET(oq_no));\n \totx_ep_err(\"SDP_R[%d] OQ ISM virt: %p dma: 0x%\" PRIX64,\n-\t\t oq_no, (void *)droq->pkts_sent_ism, ism_addr);\n+\t\t oq_no, (void *)(uintptr_t)droq->pkts_sent_ism, ism_addr);\n \t*droq->pkts_sent_ism = 0;\n \tdroq->pkts_sent_prev = 0;\n \ndiff --git a/drivers/net/octeon_ep/otx2_ep_vf.c b/drivers/net/octeon_ep/otx2_ep_vf.c\nindex 25e0e5a..2aeebb4 100644\n--- a/drivers/net/octeon_ep/otx2_ep_vf.c\n+++ b/drivers/net/octeon_ep/otx2_ep_vf.c\n@@ -300,10 +300,10 @@ static int otx2_vf_enable_rxq_intr(struct otx_ep_device *otx_epvf,\n \toct_ep_write64(ism_addr, (uint8_t *)otx_ep->hw_addr +\n \t\t SDP_VF_R_IN_CNTS_ISM(iq_no));\n \tiq->inst_cnt_ism =\n-\t\t(uint32_t *)((uint8_t *)otx_ep->ism_buffer_mz->addr\n+\t\t(uint32_t __rte_atomic *)((uint8_t *)otx_ep->ism_buffer_mz->addr\n \t\t\t + OTX2_EP_IQ_ISM_OFFSET(iq_no));\n \totx_ep_err(\"SDP_R[%d] INST Q ISM virt: %p, dma: 0x%x\", iq_no,\n-\t\t (void *)iq->inst_cnt_ism,\n+\t\t (void *)(uintptr_t)iq->inst_cnt_ism,\n \t\t (unsigned int)ism_addr);\n \t*iq->inst_cnt_ism = 0;\n \tiq->inst_cnt_prev = 0;\n@@ -386,10 +386,10 @@ static int otx2_vf_enable_rxq_intr(struct otx_ep_device *otx_epvf,\n \toct_ep_write64(ism_addr, (uint8_t *)otx_ep->hw_addr +\n \t\t SDP_VF_R_OUT_CNTS_ISM(oq_no));\n \tdroq->pkts_sent_ism =\n-\t\t(uint32_t *)((uint8_t *)otx_ep->ism_buffer_mz->addr\n+\t\t(uint32_t __rte_atomic *)((uint8_t *)otx_ep->ism_buffer_mz->addr\n \t\t\t + OTX2_EP_OQ_ISM_OFFSET(oq_no));\n \totx_ep_err(\"SDP_R[%d] OQ ISM virt: %p, dma: 0x%x\", oq_no,\n-\t\t (void *)droq->pkts_sent_ism,\n+\t\t (void *)(uintptr_t)droq->pkts_sent_ism,\n \t\t (unsigned int)ism_addr);\n \t*droq->pkts_sent_ism = 0;\n \tdroq->pkts_sent_prev = 0;\ndiff --git a/drivers/net/octeon_ep/otx_ep_common.h b/drivers/net/octeon_ep/otx_ep_common.h\nindex 7776940..73eb0c9 100644\n--- a/drivers/net/octeon_ep/otx_ep_common.h\n+++ b/drivers/net/octeon_ep/otx_ep_common.h\n@@ -218,7 +218,7 @@ struct otx_ep_iq_config {\n */\n struct otx_ep_instr_queue {\n \t/* Location in memory updated by SDP ISM */\n-\tuint32_t *inst_cnt_ism;\n+\tRTE_ATOMIC(uint32_t) *inst_cnt_ism;\n \tstruct rte_mbuf **mbuf_list;\n \t/* Pointer to the Virtual Base addr of the input ring. */\n \tuint8_t *base_addr;\n@@ -413,7 +413,7 @@ struct otx_ep_droq {\n \tuint8_t ism_ena;\n \n \t/* Pointer to host memory copy of output packet count, set by ISM */\n-\tuint32_t *pkts_sent_ism;\n+\tRTE_ATOMIC(uint32_t) *pkts_sent_ism;\n \tuint32_t pkts_sent_prev;\n \n \t/* Statistics for this DROQ. */\ndiff --git a/drivers/net/octeon_ep/otx_ep_rxtx.c b/drivers/net/octeon_ep/otx_ep_rxtx.c\nindex 59144e0..eb2d8c1 100644\n--- a/drivers/net/octeon_ep/otx_ep_rxtx.c\n+++ b/drivers/net/octeon_ep/otx_ep_rxtx.c\n@@ -475,7 +475,8 @@\n \t\trte_mb();\n \n \t\trte_write64(OTX2_SDP_REQUEST_ISM, iq->inst_cnt_reg);\n-\t\twhile (__atomic_load_n(iq->inst_cnt_ism, __ATOMIC_RELAXED) >= val) {\n+\t\twhile (rte_atomic_load_explicit(iq->inst_cnt_ism,\n+\t\t rte_memory_order_relaxed) >= val) {\n \t\t\trte_write64(OTX2_SDP_REQUEST_ISM, iq->inst_cnt_reg);\n \t\t\trte_mb();\n \t\t}\n@@ -871,7 +872,8 @@\n \t\trte_mb();\n \n \t\trte_write64(OTX2_SDP_REQUEST_ISM, droq->pkts_sent_reg);\n-\t\twhile (__atomic_load_n(droq->pkts_sent_ism, __ATOMIC_RELAXED) >= val) {\n+\t\twhile (rte_atomic_load_explicit(droq->pkts_sent_ism,\n+\t\t rte_memory_order_relaxed) >= val) {\n \t\t\trte_write64(OTX2_SDP_REQUEST_ISM, droq->pkts_sent_reg);\n \t\t\trte_mb();\n \t\t}\n", "prefixes": [ "v3", "10/45" ] }