Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/137298/?format=api
{ "id": 137298, "url": "http://patches.dpdk.org/api/patches/137298/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1709012499-12813-5-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-5-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1709012499-12813-5-git-send-email-roretzla@linux.microsoft.com", "date": "2024-02-27T05:41:20", "name": "[v6,04/23] net/bnxt: use mbuf descriptor accessors", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "dafeb373e13cdab9bbb90dcfa4c6de2969095615", "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-5-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/137298/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/137298/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 0F3AC43C03;\n\tTue, 27 Feb 2024 06:42:33 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 65BFE42E57;\n\tTue, 27 Feb 2024 06:42:15 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id C3AAC42E29\n for <dev@dpdk.org>; Tue, 27 Feb 2024 06:41:41 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id DC83C20B74C4; Mon, 26 Feb 2024 21:41:40 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com DC83C20B74C4", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1709012500;\n bh=/p13L+GCTe/3iDQwTFqo74AvrlDV/3U7d7cjfEIPE0M=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=YmAgkRtEsCSLcBDL3yHR/9wJfJc7mlRhS+7fk4SisuSOkPXm4z4XS4D0NdzpNMfsb\n HYw/48RViyf9jM1nHc/5CzYcRjYgsRUe1rPdqbKXMD5n/hicLFEhosOcMAIWQ8lfx7\n oW6vgAdaIe+nf4MWLgLpsskl7eq0e4uBGjjjlqcQ=", "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 04/23] net/bnxt: use mbuf descriptor accessors", "Date": "Mon, 26 Feb 2024 21:41:20 -0800", "Message-Id": "<1709012499-12813-5-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/bnxt/bnxt_rxtx_vec_avx2.c | 32 ++++++++++++++++----------------\n drivers/net/bnxt/bnxt_rxtx_vec_common.h | 4 +---\n drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 16 ++++++++--------\n drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 16 ++++++++--------\n 4 files changed, 33 insertions(+), 35 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_avx2.c b/drivers/net/bnxt/bnxt_rxtx_vec_avx2.c\nindex ce6b597..5982d12 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_avx2.c\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_avx2.c\n@@ -310,13 +310,13 @@\n \t\t\t\t\t 0x04);\n \n \t\t/* Store all mbuf fields for first four packets. */\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 0]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 0]),\n \t\t\t\t rearm0);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 1]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 1]),\n \t\t\t\t rearm1);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 2]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 2]),\n \t\t\t\t rearm2);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 3]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 3]),\n \t\t\t\t rearm3);\n \n \t\t/* Unpack rearm data, set fixed fields for final four mbufs. */\n@@ -336,13 +336,13 @@\n \t\t\t\t\t 0x04);\n \n \t\t/* Store all mbuf fields for final four packets. */\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 4]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 4]),\n \t\t\t\t rearm4);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 5]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 5]),\n \t\t\t\t rearm5);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 6]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 6]),\n \t\t\t\t rearm6);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 7]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 7]),\n \t\t\t\t rearm7);\n \n \t\tnb_rx_pkts += num_valid;\n@@ -598,13 +598,13 @@\n \t\t\t\t\t 0x04);\n \n \t\t/* Store all mbuf fields for first four packets. */\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 0]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 0]),\n \t\t\t\t rearm0);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 1]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 1]),\n \t\t\t\t rearm1);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 2]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 2]),\n \t\t\t\t rearm2);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 3]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 3]),\n \t\t\t\t rearm3);\n \n \t\t/* Unpack rearm data, set fixed fields for final four mbufs. */\n@@ -624,13 +624,13 @@\n \t\t\t\t\t 0x04);\n \n \t\t/* Store all mbuf fields for final four packets. */\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 4]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 4]),\n \t\t\t\t rearm4);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 5]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 5]),\n \t\t\t\t rearm5);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 6]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 6]),\n \t\t\t\t rearm6);\n-\t\t_mm256_storeu_si256((void *)&rx_pkts[i + 7]->rearm_data,\n+\t\t_mm256_storeu_si256((void *)rte_mbuf_rearm_data(rx_pkts[i + 7]),\n \t\t\t\t rearm7);\n \n \t\tnb_rx_pkts += num_valid;\ndiff --git a/drivers/net/bnxt/bnxt_rxtx_vec_common.h b/drivers/net/bnxt/bnxt_rxtx_vec_common.h\nindex 2294f0a..fb0b1c1 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_common.h\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_common.h\n@@ -36,7 +36,6 @@\n static inline int\n bnxt_rxq_vec_setup_common(struct bnxt_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@@ -46,8 +45,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 \trxq->rxrearm_nb = 0;\n \trxq->rxrearm_start = 0;\n \treturn 0;\ndiff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\nindex 775400f..9ca9903 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c\n@@ -135,27 +135,27 @@\n \n \t/* Update mbuf rearm_data for four packets. */\n \tGET_OL_FLAGS(rss_flags, index, errors, 0, ol_flags);\n-\tvst1q_u32((uint32_t *)&mbuf[0]->rearm_data,\n+\tvst1q_u32((uint32_t *)rte_mbuf_rearm_data(mbuf[0]),\n \t\t vsetq_lane_u32(ol_flags, vreinterpretq_u32_u64(mb_init), 2));\n \tGET_OL_FLAGS(rss_flags, index, errors, 1, ol_flags);\n-\tvst1q_u32((uint32_t *)&mbuf[1]->rearm_data,\n+\tvst1q_u32((uint32_t *)rte_mbuf_rearm_data(mbuf[1]),\n \t\t vsetq_lane_u32(ol_flags, vreinterpretq_u32_u64(mb_init), 2));\n \tGET_OL_FLAGS(rss_flags, index, errors, 2, ol_flags);\n-\tvst1q_u32((uint32_t *)&mbuf[2]->rearm_data,\n+\tvst1q_u32((uint32_t *)rte_mbuf_rearm_data(mbuf[2]),\n \t\t vsetq_lane_u32(ol_flags, vreinterpretq_u32_u64(mb_init), 2));\n \tGET_OL_FLAGS(rss_flags, index, errors, 3, ol_flags);\n-\tvst1q_u32((uint32_t *)&mbuf[3]->rearm_data,\n+\tvst1q_u32((uint32_t *)rte_mbuf_rearm_data(mbuf[3]),\n \t\t vsetq_lane_u32(ol_flags, vreinterpretq_u32_u64(mb_init), 2));\n \n \t/* Update mbuf rx_descriptor_fields1 for four packets. */\n \tGET_DESC_FIELDS(mm_rxcmp[0], mm_rxcmp1[0], shuf_msk, ptype_idx, 0, tmp);\n-\tvst1q_u32((uint32_t *)&mbuf[0]->rx_descriptor_fields1, tmp);\n+\tvst1q_u32((uint32_t *)rte_mbuf_rx_descriptor_fields1(mbuf[0]), tmp);\n \tGET_DESC_FIELDS(mm_rxcmp[1], mm_rxcmp1[1], shuf_msk, ptype_idx, 1, tmp);\n-\tvst1q_u32((uint32_t *)&mbuf[1]->rx_descriptor_fields1, tmp);\n+\tvst1q_u32((uint32_t *)rte_mbuf_rx_descriptor_fields1(mbuf[1]), tmp);\n \tGET_DESC_FIELDS(mm_rxcmp[2], mm_rxcmp1[2], shuf_msk, ptype_idx, 2, tmp);\n-\tvst1q_u32((uint32_t *)&mbuf[2]->rx_descriptor_fields1, tmp);\n+\tvst1q_u32((uint32_t *)rte_mbuf_rx_descriptor_fields1(mbuf[2]), tmp);\n \tGET_DESC_FIELDS(mm_rxcmp[3], mm_rxcmp1[3], shuf_msk, ptype_idx, 3, tmp);\n-\tvst1q_u32((uint32_t *)&mbuf[3]->rx_descriptor_fields1, tmp);\n+\tvst1q_u32((uint32_t *)rte_mbuf_rx_descriptor_fields1(mbuf[3]), tmp);\n }\n \n static uint16_t\ndiff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\nindex 6c0e332..080e990 100644\n--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\n+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c\n@@ -114,33 +114,33 @@\n \n \t/* Update mbuf rearm_data for four packets. */\n \tGET_OL_FLAGS(rss_flags, index, errors, 0, ol_flags);\n-\t_mm_store_si128((void *)&mbuf[0]->rearm_data,\n+\t_mm_store_si128((void *)rte_mbuf_rearm_data(mbuf[0]),\n \t\t\t_mm_or_si128(mbuf_init, _mm_set_epi64x(ol_flags, 0)));\n \n \tGET_OL_FLAGS(rss_flags, index, errors, 1, ol_flags);\n-\t_mm_store_si128((void *)&mbuf[1]->rearm_data,\n+\t_mm_store_si128((void *)rte_mbuf_rearm_data(mbuf[1]),\n \t\t\t_mm_or_si128(mbuf_init, _mm_set_epi64x(ol_flags, 0)));\n \n \tGET_OL_FLAGS(rss_flags, index, errors, 2, ol_flags);\n-\t_mm_store_si128((void *)&mbuf[2]->rearm_data,\n+\t_mm_store_si128((void *)rte_mbuf_rearm_data(mbuf[2]),\n \t\t\t_mm_or_si128(mbuf_init, _mm_set_epi64x(ol_flags, 0)));\n \n \tGET_OL_FLAGS(rss_flags, index, errors, 3, ol_flags);\n-\t_mm_store_si128((void *)&mbuf[3]->rearm_data,\n+\t_mm_store_si128((void *)rte_mbuf_rearm_data(mbuf[3]),\n \t\t\t_mm_or_si128(mbuf_init, _mm_set_epi64x(ol_flags, 0)));\n \n \t/* Update mbuf rx_descriptor_fields1 for four packes. */\n \tGET_DESC_FIELDS(mm_rxcmp[0], mm_rxcmp1[0], shuf_msk, ptype_idx, 0, t0);\n-\t_mm_store_si128((void *)&mbuf[0]->rx_descriptor_fields1, t0);\n+\t_mm_store_si128(rte_mbuf_rx_descriptor_fields1(mbuf[0]), t0);\n \n \tGET_DESC_FIELDS(mm_rxcmp[1], mm_rxcmp1[1], shuf_msk, ptype_idx, 1, t0);\n-\t_mm_store_si128((void *)&mbuf[1]->rx_descriptor_fields1, t0);\n+\t_mm_store_si128(rte_mbuf_rx_descriptor_fields1(mbuf[1]), t0);\n \n \tGET_DESC_FIELDS(mm_rxcmp[2], mm_rxcmp1[2], shuf_msk, ptype_idx, 2, t0);\n-\t_mm_store_si128((void *)&mbuf[2]->rx_descriptor_fields1, t0);\n+\t_mm_store_si128(rte_mbuf_rx_descriptor_fields1(mbuf[2]), t0);\n \n \tGET_DESC_FIELDS(mm_rxcmp[3], mm_rxcmp1[3], shuf_msk, ptype_idx, 3, t0);\n-\t_mm_store_si128((void *)&mbuf[3]->rx_descriptor_fields1, t0);\n+\t_mm_store_si128(rte_mbuf_rx_descriptor_fields1(mbuf[3]), t0);\n }\n \n static uint16_t\n", "prefixes": [ "v6", "04/23" ] }