Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/136802/?format=api
{ "id": 136802, "url": "http://patches.dpdk.org/api/patches/136802/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1707978080-28859-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": "<1707978080-28859-4-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1707978080-28859-4-git-send-email-roretzla@linux.microsoft.com", "date": "2024-02-15T06:21:05", "name": "[v4,03/18] net/i40e: stop using zero sized marker fields", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4d987316b97e7acfbeb8d5343bd0c9b8d561548c", "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/1707978080-28859-4-git-send-email-roretzla@linux.microsoft.com/mbox/", "series": [ { "id": 31113, "url": "http://patches.dpdk.org/api/series/31113/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31113", "date": "2024-02-15T06:21:02", "name": "stop using zero sized marker fields", "version": 4, "mbox": "http://patches.dpdk.org/series/31113/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/136802/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/136802/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 9767D43B06;\n\tThu, 15 Feb 2024 07:21:55 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A9550433A0;\n\tThu, 15 Feb 2024 07:21:42 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id 3598A43386\n for <dev@dpdk.org>; Thu, 15 Feb 2024 07:21:37 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id 2DBBB207F22C; Wed, 14 Feb 2024 22:21:36 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com 2DBBB207F22C", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1707978096;\n bh=idwBNGLP24O1COpMkOmBomJy+h6t5KRHIsQq4cqA7jo=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=Xex5QpOk6LMmer8Uh7P/0sn1SlFY9NGzW+UclkAvf2sHBFK9bPZz39nkKWSJGH+5X\n cLVEspanLtNt4M1KoEIeWWa6/K57zrV5vPGzRjdAr141/pXgPHJ9K5MXoEldF3dhhB\n 7a5xL66D2ldtWRMwO7II/G8KUYW3VTgGJNuovEzo=", "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 v4 03/18] net/i40e: stop using zero sized marker fields", "Date": "Wed, 14 Feb 2024 22:21:05 -0800", "Message-Id": "<1707978080-28859-4-git-send-email-roretzla@linux.microsoft.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1707978080-28859-1-git-send-email-roretzla@linux.microsoft.com>", "References": "<1706657173-26166-1-git-send-email-roretzla@linux.microsoft.com>\n <1707978080-28859-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": "Update to reference newly named anonymous union markers supported by\nstandard C and stop referencing zero sized compiler extension markers.\n\nSigned-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>\n---\n drivers/net/i40e/i40e_rxtx_vec_altivec.c | 14 ++++++-------\n drivers/net/i40e/i40e_rxtx_vec_avx2.c | 30 ++++++++++++++--------------\n drivers/net/i40e/i40e_rxtx_vec_avx512.c | 32 +++++++++++++++---------------\n drivers/net/i40e/i40e_rxtx_vec_common.h | 4 ++--\n drivers/net/i40e/i40e_rxtx_vec_neon.c | 16 +++++++--------\n drivers/net/i40e/i40e_rxtx_vec_sse.c | 34 ++++++++++++++++----------------\n 6 files changed, 65 insertions(+), 65 deletions(-)", "diff": "diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c b/drivers/net/i40e/i40e_rxtx_vec_altivec.c\nindex b6b0d38..0941335 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c\n@@ -64,11 +64,11 @@\n \t\t * Data to be rearmed is 6 bytes long.\n \t\t * Though, RX will overwrite ol_flags that are coming next\n \t\t * anyway. So overwrite whole 8 bytes with one load:\n-\t\t * 6 bytes of rearm_data plus first 2 bytes of ol_flags.\n+\t\t * 6 bytes of mbuf_rearm_data plus first 2 bytes of ol_flags.\n \t\t */\n-\t\tp0 = (uintptr_t)&mb0->rearm_data;\n+\t\tp0 = (uintptr_t)&mb0->mbuf_rearm_data;\n \t\t*(uint64_t *)p0 = rxq->mbuf_initializer;\n-\t\tp1 = (uintptr_t)&mb1->rearm_data;\n+\t\tp1 = (uintptr_t)&mb1->mbuf_rearm_data;\n \t\t*(uint64_t *)p1 = rxq->mbuf_initializer;\n \n \t\t/* load buf_addr(lo 64bit) and buf_iova(hi 64bit) */\n@@ -371,11 +371,11 @@\n \t\t/* D.3 copy final 3,4 data to rx_pkts */\n \t\tvec_st(pkt_mb4, 0,\n \t\t (__vector unsigned char *)&rx_pkts[pos + 3]\n-\t\t\t->rx_descriptor_fields1\n+\t\t\t->mbuf_rx_descriptor_fields1\n \t\t);\n \t\tvec_st(pkt_mb3, 0,\n \t\t (__vector unsigned char *)&rx_pkts[pos + 2]\n-\t\t\t->rx_descriptor_fields1\n+\t\t\t->mbuf_rx_descriptor_fields1\n \t\t);\n \n \t\t/* D.2 pkt 1,2 set in_port/nb_seg and remove crc */\n@@ -423,10 +423,10 @@\n \t\t/* D.3 copy final 1,2 data to rx_pkts */\n \t\tvec_st(pkt_mb2, 0,\n \t\t (__vector unsigned char *)&rx_pkts[pos + 1]\n-\t\t\t->rx_descriptor_fields1\n+\t\t\t->mbuf_rx_descriptor_fields1\n \t\t);\n \t\tvec_st(pkt_mb1, 0,\n-\t\t (__vector unsigned char *)&rx_pkts[pos]->rx_descriptor_fields1\n+\t\t (__vector unsigned char *)&rx_pkts[pos]->mbuf_rx_descriptor_fields1\n \t\t);\n \t\tdesc_to_ptype_v(descs, &rx_pkts[pos], ptype_tbl);\n \t\tdesc_to_olflags_v(descs, &rx_pkts[pos]);\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c\nindex f468c1f..bf2570c 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c\n@@ -186,13 +186,13 @@\n \t * calls above.\n \t */\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 4);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 8);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, vlan_tci) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 10);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 10);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 12);\n \n \t/* Status/Error flag masks */\n \t/*\n@@ -527,9 +527,9 @@\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\toffsetof(struct rte_mbuf, rearm_data) + 8);\n-\t\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, rearm_data) !=\n-\t\t\t\tRTE_ALIGN(offsetof(struct rte_mbuf, rearm_data), 16));\n+\t\t\t\toffsetof(struct rte_mbuf, mbuf_rearm_data) + 8);\n+\t\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, mbuf_rearm_data) !=\n+\t\t\t\tRTE_ALIGN(offsetof(struct rte_mbuf, mbuf_rearm_data), 16));\n \t\t/* build up data and do writes */\n \t\t__m256i rearm0, rearm1, rearm2, rearm3, rearm4, rearm5,\n \t\t\t\trearm6, rearm7;\n@@ -543,10 +543,10 @@\n \t\trearm2 = _mm256_permute2f128_si256(rearm2, mb2_3, 0x20);\n \t\trearm0 = _mm256_permute2f128_si256(rearm0, mb0_1, 0x20);\n \t\t/* write to mbuf */\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 6]->rearm_data, rearm6);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 4]->rearm_data, rearm4);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 2]->rearm_data, rearm2);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 0]->rearm_data, rearm0);\n+\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 6]->mbuf_rearm_data, rearm6);\n+\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 4]->mbuf_rearm_data, rearm4);\n+\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 2]->mbuf_rearm_data, rearm2);\n+\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 0]->mbuf_rearm_data, rearm0);\n \n \t\t/* repeat for the odd mbufs */\n \t\tconst __m256i odd_flags = _mm256_castsi128_si256(\n@@ -561,10 +561,10 @@\n \t\trearm3 = _mm256_blend_epi32(rearm3, mb2_3, 0xF0);\n \t\trearm1 = _mm256_blend_epi32(rearm1, mb0_1, 0xF0);\n \t\t/* again write to mbufs */\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 7]->rearm_data, rearm7);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 5]->rearm_data, rearm5);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 3]->rearm_data, rearm3);\n-\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 1]->rearm_data, rearm1);\n+\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 7]->mbuf_rearm_data, rearm7);\n+\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 5]->mbuf_rearm_data, rearm5);\n+\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 3]->mbuf_rearm_data, rearm3);\n+\t\t_mm256_storeu_si256((__m256i *)&rx_pkts[i + 1]->mbuf_rearm_data, rearm1);\n \n \t\t/* extract and record EOP bit */\n \t\tif (split_packet) {\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c\nindex f3050cd..d521281 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c\n@@ -175,13 +175,13 @@\n \t * calls above.\n \t */\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 4);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 8);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, vlan_tci) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 10);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 10);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 12);\n \n \t/* Status/Error flag masks */\n \t/* mask everything except RSS, flow director and VLAN flags\n@@ -559,9 +559,9 @@\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\toffsetof(struct rte_mbuf, rearm_data) + 8);\n-\t\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, rearm_data) !=\n-\t\t\t\tRTE_ALIGN(offsetof(struct rte_mbuf, rearm_data), 16));\n+\t\t\t\toffsetof(struct rte_mbuf, mbuf_rearm_data) + 8);\n+\t\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, mbuf_rearm_data) !=\n+\t\t\t\tRTE_ALIGN(offsetof(struct rte_mbuf, mbuf_rearm_data), 16));\n \t\t/* build up data and do writes */\n \t\t__m256i rearm0, rearm1, rearm2, rearm3, rearm4, rearm5,\n \t\t\t\trearm6, rearm7;\n@@ -580,13 +580,13 @@\n \t\trearm0 = _mm256_permute2f128_si256(rearm0, mb0_1, 0x20);\n \t\t/* write to mbuf */\n \t\t_mm256_storeu_si256\n-\t\t\t((__m256i *)&rx_pkts[i + 6]->rearm_data, rearm6);\n+\t\t\t((__m256i *)&rx_pkts[i + 6]->mbuf_rearm_data, rearm6);\n \t\t_mm256_storeu_si256\n-\t\t\t((__m256i *)&rx_pkts[i + 4]->rearm_data, rearm4);\n+\t\t\t((__m256i *)&rx_pkts[i + 4]->mbuf_rearm_data, rearm4);\n \t\t_mm256_storeu_si256\n-\t\t\t((__m256i *)&rx_pkts[i + 2]->rearm_data, rearm2);\n+\t\t\t((__m256i *)&rx_pkts[i + 2]->mbuf_rearm_data, rearm2);\n \t\t_mm256_storeu_si256\n-\t\t\t((__m256i *)&rx_pkts[i + 0]->rearm_data, rearm0);\n+\t\t\t((__m256i *)&rx_pkts[i + 0]->mbuf_rearm_data, rearm0);\n \n \t\t/* repeat for the odd mbufs */\n \t\tconst __m256i odd_flags = _mm256_castsi128_si256\n@@ -606,13 +606,13 @@\n \t\trearm1 = _mm256_blend_epi32(rearm1, mb0_1, 0xF0);\n \t\t/* again write to mbufs */\n \t\t_mm256_storeu_si256\n-\t\t\t((__m256i *)&rx_pkts[i + 7]->rearm_data, rearm7);\n+\t\t\t((__m256i *)&rx_pkts[i + 7]->mbuf_rearm_data, rearm7);\n \t\t_mm256_storeu_si256\n-\t\t\t((__m256i *)&rx_pkts[i + 5]->rearm_data, rearm5);\n+\t\t\t((__m256i *)&rx_pkts[i + 5]->mbuf_rearm_data, rearm5);\n \t\t_mm256_storeu_si256\n-\t\t\t((__m256i *)&rx_pkts[i + 3]->rearm_data, rearm3);\n+\t\t\t((__m256i *)&rx_pkts[i + 3]->mbuf_rearm_data, rearm3);\n \t\t_mm256_storeu_si256\n-\t\t\t((__m256i *)&rx_pkts[i + 1]->rearm_data, rearm1);\n+\t\t\t((__m256i *)&rx_pkts[i + 1]->mbuf_rearm_data, rearm1);\n \n \t\t/* extract and record EOP bit */\n \t\tif (split_packet) {\n@@ -826,7 +826,7 @@\n \t\tfree[0] = m;\n \t\tnb_free = 1;\n \t\tfor (i = 1; i < n; i++) {\n-\t\t\trte_prefetch0(&txep[i + 3].mbuf->cacheline1);\n+\t\t\trte_prefetch0(&txep[i + 3].mbuf->mbuf_cacheline1);\n \t\t\tm = rte_pktmbuf_prefree_seg(txep[i].mbuf);\n \t\t\tif (likely(m)) {\n \t\t\t\tif (likely(m->pool == free[0]->pool)) {\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h\nindex 8b74563..57c2cd6 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_common.h\n+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h\n@@ -197,9 +197,9 @@\n \tmb_def.port = rxq->port_id;\n \trte_mbuf_refcnt_set(&mb_def, 1);\n \n-\t/* prevent compiler reordering: rearm_data covers previous fields */\n+\t/* prevent compiler reordering: mbuf_rearm_data covers previous fields */\n \trte_compiler_barrier();\n-\tp = (uintptr_t)&mb_def.rearm_data;\n+\tp = (uintptr_t)&mb_def.mbuf_rearm_data;\n \trxq->mbuf_initializer = *(uint64_t *)p;\n \trxq->rx_using_sse = 1;\n \treturn 0;\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c\nindex d873e30..218c2ee 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c\n@@ -300,10 +300,10 @@\n \trearm2 = vsetq_lane_u64(vgetq_lane_u32(vlan0, 2), mbuf_init, 1);\n \trearm3 = vsetq_lane_u64(vgetq_lane_u32(vlan0, 3), mbuf_init, 1);\n \n-\tvst1q_u64((uint64_t *)&rx_pkts[0]->rearm_data, rearm0);\n-\tvst1q_u64((uint64_t *)&rx_pkts[1]->rearm_data, rearm1);\n-\tvst1q_u64((uint64_t *)&rx_pkts[2]->rearm_data, rearm2);\n-\tvst1q_u64((uint64_t *)&rx_pkts[3]->rearm_data, rearm3);\n+\tvst1q_u64((uint64_t *)&rx_pkts[0]->mbuf_rearm_data, rearm0);\n+\tvst1q_u64((uint64_t *)&rx_pkts[1]->mbuf_rearm_data, rearm1);\n+\tvst1q_u64((uint64_t *)&rx_pkts[2]->mbuf_rearm_data, rearm2);\n+\tvst1q_u64((uint64_t *)&rx_pkts[3]->mbuf_rearm_data, rearm3);\n }\n \n #define PKTLEN_SHIFT 10\n@@ -492,13 +492,13 @@\n \t\tpkt_mb1 = vreinterpretq_u8_u16(tmp);\n \n \t\t/* D.3 copy final data to rx_pkts */\n-\t\tvst1q_u8((void *)&rx_pkts[pos + 3]->rx_descriptor_fields1,\n+\t\tvst1q_u8((void *)&rx_pkts[pos + 3]->mbuf_rx_descriptor_fields1,\n \t\t\t\tpkt_mb4);\n-\t\tvst1q_u8((void *)&rx_pkts[pos + 2]->rx_descriptor_fields1,\n+\t\tvst1q_u8((void *)&rx_pkts[pos + 2]->mbuf_rx_descriptor_fields1,\n \t\t\t\tpkt_mb3);\n-\t\tvst1q_u8((void *)&rx_pkts[pos + 1]->rx_descriptor_fields1,\n+\t\tvst1q_u8((void *)&rx_pkts[pos + 1]->mbuf_rx_descriptor_fields1,\n \t\t\t\tpkt_mb2);\n-\t\tvst1q_u8((void *)&rx_pkts[pos]->rx_descriptor_fields1,\n+\t\tvst1q_u8((void *)&rx_pkts[pos]->mbuf_rx_descriptor_fields1,\n \t\t\t\tpkt_mb1);\n \n \t\tdesc_to_ptype_v(descs, &rx_pkts[pos], ptype_tbl);\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/i40e/i40e_rxtx_vec_sse.c\nindex 9200a23..9380e38 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c\n+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c\n@@ -318,13 +318,13 @@\n \n \t/* write the rearm data and the olflags in one write */\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, ol_flags) !=\n-\t\t\toffsetof(struct rte_mbuf, rearm_data) + 8);\n-\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, rearm_data) !=\n-\t\t\tRTE_ALIGN(offsetof(struct rte_mbuf, rearm_data), 16));\n-\t_mm_store_si128((__m128i *)&rx_pkts[0]->rearm_data, rearm0);\n-\t_mm_store_si128((__m128i *)&rx_pkts[1]->rearm_data, rearm1);\n-\t_mm_store_si128((__m128i *)&rx_pkts[2]->rearm_data, rearm2);\n-\t_mm_store_si128((__m128i *)&rx_pkts[3]->rearm_data, rearm3);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rearm_data) + 8);\n+\tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, mbuf_rearm_data) !=\n+\t\t\tRTE_ALIGN(offsetof(struct rte_mbuf, mbuf_rearm_data), 16));\n+\t_mm_store_si128((__m128i *)&rx_pkts[0]->mbuf_rearm_data, rearm0);\n+\t_mm_store_si128((__m128i *)&rx_pkts[1]->mbuf_rearm_data, rearm1);\n+\t_mm_store_si128((__m128i *)&rx_pkts[2]->mbuf_rearm_data, rearm2);\n+\t_mm_store_si128((__m128i *)&rx_pkts[3]->mbuf_rearm_data, rearm3);\n }\n \n #define PKTLEN_SHIFT 10\n@@ -377,9 +377,9 @@\n \t * call above.\n \t */\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 4);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 8);\n \t__m128i dd_check, eop_check;\n \n \t/* nb_pkts has to be floor-aligned to RTE_I40E_DESCS_PER_LOOP */\n@@ -427,13 +427,13 @@\n \t * here for completeness in case of future modifications.\n \t */\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 4);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 4);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 8);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, vlan_tci) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 10);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 10);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash) !=\n-\t\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 12);\n+\t\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 12);\n \n \t/* Cache is empty -> need to scan the buffer rings, but first move\n \t * the next 'n' mbufs into the cache\n@@ -537,9 +537,9 @@\n \t\tstaterr = _mm_unpacklo_epi32(sterr_tmp1, sterr_tmp2);\n \n \t\t/* D.3 copy final 3,4 data to rx_pkts */\n-\t\t_mm_storeu_si128((void *)&rx_pkts[pos+3]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[pos+3]->mbuf_rx_descriptor_fields1,\n \t\t\t\t pkt_mb4);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[pos+2]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[pos+2]->mbuf_rx_descriptor_fields1,\n \t\t\t\t pkt_mb3);\n \n \t\t/* D.2 pkt 1,2 set in_port/nb_seg and remove crc */\n@@ -573,9 +573,9 @@\n \t\tstaterr = _mm_packs_epi32(staterr, zero);\n \n \t\t/* D.3 copy final 1,2 data to rx_pkts */\n-\t\t_mm_storeu_si128((void *)&rx_pkts[pos+1]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[pos+1]->mbuf_rx_descriptor_fields1,\n \t\t\t\t pkt_mb2);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[pos]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[pos]->mbuf_rx_descriptor_fields1,\n \t\t\t\t pkt_mb1);\n \t\tdesc_to_ptype_v(descs, &rx_pkts[pos], ptype_tbl);\n \t\t/* C.4 calc available number of desc */\n", "prefixes": [ "v4", "03/18" ] }