Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/137296/?format=api
{ "id": 137296, "url": "http://patches.dpdk.org/api/patches/137296/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1709012499-12813-4-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-4-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1709012499-12813-4-git-send-email-roretzla@linux.microsoft.com", "date": "2024-02-27T05:41:19", "name": "[v6,03/23] common/idpf: use mbuf descriptor accessors", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "292d9bf414b2b0f7cfdddfc622c9085717f715bc", "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-4-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/137296/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/137296/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 E355B43C03;\n\tTue, 27 Feb 2024 06:42:21 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 20352402B2;\n\tTue, 27 Feb 2024 06:42:13 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id B0146402B2\n for <dev@dpdk.org>; Tue, 27 Feb 2024 06:41:41 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id CEA5020B74C3; Mon, 26 Feb 2024 21:41:40 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com CEA5020B74C3", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1709012500;\n bh=3zEzVolRJmbWvBEOd3sMBl19ZxVX27jSMrbHklt/Aag=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=hFH2+CLSJTmjz5pzWh2Ok7cDr1NT8wisu2wsfpqNiT42YWby4OgUBEhOWVEYnuv6U\n YEGm0NbP/vRMCXrMABIoTIRPAM9T9sAukjry7LFusIIBVRMdcIQ7ILlLQGtdNv787A\n 3mmuecXbVJTpFaxbLnBhi1LZyhkwF/pAyT/B0+FI=", "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 03/23] common/idpf: use mbuf descriptor accessors", "Date": "Mon, 26 Feb 2024 21:41:19 -0800", "Message-Id": "<1709012499-12813-4-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/common/idpf/idpf_common_rxtx.c | 4 +-\n drivers/common/idpf/idpf_common_rxtx_avx512.c | 73 +++++++--------------------\n 2 files changed, 18 insertions(+), 59 deletions(-)", "diff": "diff --git a/drivers/common/idpf/idpf_common_rxtx.c b/drivers/common/idpf/idpf_common_rxtx.c\nindex 83b131e..62ddf2e 100644\n--- a/drivers/common/idpf/idpf_common_rxtx.c\n+++ b/drivers/common/idpf/idpf_common_rxtx.c\n@@ -1595,7 +1595,6 @@\n static inline int\n idpf_rxq_vec_setup_default(struct idpf_rx_queue *rxq)\n {\n-\tuintptr_t p;\n \tstruct rte_mbuf mb_def = { .buf_addr = 0 }; /* zeroed mbuf */\n \n \tmb_def.nb_segs = 1;\n@@ -1605,8 +1604,7 @@\n \n \t/* prevent compiler reordering: rearm_data covers previous fields */\n \trte_compiler_barrier();\n-\tp = (uintptr_t)&mb_def.rearm_data;\n-\trxq->mbuf_initializer = *(uint64_t *)p;\n+\trxq->mbuf_initializer = *rte_mbuf_rearm_data(&mb_def);\n \treturn 0;\n }\n \ndiff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c\nindex f65e8d5..f9e2939 100644\n--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c\n+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c\n@@ -307,19 +307,6 @@\n \t\t\t\t\t/* octet 15~14, low 16 bits pkt_len */\n \t\t\t 0xFFFFFFFF /* pkt_type set as unknown */\n \t\t\t);\n-\t/**\n-\t * compile-time check the shuffle layout is correct.\n-\t * NOTE: the first field (lowest address) is given last in set_epi\n-\t * calls above.\n-\t */\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=\n-\t\t\t offsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=\n-\t\t\t offsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, vlan_tci) !=\n-\t\t\t offsetof(struct rte_mbuf, rx_descriptor_fields1) + 10);\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash) !=\n-\t\t\t offsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);\n \n \tuint16_t i, received;\n \n@@ -455,13 +442,7 @@\n \t\t * add in the previously computed rx_descriptor fields to\n \t\t * make a single 256-bit write per mbuf\n \t\t */\n-\t\t/* check the structure matches expectations */\n-\t\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, ol_flags) !=\n-\t\t\t\t offsetof(struct rte_mbuf, rearm_data) + 8);\n-\t\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, rearm_data) !=\n-\t\t\t\t RTE_ALIGN(offsetof(struct rte_mbuf,\n-\t\t\t\t\t\t rearm_data),\n-\t\t\t\t\t\t 16));\n+\n \t\t/* build up data and do writes */\n \t\t__m256i rearm0, rearm1, rearm2, rearm3, rearm4, rearm5,\n \t\t\trearm6, rearm7;\n@@ -476,13 +457,13 @@\n \t\trearm0 = _mm256_permute2f128_si256(mbuf_init, mb0_1, 0x20);\n \n \t\t/* write to mbuf */\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 6]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 6]),\n \t\t\t\t rearm6);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 4]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 4]),\n \t\t\t\t rearm4);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 2]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 2]),\n \t\t\t\t rearm2);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 0]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 0]),\n \t\t\t\t rearm0);\n \n \t\trearm7 = _mm256_blend_epi32(mbuf_init, mb6_7, 0xF0);\n@@ -491,13 +472,13 @@\n \t\trearm1 = _mm256_blend_epi32(mbuf_init, mb0_1, 0xF0);\n \n \t\t/* again write to mbufs */\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 7]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 7]),\n \t\t\t\t rearm7);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 5]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 5]),\n \t\t\t\t rearm5);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 3]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 3]),\n \t\t\t\t rearm3);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 1]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 1]),\n \t\t\t\t rearm1);\n \n \t\t/* perform dd_check */\n@@ -768,19 +749,6 @@\n \t\t\t\t\t/* octet 15~14, low 16 bits pkt_len */\n \t\t\t 0xFFFFFFFF /* pkt_type set as unknown */\n \t\t\t);\n-\t/**\n-\t * compile-time check the above crc and shuffle layout is correct.\n-\t * NOTE: the first field (lowest address) is given last in set_epi\n-\t * calls above.\n-\t */\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=\n-\t\t\t offsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=\n-\t\t\t offsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, vlan_tci) !=\n-\t\t\t offsetof(struct rte_mbuf, rx_descriptor_fields1) + 10);\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash) !=\n-\t\t\t offsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);\n \n \tuint16_t i, received;\n \n@@ -915,13 +883,6 @@\n \t\t * add in the previously computed rx_descriptor fields to\n \t\t * make a single 256-bit write per mbuf\n \t\t */\n-\t\t/* check the structure matches expectations */\n-\t\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, ol_flags) !=\n-\t\t\t\t offsetof(struct rte_mbuf, rearm_data) + 8);\n-\t\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, rearm_data) !=\n-\t\t\t\t RTE_ALIGN(offsetof(struct rte_mbuf,\n-\t\t\t\t\t\t rearm_data),\n-\t\t\t\t\t\t 16));\n \t\t\t\t/* build up data and do writes */\n \t\t__m256i rearm0, rearm1, rearm2, rearm3, rearm4, rearm5,\n \t\t\trearm6, rearm7;\n@@ -936,13 +897,13 @@\n \t\trearm0 = _mm256_permute2f128_si256(mbuf_init, mb0_1, 0x20);\n \n \t\t/* write to mbuf */\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 6]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 6]),\n \t\t\t\t rearm6);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 4]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 4]),\n \t\t\t\t rearm4);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 2]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 2]),\n \t\t\t\t rearm2);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 0]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 0]),\n \t\t\t\t rearm0);\n \n \t\trearm7 = _mm256_blend_epi32(mbuf_init, mb6_7, 0xF0);\n@@ -951,13 +912,13 @@\n \t\trearm1 = _mm256_blend_epi32(mbuf_init, mb0_1, 0xF0);\n \n \t\t/* again write to mbufs */\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 7]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 7]),\n \t\t\t\t rearm7);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 5]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 5]),\n \t\t\t\t rearm5);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 3]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 3]),\n \t\t\t\t rearm3);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 1]->rearm_data,\n+\t\t_mm256_storeu_si256((__m256i *)rte_mbuf_rearm_data(rx_pkts[i + 1]),\n \t\t\t\t rearm1);\n \n \t\tconst __mmask8 dd_mask = _mm512_cmpeq_epi64_mask(\n", "prefixes": [ "v6", "03/23" ] }