Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/137304/?format=api
{ "id": 137304, "url": "http://patches.dpdk.org/api/patches/137304/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1709012499-12813-6-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": "<1709012499-12813-6-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1709012499-12813-6-git-send-email-roretzla@linux.microsoft.com", "date": "2024-02-27T05:41:21", "name": "[v6,05/23] net/cnxk: use mbuf descriptor accessors", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8dca552db1a3eb440ad3cf8b225f603a6377ca93", "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/1709012499-12813-6-git-send-email-roretzla@linux.microsoft.com/mbox/", "series": [ { "id": 31232, "url": "http://patches.dpdk.org/api/series/31232/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31232", "date": "2024-02-27T05:41:17", "name": "stop and remove RTE_MARKER typedefs", "version": 6, "mbox": "http://patches.dpdk.org/series/31232/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/137304/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/137304/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 684F543C03;\n\tTue, 27 Feb 2024 06:43:11 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id EBE2C42EB2;\n\tTue, 27 Feb 2024 06:42:24 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id B63BA42E2F\n for <dev@dpdk.org>; Tue, 27 Feb 2024 06:41:42 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id EB32520B74C5; Mon, 26 Feb 2024 21:41:40 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com EB32520B74C5", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1709012500;\n bh=lTb/MuC4tCyMyqvfN1bTbytcn6b1tLOZPYxamh2q+Io=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=XktjM8H+5FcbYG4sSt4eUTgCkZla9zDO7fCtYUXRwmbnZIsonuKu74FWUZzScyo4s\n 2nR8XHm3R6IWCUHqWr2+2fGhDfer3ZPC2buc+WXKo2/kVCAIznSuGD8/gmqFzCP00p\n xgDrRe2ZzFnSv6lXBdqtpM9ngHitAXQG1IOSIZzA=", "From": "Tyler Retzlaff <roretzla@linux.microsoft.com>", "To": "dev@dpdk.org", "Cc": "Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Andrew Boyer <andrew.boyer@amd.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Chenbo Xia <chenbox@nvidia.com>, Chengwen Feng <fengchengwen@huawei.com>,\n Dariusz Sosnowski <dsosnowski@nvidia.com>,\n David Christensen <drc@linux.vnet.ibm.com>,\n Hyong Youb Kim <hyonkim@cisco.com>, Jerin Jacob <jerinj@marvell.com>,\n Jie Hai <haijie1@huawei.com>, Jingjing Wu <jingjing.wu@intel.com>,\n John Daley <johndale@cisco.com>, Kevin Laatz <kevin.laatz@intel.com>,\n Kiran Kumar K <kirankumark@marvell.com>,\n Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,\n Maciej Czekaj <mczekaj@marvell.com>, Matan Azrad <matan@nvidia.com>,\n Maxime Coquelin <maxime.coquelin@redhat.com>,\n Nithin Dabilpuram <ndabilpuram@marvell.com>, Ori Kam <orika@nvidia.com>,\n Ruifeng Wang <ruifeng.wang@arm.com>, Satha Rao <skoteshwar@marvell.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Suanming Mou <suanmingm@nvidia.com>, Sunil Kumar Kori <skori@marvell.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>,\n Yisen Zhuang <yisen.zhuang@huawei.com>,\n Yuying Zhang <Yuying.Zhang@intel.com>, mb@smartsharesystems.com,\n Tyler Retzlaff <roretzla@linux.microsoft.com>", "Subject": "[PATCH v6 05/23] net/cnxk: use mbuf descriptor accessors", "Date": "Mon, 26 Feb 2024 21:41:21 -0800", "Message-Id": "<1709012499-12813-6-git-send-email-roretzla@linux.microsoft.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1709012499-12813-1-git-send-email-roretzla@linux.microsoft.com>", "References": "<1706657173-26166-1-git-send-email-roretzla@linux.microsoft.com>\n <1709012499-12813-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": "RTE_MARKER typedefs are a GCC extension unsupported by MSVC. Use\nnew rte_mbuf_rearm_data and rte_mbuf_rx_descriptor_fields1 accessors\nthat provide a compatible type pointer without using the marker fields.\n\nSigned-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>\n---\n drivers/net/cnxk/cn10k_rx.h | 36 ++++++++++++++++++------------------\n drivers/net/cnxk/cn9k_rx.h | 20 ++++++++++----------\n drivers/net/cnxk/cnxk_ethdev.c | 2 +-\n 3 files changed, 29 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h\nindex 7bb4c86..4bfb323 100644\n--- a/drivers/net/cnxk/cn10k_rx.h\n+++ b/drivers/net/cnxk/cn10k_rx.h\n@@ -309,7 +309,7 @@\n \t\tfrag_rx = (union nix_rx_parse_u *)(wqe + 1);\n \t\tfrag_size = rlen + frag_rx->lcptr - frag_rx->laptr;\n \n-\t\t*(uint64_t *)(&mbuf->rearm_data) = mbuf_init;\n+\t\t*rte_mbuf_rearm_data(mbuf) = mbuf_init;\n \t\tmbuf->data_len = frag_size;\n \t\tmbuf->pkt_len = frag_size;\n \t\tmbuf->ol_flags = ol_flags;\n@@ -368,7 +368,7 @@\n \tfsz_w1 >>= 16;\n \n \tdata_off = b_off + frag_rx->lcptr + l3_hdr_size;\n-\t*(uint64_t *)(&mbuf->rearm_data) = mbuf_init | data_off;\n+\t*rte_mbuf_rearm_data(mbuf) = mbuf_init | data_off;\n \tmbuf->data_len = frag_size;\n \n \t/* Mark frag as get */\n@@ -384,7 +384,7 @@\n \t\tfsz_w1 >>= 16;\n \n \t\tdata_off = b_off + frag_rx->lcptr + l3_hdr_size;\n-\t\t*(uint64_t *)(&mbuf->rearm_data) = mbuf_init | data_off;\n+\t\t*rte_mbuf_rearm_data(mbuf) = mbuf_init | data_off;\n \t\tmbuf->data_len = frag_size;\n \n \t\t/* Mark frag as get */\n@@ -401,7 +401,7 @@\n \t\tfsz_w1 >>= 16;\n \n \t\tdata_off = b_off + frag_rx->lcptr + l3_hdr_size;\n-\t\t*(uint64_t *)(&mbuf->rearm_data) = mbuf_init | data_off;\n+\t\t*rte_mbuf_rearm_data(mbuf) = mbuf_init | data_off;\n \t\tmbuf->data_len = frag_size;\n \n \t\t/* Mark frag as get */\n@@ -502,7 +502,7 @@\n \n \tinner->pkt_len = len;\n \tinner->data_len = len;\n-\t*(uint64_t *)(&inner->rearm_data) = mbuf_init;\n+\t*rte_mbuf_rearm_data(inner) = mbuf_init;\n \n \tinner->ol_flags = ((CPT_COMP_HWGOOD_MASK & (1U << ucc)) ?\n \t\t\t RTE_MBUF_F_RX_SEC_OFFLOAD :\n@@ -584,7 +584,7 @@\n \t\t\t/* First frag len */\n \t\t\tinner->pkt_len = vgetq_lane_u16(*rx_desc_field1, 2);\n \t\t\tinner->data_len = vgetq_lane_u16(*rx_desc_field1, 4);\n-\t\t\tp = (uintptr_t)&inner->rearm_data;\n+\t\t\tp = (uintptr_t)rte_mbuf_rearm_data(inner);\n \t\t\t*(uint64_t *)p = mbuf_init;\n \n \t\t\t/* Reassembly success */\n@@ -774,7 +774,7 @@\n \n \t\tmbuf->data_len = sg_len;\n \t\tsg = sg >> 16;\n-\t\tp = (uintptr_t)&mbuf->rearm_data;\n+\t\tp = (uintptr_t)rte_mbuf_rearm_data(mbuf);\n \t\t*(uint64_t *)p = rearm & ~0xFFFF;\n \t\tnb_segs--;\n \t\tiova_list++;\n@@ -825,7 +825,7 @@\n \t\t\thead->nb_segs = nb_segs;\n \t\t}\n \t\tmbuf = next_frag;\n-\t\tp = (uintptr_t)&mbuf->rearm_data;\n+\t\tp = (uintptr_t)rte_mbuf_rearm_data(mbuf);\n \t\t*(uint64_t *)p = rearm + ldptr;\n \t\tmbuf->data_len = (sg & 0xFFFF) - ldptr -\n \t\t\t\t (flags & NIX_RX_OFFLOAD_TSTAMP_F ?\n@@ -849,7 +849,7 @@\n \n \n \t\tlen = mbuf->pkt_len;\n-\t\tp = (uintptr_t)&mbuf->rearm_data;\n+\t\tp = (uintptr_t)rte_mbuf_rearm_data(mbuf);\n \t\t*(uint64_t *)p = rearm;\n \t\tmbuf->data_len = (sg & 0xFFFF) -\n \t\t\t\t (flags & NIX_RX_OFFLOAD_TSTAMP_F ?\n@@ -917,7 +917,7 @@\n \t\tmbuf->ol_flags = ol_flags;\n \t\tmbuf->pkt_len = len;\n \t\tmbuf->data_len = len;\n-\t\tp = (uintptr_t)&mbuf->rearm_data;\n+\t\tp = (uintptr_t)rte_mbuf_rearm_data(mbuf);\n \t\t*(uint64_t *)p = val;\n \t}\n \n@@ -1966,16 +1966,16 @@\n \t\trearm3 = vsetq_lane_u64(ol_flags3, rearm3, 1);\n \n \t\t/* Update rx_descriptor_fields1 */\n-\t\tvst1q_u64((uint64_t *)mbuf0->rx_descriptor_fields1, f0);\n-\t\tvst1q_u64((uint64_t *)mbuf1->rx_descriptor_fields1, f1);\n-\t\tvst1q_u64((uint64_t *)mbuf2->rx_descriptor_fields1, f2);\n-\t\tvst1q_u64((uint64_t *)mbuf3->rx_descriptor_fields1, f3);\n+\t\tvst1q_u64((uint64_t *)rte_mbuf_rx_descriptor_fields1(mbuf0), f0);\n+\t\tvst1q_u64((uint64_t *)rte_mbuf_rx_descriptor_fields1(mbuf1), f1);\n+\t\tvst1q_u64((uint64_t *)rte_mbuf_rx_descriptor_fields1(mbuf2), f2);\n+\t\tvst1q_u64((uint64_t *)rte_mbuf_rx_descriptor_fields1(mbuf3), f3);\n \n \t\t/* Update rearm_data */\n-\t\tvst1q_u64((uint64_t *)mbuf0->rearm_data, rearm0);\n-\t\tvst1q_u64((uint64_t *)mbuf1->rearm_data, rearm1);\n-\t\tvst1q_u64((uint64_t *)mbuf2->rearm_data, rearm2);\n-\t\tvst1q_u64((uint64_t *)mbuf3->rearm_data, rearm3);\n+\t\tvst1q_u64(rte_mbuf_rearm_data(mbuf0), rearm0);\n+\t\tvst1q_u64(rte_mbuf_rearm_data(mbuf1), rearm1);\n+\t\tvst1q_u64(rte_mbuf_rearm_data(mbuf2), rearm2);\n+\t\tvst1q_u64(rte_mbuf_rearm_data(mbuf3), rearm3);\n \n \t\tif (flags & NIX_RX_MULTI_SEG_F) {\n \t\t\t/* Multi segment is enable build mseg list for\ndiff --git a/drivers/net/cnxk/cn9k_rx.h b/drivers/net/cnxk/cn9k_rx.h\nindex d8bb65c..f1212f8 100644\n--- a/drivers/net/cnxk/cn9k_rx.h\n+++ b/drivers/net/cnxk/cn9k_rx.h\n@@ -155,7 +155,7 @@\n \n \t\tmbuf->data_len = sg & 0xFFFF;\n \t\tsg = sg >> 16;\n-\t\t*(uint64_t *)(&mbuf->rearm_data) = rearm;\n+\t\t*rte_mbuf_rearm_data(mbuf) = rearm;\n \t\tnb_segs--;\n \t\tiova_list++;\n \n@@ -398,7 +398,7 @@\n \t\t\tnix_update_match_id(rx->cn9k.match_id, ol_flags, mbuf);\n \n \tmbuf->ol_flags = ol_flags;\n-\t*(uint64_t *)(&mbuf->rearm_data) = val;\n+\t*rte_mbuf_rearm_data(mbuf) = val;\n \tmbuf->pkt_len = len;\n \tmbuf->data_len = len;\n \n@@ -799,16 +799,16 @@\n \t\trearm3 = vsetq_lane_u64(ol_flags3, rearm3, 1);\n \n \t\t/* Update rx_descriptor_fields1 */\n-\t\tvst1q_u64((uint64_t *)mbuf0->rx_descriptor_fields1, f0);\n-\t\tvst1q_u64((uint64_t *)mbuf1->rx_descriptor_fields1, f1);\n-\t\tvst1q_u64((uint64_t *)mbuf2->rx_descriptor_fields1, f2);\n-\t\tvst1q_u64((uint64_t *)mbuf3->rx_descriptor_fields1, f3);\n+\t\tvst1q_u64((uint64_t *)rte_mbuf_rx_descriptor_fields1(mbuf0), f0);\n+\t\tvst1q_u64((uint64_t *)rte_mbuf_rx_descriptor_fields1(mbuf1), f1);\n+\t\tvst1q_u64((uint64_t *)rte_mbuf_rx_descriptor_fields1(mbuf2), f2);\n+\t\tvst1q_u64((uint64_t *)rte_mbuf_rx_descriptor_fields1(mbuf3), f3);\n \n \t\t/* Update rearm_data */\n-\t\tvst1q_u64((uint64_t *)mbuf0->rearm_data, rearm0);\n-\t\tvst1q_u64((uint64_t *)mbuf1->rearm_data, rearm1);\n-\t\tvst1q_u64((uint64_t *)mbuf2->rearm_data, rearm2);\n-\t\tvst1q_u64((uint64_t *)mbuf3->rearm_data, rearm3);\n+\t\tvst1q_u64(rte_mbuf_rearm_data(mbuf0), rearm0);\n+\t\tvst1q_u64(rte_mbuf_rearm_data(mbuf1), rearm1);\n+\t\tvst1q_u64(rte_mbuf_rearm_data(mbuf2), rearm2);\n+\t\tvst1q_u64(rte_mbuf_rearm_data(mbuf3), rearm3);\n \n \t\tif (flags & NIX_RX_MULTI_SEG_F) {\n \t\t\t/* Multi segment is enable build mseg list for\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c\nindex 2372a4e..14f6b7c 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.c\n+++ b/drivers/net/cnxk/cnxk_ethdev.c\n@@ -437,7 +437,7 @@\n \n \t/* Prevent compiler reordering: rearm_data covers previous fields */\n \trte_compiler_barrier();\n-\ttmp = (uint64_t *)&mb_def.rearm_data;\n+\ttmp = rte_mbuf_rearm_data(&mb_def);\n \n \treturn *tmp;\n }\n", "prefixes": [ "v6", "05/23" ] }