Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/136805/?format=api
{ "id": 136805, "url": "http://patches.dpdk.org/api/patches/136805/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1707978080-28859-7-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-7-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1707978080-28859-7-git-send-email-roretzla@linux.microsoft.com", "date": "2024-02-15T06:21:08", "name": "[v4,06/18] net/ixgbe: stop using zero sized marker fields", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "aff0618d2b7881d2e2d4cb44fb83a8c9656a0c2c", "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-7-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/136805/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/136805/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 9C77343B06;\n\tThu, 15 Feb 2024 07:22:17 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 42E3C433B0;\n\tThu, 15 Feb 2024 07:21:46 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id C2C0543386\n for <dev@dpdk.org>; Thu, 15 Feb 2024 07:21:37 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id 5B0B4207F22F; Wed, 14 Feb 2024 22:21:36 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com 5B0B4207F22F", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1707978096;\n bh=8LCHFhiTVRKd21day1V5p6+/knB+MKGeegNzRq5fTSU=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=DM7YrKviGN6VnkZY8tMWniaf1WdL29FkbwLihjY/oz6LcLuOx2jhgxe2glsXAtHOX\n jKvAPWWU3ng5tYgfFfZiQFPVEHQq5q0fmOyqxxPsSgWgyA99NUbPB4qNB3n8vxbFnM\n Xwww2QHBWen3WPAT+zLZnYbz18xgO91JjRe3MZxk=", "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 06/18] net/ixgbe: stop using zero sized marker fields", "Date": "Wed, 14 Feb 2024 22:21:08 -0800", "Message-Id": "<1707978080-28859-7-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/ixgbe/ixgbe_rxtx_vec_common.h | 4 +--\n drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c | 12 ++++-----\n drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 42 +++++++++++++++----------------\n 3 files changed, 29 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\nindex a4d9ec9..abb55a1 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\n@@ -252,9 +252,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 \treturn 0;\n }\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c\nindex 952b032..6ad888f 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c\n@@ -56,13 +56,13 @@\n \t\t * Flush mbuf with pkt template.\n \t\t * Data to be rearmed is 6 bytes long.\n \t\t */\n-\t\tvst1_u8((uint8_t *)&mb0->rearm_data, p);\n+\t\tvst1_u8((uint8_t *)&mb0->mbuf_rearm_data, p);\n \t\tpaddr = mb0->buf_iova + RTE_PKTMBUF_HEADROOM;\n \t\tdma_addr0 = vsetq_lane_u64(paddr, zero, 0);\n \t\t/* flush desc with pa dma_addr */\n \t\tvst1q_u64((uint64_t *)&rxdp++->read, dma_addr0);\n \n-\t\tvst1_u8((uint8_t *)&mb1->rearm_data, p);\n+\t\tvst1_u8((uint8_t *)&mb1->mbuf_rearm_data, p);\n \t\tpaddr = mb1->buf_iova + RTE_PKTMBUF_HEADROOM;\n \t\tdma_addr1 = vsetq_lane_u64(paddr, zero, 0);\n \t\tvst1q_u64((uint64_t *)&rxdp++->read, dma_addr1);\n@@ -411,9 +411,9 @@\n \t\tpkt_mb3 = vreinterpretq_u8_u16(tmp);\n \n \t\t/* D.3 copy final 3,4 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 pkt_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 pkt_mb3);\n \n \t\t/* D.2 pkt 1,2 set in_port/nb_seg and remove crc */\n@@ -441,9 +441,9 @@\n \t\trte_prefetch_non_temporal(rxdp + RTE_IXGBE_DESCS_PER_LOOP);\n \n \t\t/* D.3 copy final 1,2 data to rx_pkts */\n-\t\tvst1q_u8((uint8_t *)&rx_pkts[pos + 1]->rx_descriptor_fields1,\n+\t\tvst1q_u8((uint8_t *)&rx_pkts[pos + 1]->mbuf_rx_descriptor_fields1,\n \t\t\t pkt_mb2);\n-\t\tvst1q_u8((uint8_t *)&rx_pkts[pos]->rx_descriptor_fields1,\n+\t\tvst1q_u8((uint8_t *)&rx_pkts[pos]->mbuf_rx_descriptor_fields1,\n \t\t\t pkt_mb1);\n \n \t\tdesc_to_ptype_v(descs, rxq->pkt_type_mask, &rx_pkts[pos]);\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\nindex f60808d..adc4df1 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c\n@@ -98,10 +98,10 @@\n desc_to_olflags_v_ipsec(__m128i descs[4], struct rte_mbuf **rx_pkts)\n {\n \t__m128i sterr, rearm, tmp_e, tmp_p;\n-\tuint32_t *rearm0 = (uint32_t *)rx_pkts[0]->rearm_data + 2;\n-\tuint32_t *rearm1 = (uint32_t *)rx_pkts[1]->rearm_data + 2;\n-\tuint32_t *rearm2 = (uint32_t *)rx_pkts[2]->rearm_data + 2;\n-\tuint32_t *rearm3 = (uint32_t *)rx_pkts[3]->rearm_data + 2;\n+\tuint32_t *rearm0 = (uint32_t *)rx_pkts[0]->mbuf_rearm_data + 2;\n+\tuint32_t *rearm1 = (uint32_t *)rx_pkts[1]->mbuf_rearm_data + 2;\n+\tuint32_t *rearm2 = (uint32_t *)rx_pkts[2]->mbuf_rearm_data + 2;\n+\tuint32_t *rearm3 = (uint32_t *)rx_pkts[3]->mbuf_rearm_data + 2;\n \tconst __m128i ipsec_sterr_msk =\n \t\t\t_mm_set1_epi32(IXGBE_RXDADV_IPSEC_STATUS_SECP |\n \t\t\t\t IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED);\n@@ -252,13 +252,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 static inline uint32_t get_packet_type(int index,\n@@ -356,9 +356,9 @@ static inline uint32_t get_packet_type(int index,\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 \t__m128i mbuf_init;\n \tuint8_t vlan_flags;\n@@ -423,13 +423,13 @@ static inline uint32_t get_packet_type(int index,\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 \tmbuf_init = _mm_set_epi64x(0, rxq->mbuf_initializer);\n \n@@ -530,9 +530,9 @@ static inline uint32_t get_packet_type(int index,\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\tpkt_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\tpkt_mb3);\n \n \t\t/* D.2 pkt 1,2 set in_port/nb_seg and remove crc */\n@@ -566,9 +566,9 @@ static inline uint32_t get_packet_type(int index,\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\tpkt_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\tpkt_mb1);\n \n \t\tdesc_to_ptype_v(descs, rxq->pkt_type_mask, &rx_pkts[pos]);\n", "prefixes": [ "v4", "06/18" ] }