Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/136811/?format=api
{ "id": 136811, "url": "https://patches.dpdk.org/api/patches/136811/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1707978080-28859-16-git-send-email-roretzla@linux.microsoft.com/", "project": { "id": 1, "url": "https://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-16-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1707978080-28859-16-git-send-email-roretzla@linux.microsoft.com", "date": "2024-02-15T06:21:17", "name": "[v4,15/18] net/virtio: stop using zero sized marker fields", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4760be6f104a1bdc6e3ae73abb0d894d464315dd", "submitter": { "id": 2077, "url": "https://patches.dpdk.org/api/people/2077/?format=api", "name": "Tyler Retzlaff", "email": "roretzla@linux.microsoft.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1707978080-28859-16-git-send-email-roretzla@linux.microsoft.com/mbox/", "series": [ { "id": 31113, "url": "https://patches.dpdk.org/api/series/31113/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=31113", "date": "2024-02-15T06:21:02", "name": "stop using zero sized marker fields", "version": 4, "mbox": "https://patches.dpdk.org/series/31113/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/136811/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/136811/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 D530B43B06;\n\tThu, 15 Feb 2024 07:22:56 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 840E5433CE;\n\tThu, 15 Feb 2024 07:21:53 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id 3DA7F43394\n for <dev@dpdk.org>; Thu, 15 Feb 2024 07:21:38 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id DF3D520B2008; Wed, 14 Feb 2024 22:21:36 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com DF3D520B2008", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1707978096;\n bh=kX6tiXIxp9SOtfIXei/GLTlGSw+gDHM8c0XmWE3XuGE=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=b8jQGLv5543BLeOh+kMMGwyQlLe5LbAHTXme34fFrhUsU0Byi7DxlICNDzNml6GoP\n 9wTYbRBlFpG4t2YN+MAjTiWA9Z9/XoORdWnOD0lKW8JgXDUonW2EKifqb+BSzNcO8u\n oaUvIx0EaaKdxBqUxm73Zn/K9Z0k2pLMzKpGm2UE=", "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 15/18] net/virtio: stop using zero sized marker fields", "Date": "Wed, 14 Feb 2024 22:21:17 -0800", "Message-Id": "<1707978080-28859-16-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/virtio/virtio_rxtx_packed.h | 4 ++--\n drivers/net/virtio/virtio_rxtx_packed_avx.h | 14 +++++++-------\n drivers/net/virtio/virtio_rxtx_packed_neon.h | 18 +++++++++---------\n drivers/net/virtio/virtio_rxtx_simple.c | 4 ++--\n drivers/net/virtio/virtio_rxtx_simple.h | 2 +-\n drivers/net/virtio/virtio_rxtx_simple_altivec.c | 16 ++++++++--------\n drivers/net/virtio/virtio_rxtx_simple_neon.c | 16 ++++++++--------\n drivers/net/virtio/virtio_rxtx_simple_sse.c | 16 ++++++++--------\n 8 files changed, 45 insertions(+), 45 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_rxtx_packed.h b/drivers/net/virtio/virtio_rxtx_packed.h\nindex 5361129..5bd6966 100644\n--- a/drivers/net/virtio/virtio_rxtx_packed.h\n+++ b/drivers/net/virtio/virtio_rxtx_packed.h\n@@ -37,12 +37,12 @@\n \n /* reference count offset in mbuf rearm data */\n #define REFCNT_BITS_OFFSET ((offsetof(struct rte_mbuf, refcnt) - \\\n-\toffsetof(struct rte_mbuf, rearm_data)) * BYTE_SIZE)\n+\toffsetof(struct rte_mbuf, mbuf_rearm_data)) * BYTE_SIZE)\n \n #ifdef CC_AVX512_SUPPORT\n /* segment number offset in mbuf rearm data */\n #define SEG_NUM_BITS_OFFSET ((offsetof(struct rte_mbuf, nb_segs) - \\\n-\toffsetof(struct rte_mbuf, rearm_data)) * BYTE_SIZE)\n+\toffsetof(struct rte_mbuf, mbuf_rearm_data)) * BYTE_SIZE)\n /* default rearm data */\n #define DEFAULT_REARM_DATA (1ULL << SEG_NUM_BITS_OFFSET | \\\n \t1ULL << REFCNT_BITS_OFFSET)\ndiff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.h b/drivers/net/virtio/virtio_rxtx_packed_avx.h\nindex 584ac72..8780e8e 100644\n--- a/drivers/net/virtio/virtio_rxtx_packed_avx.h\n+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.h\n@@ -36,10 +36,10 @@\n \t/* Load four mbufs rearm data */\n \tRTE_BUILD_BUG_ON(REFCNT_BITS_OFFSET >= 64);\n \tRTE_BUILD_BUG_ON(SEG_NUM_BITS_OFFSET >= 64);\n-\t__m256i mbufs = _mm256_set_epi64x(*tx_pkts[3]->rearm_data,\n-\t\t\t\t\t *tx_pkts[2]->rearm_data,\n-\t\t\t\t\t *tx_pkts[1]->rearm_data,\n-\t\t\t\t\t *tx_pkts[0]->rearm_data);\n+\t__m256i mbufs = _mm256_set_epi64x(*(uint64_t *)tx_pkts[3]->mbuf_rearm_data,\n+\t\t\t\t\t *(uint64_t *)tx_pkts[2]->mbuf_rearm_data,\n+\t\t\t\t\t *(uint64_t *)tx_pkts[1]->mbuf_rearm_data,\n+\t\t\t\t\t *(uint64_t *)tx_pkts[0]->mbuf_rearm_data);\n \n \t/* refcnt=1 and nb_segs=1 */\n \t__m256i mbuf_ref = _mm256_set1_epi64x(DEFAULT_REARM_DATA);\n@@ -54,7 +54,7 @@\n \t/* Check headroom is enough */\n \tconst __mmask16 data_mask = 0x1 | 0x1 << 4 | 0x1 << 8 | 0x1 << 12;\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) !=\n-\t\toffsetof(struct rte_mbuf, rearm_data));\n+\t\toffsetof(struct rte_mbuf, mbuf_rearm_data));\n \tcmp = _mm256_mask_cmplt_epu16_mask(data_mask, mbufs, head_rooms);\n \tif (unlikely(cmp))\n \t\treturn -1;\n@@ -187,7 +187,7 @@\n \t\trx_pkts[i] = (struct rte_mbuf *)vq->vq_descx[id + i].cookie;\n \t\trte_packet_prefetch(rte_pktmbuf_mtod(rx_pkts[i], void *));\n \n-\t\taddrs[i] = (uintptr_t)rx_pkts[i]->rx_descriptor_fields1;\n+\t\taddrs[i] = (uintptr_t)rx_pkts[i]->mbuf_rx_descriptor_fields1;\n \t}\n \n \t/*\n@@ -205,7 +205,7 @@\n \n \t/* assert offset of data_len */\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_len) !=\n-\t\toffsetof(struct rte_mbuf, rx_descriptor_fields1) + 8);\n+\t\toffsetof(struct rte_mbuf, mbuf_rx_descriptor_fields1) + 8);\n \n \t__m512i v_index = _mm512_set_epi64(addrs[3] + 8, addrs[3],\n \t\t\t\t\t addrs[2] + 8, addrs[2],\ndiff --git a/drivers/net/virtio/virtio_rxtx_packed_neon.h b/drivers/net/virtio/virtio_rxtx_packed_neon.h\nindex c222ebf..2432d0a 100644\n--- a/drivers/net/virtio/virtio_rxtx_packed_neon.h\n+++ b/drivers/net/virtio/virtio_rxtx_packed_neon.h\n@@ -59,10 +59,10 @@\n \tuint8x16x2_t mbuf;\n \t/* Load four mbufs rearm data. */\n \tRTE_BUILD_BUG_ON(REFCNT_BITS_OFFSET >= 64);\n-\tpkts[0] = vld1_u16((uint16_t *)&tx_pkts[0]->rearm_data);\n-\tpkts[1] = vld1_u16((uint16_t *)&tx_pkts[1]->rearm_data);\n-\tpkts[2] = vld1_u16((uint16_t *)&tx_pkts[2]->rearm_data);\n-\tpkts[3] = vld1_u16((uint16_t *)&tx_pkts[3]->rearm_data);\n+\tpkts[0] = vld1_u16((uint16_t *)&tx_pkts[0]->mbuf_rearm_data);\n+\tpkts[1] = vld1_u16((uint16_t *)&tx_pkts[1]->mbuf_rearm_data);\n+\tpkts[2] = vld1_u16((uint16_t *)&tx_pkts[2]->mbuf_rearm_data);\n+\tpkts[3] = vld1_u16((uint16_t *)&tx_pkts[3]->mbuf_rearm_data);\n \n \tmbuf.val[0] = vreinterpretq_u8_u16(vcombine_u16(pkts[0], pkts[1]));\n \tmbuf.val[1] = vreinterpretq_u8_u16(vcombine_u16(pkts[2], pkts[3]));\n@@ -78,7 +78,7 @@\n \t/* Check headroom is enough. */\n \tuint16x4_t head_rooms = vdup_n_u16(head_size);\n \tRTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) !=\n-\t\t\t offsetof(struct rte_mbuf, rearm_data));\n+\t\t\t offsetof(struct rte_mbuf, mbuf_rearm_data));\n \tuint16x4_t data_offset = vreinterpret_u16_u8(vqtbl2_u8(mbuf, data_msk));\n \tuint64x1_t cmp2 = vreinterpret_u64_u16(vclt_u16(data_offset, head_rooms));\n \tif (unlikely(vget_lane_u64(cmp2, 0)))\n@@ -263,10 +263,10 @@\n \tpkt_mb[3] = vreinterpretq_u64_u16(vsubq_u16(\n \t\t\tvreinterpretq_u16_u64(pkt_mb[3]), len_adjust));\n \n-\tvst1q_u64((void *)&rx_pkts[0]->rx_descriptor_fields1, pkt_mb[0]);\n-\tvst1q_u64((void *)&rx_pkts[1]->rx_descriptor_fields1, pkt_mb[1]);\n-\tvst1q_u64((void *)&rx_pkts[2]->rx_descriptor_fields1, pkt_mb[2]);\n-\tvst1q_u64((void *)&rx_pkts[3]->rx_descriptor_fields1, pkt_mb[3]);\n+\tvst1q_u64((void *)&rx_pkts[0]->mbuf_rx_descriptor_fields1, pkt_mb[0]);\n+\tvst1q_u64((void *)&rx_pkts[1]->mbuf_rx_descriptor_fields1, pkt_mb[1]);\n+\tvst1q_u64((void *)&rx_pkts[2]->mbuf_rx_descriptor_fields1, pkt_mb[2]);\n+\tvst1q_u64((void *)&rx_pkts[3]->mbuf_rx_descriptor_fields1, pkt_mb[3]);\n \n \tif (hw->has_rx_offload) {\n \t\tvirtio_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) {\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.c b/drivers/net/virtio/virtio_rxtx_simple.c\nindex 4382569..26b712b 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple.c\n@@ -39,9 +39,9 @@\n \tmb_def.port = vq->hw->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 \n \treturn 0;\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.h b/drivers/net/virtio/virtio_rxtx_simple.h\nindex 79196ed..d00e51d 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.h\n+++ b/drivers/net/virtio/virtio_rxtx_simple.h\n@@ -41,7 +41,7 @@\n \tfor (i = 0; i < RTE_VIRTIO_VPMD_RX_REARM_THRESH; i++) {\n \t\tuintptr_t p;\n \n-\t\tp = (uintptr_t)&sw_ring[i]->rearm_data;\n+\t\tp = (uintptr_t)&sw_ring[i]->mbuf_rearm_data;\n \t\t*(uint64_t *)p = rxvq->mbuf_initializer;\n \n \t\tstart_dp[i].addr = VIRTIO_MBUF_ADDR(sw_ring[i], vq) +\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_altivec.c b/drivers/net/virtio/virtio_rxtx_simple_altivec.c\nindex 542ec3d..70c82d0 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_altivec.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_altivec.c\n@@ -138,9 +138,9 @@\n \t\t\t((__vector unsigned short)pkt_mb[0] + len_adjust);\n \t\tpkt_mb[1] = (__vector unsigned char)\n \t\t\t((__vector unsigned short)pkt_mb[1] + len_adjust);\n-\t\t*(__vector unsigned char *)&rx_pkts[0]->rx_descriptor_fields1 =\n+\t\t*(__vector unsigned char *)&rx_pkts[0]->mbuf_rx_descriptor_fields1 =\n \t\t\tpkt_mb[0];\n-\t\t*(__vector unsigned char *)&rx_pkts[1]->rx_descriptor_fields1 =\n+\t\t*(__vector unsigned char *)&rx_pkts[1]->mbuf_rx_descriptor_fields1 =\n \t\t\tpkt_mb[1];\n \n \t\tpkt_mb[2] = vec_perm(desc[1], zero, shuf_msk1);\n@@ -149,9 +149,9 @@\n \t\t\t((__vector unsigned short)pkt_mb[2] + len_adjust);\n \t\tpkt_mb[3] = (__vector unsigned char)\n \t\t\t((__vector unsigned short)pkt_mb[3] + len_adjust);\n-\t\t*(__vector unsigned char *)&rx_pkts[2]->rx_descriptor_fields1 =\n+\t\t*(__vector unsigned char *)&rx_pkts[2]->mbuf_rx_descriptor_fields1 =\n \t\t\tpkt_mb[2];\n-\t\t*(__vector unsigned char *)&rx_pkts[3]->rx_descriptor_fields1 =\n+\t\t*(__vector unsigned char *)&rx_pkts[3]->mbuf_rx_descriptor_fields1 =\n \t\t\tpkt_mb[3];\n \n \t\tpkt_mb[4] = vec_perm(desc[2], zero, shuf_msk1);\n@@ -160,9 +160,9 @@\n \t\t\t((__vector unsigned short)pkt_mb[4] + len_adjust);\n \t\tpkt_mb[5] = (__vector unsigned char)\n \t\t\t((__vector unsigned short)pkt_mb[5] + len_adjust);\n-\t\t*(__vector unsigned char *)&rx_pkts[4]->rx_descriptor_fields1 =\n+\t\t*(__vector unsigned char *)&rx_pkts[4]->mbuf_rx_descriptor_fields1 =\n \t\t\tpkt_mb[4];\n-\t\t*(__vector unsigned char *)&rx_pkts[5]->rx_descriptor_fields1 =\n+\t\t*(__vector unsigned char *)&rx_pkts[5]->mbuf_rx_descriptor_fields1 =\n \t\t\tpkt_mb[5];\n \n \t\tpkt_mb[6] = vec_perm(desc[3], zero, shuf_msk1);\n@@ -171,9 +171,9 @@\n \t\t\t((__vector unsigned short)pkt_mb[6] + len_adjust);\n \t\tpkt_mb[7] = (__vector unsigned char)\n \t\t\t((__vector unsigned short)pkt_mb[7] + len_adjust);\n-\t\t*(__vector unsigned char *)&rx_pkts[6]->rx_descriptor_fields1 =\n+\t\t*(__vector unsigned char *)&rx_pkts[6]->mbuf_rx_descriptor_fields1 =\n \t\t\tpkt_mb[6];\n-\t\t*(__vector unsigned char *)&rx_pkts[7]->rx_descriptor_fields1 =\n+\t\t*(__vector unsigned char *)&rx_pkts[7]->mbuf_rx_descriptor_fields1 =\n \t\t\tpkt_mb[7];\n \n \t\tif (unlikely(nb_used <= RTE_VIRTIO_DESC_PER_LOOP)) {\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_neon.c b/drivers/net/virtio/virtio_rxtx_simple_neon.c\nindex 7139b31..5b8bd67 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_neon.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c\n@@ -138,9 +138,9 @@\n \t\t\t\tvreinterpretq_u16_u64(pkt_mb[1]), len_adjust));\n \t\tpkt_mb[0] = vreinterpretq_u64_u16(vsubq_u16(\n \t\t\t\tvreinterpretq_u16_u64(pkt_mb[0]), len_adjust));\n-\t\tvst1q_u64((void *)&rx_pkts[1]->rx_descriptor_fields1,\n+\t\tvst1q_u64((void *)&rx_pkts[1]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[1]);\n-\t\tvst1q_u64((void *)&rx_pkts[0]->rx_descriptor_fields1,\n+\t\tvst1q_u64((void *)&rx_pkts[0]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[0]);\n \n \t\tpkt_mb[3] = vreinterpretq_u64_u8(vqtbl1q_u8(\n@@ -151,9 +151,9 @@\n \t\t\t\tvreinterpretq_u16_u64(pkt_mb[3]), len_adjust));\n \t\tpkt_mb[2] = vreinterpretq_u64_u16(vsubq_u16(\n \t\t\t\tvreinterpretq_u16_u64(pkt_mb[2]), len_adjust));\n-\t\tvst1q_u64((void *)&rx_pkts[3]->rx_descriptor_fields1,\n+\t\tvst1q_u64((void *)&rx_pkts[3]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[3]);\n-\t\tvst1q_u64((void *)&rx_pkts[2]->rx_descriptor_fields1,\n+\t\tvst1q_u64((void *)&rx_pkts[2]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[2]);\n \n \t\tpkt_mb[5] = vreinterpretq_u64_u8(vqtbl1q_u8(\n@@ -164,9 +164,9 @@\n \t\t\t\tvreinterpretq_u16_u64(pkt_mb[5]), len_adjust));\n \t\tpkt_mb[4] = vreinterpretq_u64_u16(vsubq_u16(\n \t\t\t\tvreinterpretq_u16_u64(pkt_mb[4]), len_adjust));\n-\t\tvst1q_u64((void *)&rx_pkts[5]->rx_descriptor_fields1,\n+\t\tvst1q_u64((void *)&rx_pkts[5]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[5]);\n-\t\tvst1q_u64((void *)&rx_pkts[4]->rx_descriptor_fields1,\n+\t\tvst1q_u64((void *)&rx_pkts[4]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[4]);\n \n \t\tpkt_mb[7] = vreinterpretq_u64_u8(vqtbl1q_u8(\n@@ -177,9 +177,9 @@\n \t\t\t\tvreinterpretq_u16_u64(pkt_mb[7]), len_adjust));\n \t\tpkt_mb[6] = vreinterpretq_u64_u16(vsubq_u16(\n \t\t\t\tvreinterpretq_u16_u64(pkt_mb[6]), len_adjust));\n-\t\tvst1q_u64((void *)&rx_pkts[7]->rx_descriptor_fields1,\n+\t\tvst1q_u64((void *)&rx_pkts[7]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[7]);\n-\t\tvst1q_u64((void *)&rx_pkts[6]->rx_descriptor_fields1,\n+\t\tvst1q_u64((void *)&rx_pkts[6]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[6]);\n \n \t\tif (unlikely(nb_used <= RTE_VIRTIO_DESC_PER_LOOP)) {\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_sse.c b/drivers/net/virtio/virtio_rxtx_simple_sse.c\nindex 6a18741..009c02d 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_sse.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_sse.c\n@@ -134,36 +134,36 @@\n \t\tpkt_mb[0] = _mm_shuffle_epi8(desc[0], shuf_msk1);\n \t\tpkt_mb[1] = _mm_add_epi16(pkt_mb[1], len_adjust);\n \t\tpkt_mb[0] = _mm_add_epi16(pkt_mb[0], len_adjust);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[1]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[1]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[1]);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[0]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[0]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[0]);\n \n \t\tpkt_mb[3] = _mm_shuffle_epi8(desc[1], shuf_msk2);\n \t\tpkt_mb[2] = _mm_shuffle_epi8(desc[1], shuf_msk1);\n \t\tpkt_mb[3] = _mm_add_epi16(pkt_mb[3], len_adjust);\n \t\tpkt_mb[2] = _mm_add_epi16(pkt_mb[2], len_adjust);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[3]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[3]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[3]);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[2]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[2]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[2]);\n \n \t\tpkt_mb[5] = _mm_shuffle_epi8(desc[2], shuf_msk2);\n \t\tpkt_mb[4] = _mm_shuffle_epi8(desc[2], shuf_msk1);\n \t\tpkt_mb[5] = _mm_add_epi16(pkt_mb[5], len_adjust);\n \t\tpkt_mb[4] = _mm_add_epi16(pkt_mb[4], len_adjust);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[5]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[5]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[5]);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[4]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[4]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[4]);\n \n \t\tpkt_mb[7] = _mm_shuffle_epi8(desc[3], shuf_msk2);\n \t\tpkt_mb[6] = _mm_shuffle_epi8(desc[3], shuf_msk1);\n \t\tpkt_mb[7] = _mm_add_epi16(pkt_mb[7], len_adjust);\n \t\tpkt_mb[6] = _mm_add_epi16(pkt_mb[6], len_adjust);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[7]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[7]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[7]);\n-\t\t_mm_storeu_si128((void *)&rx_pkts[6]->rx_descriptor_fields1,\n+\t\t_mm_storeu_si128((void *)&rx_pkts[6]->mbuf_rx_descriptor_fields1,\n \t\t\tpkt_mb[6]);\n \n \t\tif (unlikely(nb_used <= RTE_VIRTIO_DESC_PER_LOOP)) {\n", "prefixes": [ "v4", "15/18" ] }