Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94299/?format=api
https://patches.dpdk.org/api/patches/94299/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210616144602.2803271-1-akozyrev@nvidia.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": "<20210616144602.2803271-1-akozyrev@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210616144602.2803271-1-akozyrev@nvidia.com", "date": "2021-06-16T14:46:02", "name": "net/mlx5: convert meta register to big-endian", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "08aab0b757084be77aa3ff3d09e6ed8ff0fab55e", "submitter": { "id": 1873, "url": "https://patches.dpdk.org/api/people/1873/?format=api", "name": "Alexander Kozyrev", "email": "akozyrev@nvidia.com" }, "delegate": { "id": 3268, "url": "https://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210616144602.2803271-1-akozyrev@nvidia.com/mbox/", "series": [ { "id": 17358, "url": "https://patches.dpdk.org/api/series/17358/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17358", "date": "2021-06-16T14:46:02", "name": "net/mlx5: convert meta register to big-endian", "version": 1, "mbox": "https://patches.dpdk.org/series/17358/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94299/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/94299/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 EA575A0C42;\n\tWed, 16 Jun 2021 16:46:20 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 88CE14067A;\n\tWed, 16 Jun 2021 16:46:20 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2083.outbound.protection.outlook.com [40.107.244.83])\n by mails.dpdk.org (Postfix) with ESMTP id 1A6CE40140\n for <dev@dpdk.org>; Wed, 16 Jun 2021 16:46:19 +0200 (CEST)", "from BN9PR03CA0014.namprd03.prod.outlook.com (2603:10b6:408:fa::19)\n by BN7PR12MB2737.namprd12.prod.outlook.com (2603:10b6:408:30::18)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19; Wed, 16 Jun\n 2021 14:46:17 +0000", "from BN8NAM11FT039.eop-nam11.prod.protection.outlook.com\n (2603:10b6:408:fa:cafe::57) by BN9PR03CA0014.outlook.office365.com\n (2603:10b6:408:fa::19) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend\n Transport; Wed, 16 Jun 2021 14:46:17 +0000", "from mail.nvidia.com (216.228.112.34) by\n BN8NAM11FT039.mail.protection.outlook.com (10.13.177.169) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4242.16 via Frontend Transport; Wed, 16 Jun 2021 14:46:17 +0000", "from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 16 Jun\n 2021 14:46:15 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=BSF4k1roc6qU5Ymo4LMEir3RQCje114HzBdCYPfcqbsb9Qs+QiEVK786GPD8q0RGC94XkwzD+WL/HzzTQDYnnfFl82/78MLPlY5oGaO/fx/shqnEEn+ovhBVJzmgBLbvSAH1b+fr6YDvorX/7h/wJDSLSX1L9f21spfkNww6ejXUtUFS2p7TH+iLdpm9Cy8j9xboTIZ4dKEmsoXGeu0XUFAcwgRCdF3M3vVNFp1x8pMpqscFTV7T1Rp+r6VJ6q3rQ0w1015GZT32etl0OMNG4+Nxgk8sfpAAvudzaFu39RbffUu6bVJ8vcYG+cVEMAJ2sv8D9FLni+fQ5HoRrnmGxg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=dklosYBRBhjD1BoUNRr+yQuUFbN67h/NnBwDRDfFCas=;\n b=UvB7T0noATBdK+hXxGJQ6guuDFx+iO47ppgTVZfvEanc25cCKEThYYrFkv20JkWEoNy5hyhh7ylOPp1kGFpFZk4F4qPOyimYwZRV1Q2814aMsatlOE6sy1DzbXLxeZZtonAWuVrKNqsXTfVV+jigEGJvOtUmZqHm47Oxg8hR/Ad84CTrl8bR9BoKf80fBKXr/HAdsiDw5WLtHdDAIYsiagL3JstONCOju+PFMbb7uKi4Nm2HaZw2dGUqF5ug8UsJYVXosKXt3jt2tH9BRmQePWU1sEEBlG2VSChSVSoy9gx6upqriTgXpEpnAuls/ACnLsjXFA3AbTGqMjPwOmKxOw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=dklosYBRBhjD1BoUNRr+yQuUFbN67h/NnBwDRDfFCas=;\n b=CfX4AC+qUcaXXlCCCl6wlszwNhhTmV2Ell/LKC8WBSW+eLkIZRnmGhxfQoEE2APcyLiLnd8uh40z46+alPNVAf987hCCMvfLbfEnF+9zkg6Yp9pMm6cFaqykjyQt8PRpxWt5ek6hmKlvvnZYtIFctYBcp8GapuNJFScq+ncDwIa6fWBQIMwbSUgRPnOfgANHp99vvBvzCIrtMqvL9VdZKdneshxxcNuHvZkvLIzsDX7VW0YrO/FwNwgxEmLcPfiR3dx7rpNLRLdtAbHYCHoKg+XNF9RFewrIsc21vjeLL6tABcV7V2LogYRoUqFp1fIoBaLcv5nJJ7TPv0W9gNxqnA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.112.34 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.112.34; helo=mail.nvidia.com;", "From": "Alexander Kozyrev <akozyrev@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "<rasland@nvidia.com>, <viacheslavo@nvidia.com>, <matan@nvidia.com>", "Date": "Wed, 16 Jun 2021 17:46:02 +0300", "Message-ID": "<20210616144602.2803271-1-akozyrev@nvidia.com>", "X-Mailer": "git-send-email 2.18.2", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.6]", "X-ClientProxiedBy": "HQMAIL101.nvidia.com (172.20.187.10) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "4d52d186-292d-4121-80eb-08d930d57f79", "X-MS-TrafficTypeDiagnostic": "BN7PR12MB2737:", "X-Microsoft-Antispam-PRVS": "\n <BN7PR12MB273797B830C77158C815D23EAF0F9@BN7PR12MB2737.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:6430;", "X-MS-Exchange-SenderADCheck": "1", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n IOFdR/tajet5t5icDH/f1y7RgyIOMh2H3YeNW3c/3hIMjPSUHklRvqks+la/BArjD2aKTg19zxDrAEisWxYPaSPugzXeKlxTcvqe00bwzVoFh7NGaSaGgLVI2Mas2PV8lJnam20D8XRnrtn6AuwsTIhtdA3MDfC6e75GJOqqfNeIkCSbcZZg9p+KzrwefZ1wMCDaHuLunY8k1cA4iBmfdODgRyv5BzmMvmCrN4U7x68Kc7rJ23/2J1u5WjzAozQzKGqPsBm7ttTmwmb5p+IFsEJqprbVeMVGLWHWjzNv45EojT4eK/WzksbnQtcTtVbEkdXoROfm2seGzadlXHQg6mLGTpsxHYpM80ROk6X5vfCi4m9Ag97kkBEbEdnXaFJKkQ5o0Hcm8UwW96HAXWA0leNvvfgEK7CnVrqDfytD0bZXpqn81W6+WIgUP9FH0oFbejxfbVZT5/McSX9Caq0GUC6jhMqwSAX5s+1nHygRD1MUOe2hAdjqWVxe6ZA4de12m00GPGi40D0MXb/vcs6m/eLQYD1pqdtXSnX+ZJQg9TSiertmd+NmOWJnWXfEPZrniaiihV0oicy4f8T/9De6d4nQnHolu4N2S5dQQtWoOBk5RDcY78gbeNyCy5zq1OKDnDrcGHLuQtiXmVSAr3MZcg==", "X-Forefront-Antispam-Report": "CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;\n SFS:(4636009)(396003)(39860400002)(136003)(346002)(376002)(36840700001)(46966006)(82740400003)(478600001)(426003)(36906005)(54906003)(336012)(6916009)(70586007)(8676002)(316002)(16526019)(2906002)(186003)(70206006)(55016002)(26005)(8936002)(356005)(2616005)(7636003)(36860700001)(5660300002)(6666004)(1076003)(36756003)(82310400003)(107886003)(83380400001)(6286002)(86362001)(47076005)(7696005)(4326008);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "16 Jun 2021 14:46:17.1973 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 4d52d186-292d-4121-80eb-08d930d57f79", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n BN8NAM11FT039.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BN7PR12MB2737", "Subject": "[dpdk-dev] [PATCH] net/mlx5: convert meta register to big-endian", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Metadata is stored in the CPU order (little-endian format on x86),\nwhile all the packet header fields are stored in the network order.\nThat leads to the wrong results whenever we try to use the metadata\nvalue in the modify_field actions: bytes are swapped as a result.\n\nConvert the metadata into the big-endian format before storing it\nin the Mellanox NIC to achieve consistent behaviour.\n\nSigned-off-by: Alexander Kozyrev <akozyrev@nvidia.com>\nAcked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>\n---\n drivers/net/mlx5/mlx5_flow_dv.c | 40 +++++-------------------\n drivers/net/mlx5/mlx5_rx.c | 5 +--\n drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 22 +++++++++----\n drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 30 +++++++++++-------\n drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 18 ++++++++---\n 5 files changed, 59 insertions(+), 56 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex dafd37ab93..b36ffde559 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -1239,8 +1239,8 @@ flow_dv_convert_action_set_meta\n \t\t\t const struct rte_flow_action_set_meta *conf,\n \t\t\t struct rte_flow_error *error)\n {\n-\tuint32_t data = conf->data;\n-\tuint32_t mask = conf->mask;\n+\tuint32_t mask = rte_cpu_to_be_32(conf->mask);\n+\tuint32_t data = rte_cpu_to_be_32(conf->data) & mask;\n \tstruct rte_flow_item item = {\n \t\t.spec = &data,\n \t\t.mask = &mask,\n@@ -1253,25 +1253,14 @@ flow_dv_convert_action_set_meta\n \tif (reg < 0)\n \t\treturn reg;\n \tMLX5_ASSERT(reg != REG_NON);\n-\t/*\n-\t * In datapath code there is no endianness\n-\t * coversions for perfromance reasons, all\n-\t * pattern conversions are done in rte_flow.\n-\t */\n \tif (reg == REG_C_0) {\n \t\tstruct mlx5_priv *priv = dev->data->dev_private;\n \t\tuint32_t msk_c0 = priv->sh->dv_regc0_mask;\n-\t\tuint32_t shl_c0;\n+\t\tuint32_t shl_c0 = rte_bsf32(msk_c0);\n \n-\t\tMLX5_ASSERT(msk_c0);\n-#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN\n-\t\tshl_c0 = rte_bsf32(msk_c0);\n-#else\n-\t\tshl_c0 = sizeof(msk_c0) * CHAR_BIT - rte_fls_u32(msk_c0);\n-#endif\n-\t\tmask <<= shl_c0;\n-\t\tdata <<= shl_c0;\n-\t\tMLX5_ASSERT(!(~msk_c0 & rte_cpu_to_be_32(mask)));\n+\t\tdata = rte_cpu_to_be_32(rte_cpu_to_be_32(data) << shl_c0);\n+\t\tmask = rte_cpu_to_be_32(mask) & msk_c0;\n+\t\tmask = rte_cpu_to_be_32(mask << shl_c0);\n \t}\n \treg_c_x[0] = (struct field_modify_info){4, 0, reg_to_field[reg]};\n \t/* The routine expects parameters in memory as big-endian ones. */\n@@ -9226,27 +9215,14 @@ flow_dv_translate_item_meta(struct rte_eth_dev *dev,\n \t\tif (reg < 0)\n \t\t\treturn;\n \t\tMLX5_ASSERT(reg != REG_NON);\n-\t\t/*\n-\t\t * In datapath code there is no endianness\n-\t\t * coversions for perfromance reasons, all\n-\t\t * pattern conversions are done in rte_flow.\n-\t\t */\n-\t\tvalue = rte_cpu_to_be_32(value);\n-\t\tmask = rte_cpu_to_be_32(mask);\n \t\tif (reg == REG_C_0) {\n \t\t\tstruct mlx5_priv *priv = dev->data->dev_private;\n \t\t\tuint32_t msk_c0 = priv->sh->dv_regc0_mask;\n \t\t\tuint32_t shl_c0 = rte_bsf32(msk_c0);\n-#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN\n-\t\t\tuint32_t shr_c0 = __builtin_clz(priv->sh->dv_meta_mask);\n \n-\t\t\tvalue >>= shr_c0;\n-\t\t\tmask >>= shr_c0;\n-#endif\n-\t\t\tvalue <<= shl_c0;\n+\t\t\tmask &= msk_c0;\n \t\t\tmask <<= shl_c0;\n-\t\t\tMLX5_ASSERT(msk_c0);\n-\t\t\tMLX5_ASSERT(!(~msk_c0 & mask));\n+\t\t\tvalue <<= shl_c0;\n \t\t}\n \t\tflow_dv_match_meta_reg(matcher, key, reg, value, mask);\n \t}\ndiff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c\nindex 6cd71a44eb..777a1d6e45 100644\n--- a/drivers/net/mlx5/mlx5_rx.c\n+++ b/drivers/net/mlx5/mlx5_rx.c\n@@ -740,8 +740,9 @@ rxq_cq_to_mbuf(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt,\n \t\t}\n \t}\n \tif (rxq->dynf_meta) {\n-\t\tuint32_t meta = cqe->flow_table_metadata &\n-\t\t\t\trxq->flow_meta_port_mask;\n+\t\tuint32_t meta = rte_be_to_cpu_32(cqe->flow_table_metadata >>\n+\t\t\t__builtin_popcount(rxq->flow_meta_port_mask)) &\n+\t\t\trxq->flow_meta_port_mask;\n \n \t\tif (meta) {\n \t\t\tpkt->ol_flags |= rxq->flow_meta_mask;\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h\nindex 2d1154b624..648c59e2c2 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h\n@@ -1221,23 +1221,33 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,\n \t\tif (rxq->dynf_meta) {\n \t\t\tuint64_t flag = rxq->flow_meta_mask;\n \t\t\tint32_t offs = rxq->flow_meta_offset;\n-\t\t\tuint32_t metadata, mask;\n+\t\t\tuint32_t mask = rxq->flow_meta_port_mask;\n+\t\t\tuint32_t shift =\n+\t\t\t\t__builtin_popcount(rxq->flow_meta_port_mask);\n+\t\t\tuint32_t metadata;\n \n-\t\t\tmask = rxq->flow_meta_port_mask;\n \t\t\t/* This code is subject for futher optimization. */\n-\t\t\tmetadata = cq[pos].flow_table_metadata & mask;\n+\t\t\tmetadata = (rte_be_to_cpu_32\n+\t\t\t\t(cq[pos].flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =\n \t\t\t\t\t\t\t\tmetadata;\n \t\t\tpkts[pos]->ol_flags |= metadata ? flag : 0ULL;\n-\t\t\tmetadata = cq[pos + 1].flow_table_metadata & mask;\n+\t\t\tmetadata = (rte_be_to_cpu_32\n+\t\t\t\t(cq[pos + 1].flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *) =\n \t\t\t\t\t\t\t\tmetadata;\n \t\t\tpkts[pos + 1]->ol_flags |= metadata ? flag : 0ULL;\n-\t\t\tmetadata = cq[pos + 2].flow_table_metadata & mask;\n+\t\t\tmetadata = (rte_be_to_cpu_32\n+\t\t\t\t(cq[pos + 2].flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t *) =\n \t\t\t\t\t\t\t\tmetadata;\n \t\t\tpkts[pos + 2]->ol_flags |= metadata ? flag : 0ULL;\n-\t\t\tmetadata = cq[pos + 3].flow_table_metadata & mask;\n+\t\t\tmetadata = (rte_be_to_cpu_32\n+\t\t\t\t(cq[pos + 3].flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t *) =\n \t\t\t\t\t\t\t\tmetadata;\n \t\t\tpkts[pos + 3]->ol_flags |= metadata ? flag : 0ULL;\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\nindex 2234fbe6b2..5c569ee199 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h\n@@ -833,23 +833,29 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,\n \t\t\t/* This code is subject for futher optimization. */\n \t\t\tint32_t offs = rxq->flow_meta_offset;\n \t\t\tuint32_t mask = rxq->flow_meta_port_mask;\n+\t\t\tuint32_t shift =\n+\t\t\t\t__builtin_popcount(rxq->flow_meta_port_mask);\n \n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =\n-\t\t\t\tcontainer_of(p0, struct mlx5_cqe,\n-\t\t\t\t\t pkt_info)->flow_table_metadata &\n-\t\t\t\t\t mask;\n+\t\t\t\t(rte_be_to_cpu_32(container_of\n+\t\t\t\t(p0, struct mlx5_cqe,\n+\t\t\t\tpkt_info)->flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *) =\n-\t\t\t\tcontainer_of(p1, struct mlx5_cqe,\n-\t\t\t\t\t pkt_info)->flow_table_metadata &\n-\t\t\t\t\t mask;\n+\t\t\t\t(rte_be_to_cpu_32(container_of\n+\t\t\t\t(p1, struct mlx5_cqe,\n+\t\t\t\tpkt_info)->flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t *) =\n-\t\t\t\tcontainer_of(p2, struct mlx5_cqe,\n-\t\t\t\t\t pkt_info)->flow_table_metadata &\n-\t\t\t\t\t mask;\n+\t\t\t\t(rte_be_to_cpu_32(container_of\n+\t\t\t\t(p2, struct mlx5_cqe,\n+\t\t\t\tpkt_info)->flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t *) =\n-\t\t\t\tcontainer_of(p3, struct mlx5_cqe,\n-\t\t\t\t\t pkt_info)->flow_table_metadata &\n-\t\t\t\t\t mask;\n+\t\t\t\t(rte_be_to_cpu_32(container_of\n+\t\t\t\t(p3, struct mlx5_cqe,\n+\t\t\t\tpkt_info)->flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\tif (*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *))\n \t\t\t\telts[pos]->ol_flags |= rxq->flow_meta_mask;\n \t\t\tif (*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *))\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\nindex c508a7a4f2..661fa7273c 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h\n@@ -769,15 +769,25 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,\n \t\t\t/* This code is subject for futher optimization. */\n \t\t\tint32_t offs = rxq->flow_meta_offset;\n \t\t\tuint32_t mask = rxq->flow_meta_port_mask;\n+\t\t\tuint32_t shift =\n+\t\t\t\t__builtin_popcount(rxq->flow_meta_port_mask);\n \n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =\n-\t\t\t\tcq[pos].flow_table_metadata & mask;\n+\t\t\t\t(rte_be_to_cpu_32\n+\t\t\t\t(cq[pos].flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *) =\n-\t\t\t\tcq[pos + p1].flow_table_metadata & mask;\n+\t\t\t\t(rte_be_to_cpu_32\n+\t\t\t\t(cq[pos + p1].flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t *) =\n-\t\t\t\tcq[pos + p2].flow_table_metadata & mask;\n+\t\t\t\t(rte_be_to_cpu_32\n+\t\t\t\t(cq[pos + p2].flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\t*RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t *) =\n-\t\t\t\tcq[pos + p3].flow_table_metadata & mask;\n+\t\t\t\t(rte_be_to_cpu_32\n+\t\t\t\t(cq[pos + p3].flow_table_metadata) >> shift) &\n+\t\t\t\tmask;\n \t\t\tif (*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *))\n \t\t\t\tpkts[pos]->ol_flags |= rxq->flow_meta_mask;\n \t\t\tif (*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *))\n", "prefixes": [] }{ "id": 94299, "url": "