From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 62387A0C3F for ; Wed, 30 Jun 2021 04:25:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 55EF741211; Wed, 30 Jun 2021 04:25:22 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2082.outbound.protection.outlook.com [40.107.223.82]) by mails.dpdk.org (Postfix) with ESMTP id A10C940DF6; Wed, 30 Jun 2021 04:25:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oE1nnZLr33KOjsWVOXc3pSJ+DkZ8Qw5IqqWZDW/63YKZFaTav2maTx85eYpyDFjxHvN10vIEysBlvrwZQPHLYV2lkT3RdX2k1ydn9XcIjUUPT664XFeZUIf1R5wxlv69KyNgXtT2i3tIMaUbByO8Gl8d+i11L1K/BFQiTaOLaqnS+68Evadgs4a/YUxHERZbex1hLSNb7uppcNwABmlz1JEsjke8ebbxMfiXmqLjla6nzzrR9UbwENHDCg58kvyrlV3tT6WnnT3t2BrSfvXT1dB5Fyln+DdlkbZlqwJzLSd9uiW6lJlBJpE0yEP2++UK+arPrgsm2i1Z+e8Wq8uqDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7YlyCE0tLY+P5H7fPmQvOcIg85V8gj59ntU1BSHV5sI=; b=CDrxH6+KkzdO8Dpp7XwzsCIbZeFrk8+I++YCBBRpw6VHYPH3lb1qguijH4ZDtpO0X21pemqLjQLVa4+kDBlTz1Z7BA+T7JGXCNoAuEzA3PnjlQJh54aqGofEGP4QEgXwokyjhIKsER/LNE4FXvSIscKzXyDJNa3OiULVWfT7GXSr62DQNo0jbeRzWYmL9uDre1IzgIpDa0OXWHV/RP5u+Hl5HoBioOlDd0XxmnRWiUTYL34Z8hmen5PkMuQUBKhEkDsKsYzyNJ7lxMorqm+d/kvVABEFlOsUqOEd8rekIADKmTlMuiMj5uX1LUorcHuyO6V+Lb+6pmmKBaZ0n7Z1zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7YlyCE0tLY+P5H7fPmQvOcIg85V8gj59ntU1BSHV5sI=; b=qnWCSM/DCr626cys90YcPNL4bvhCHh1v16orOh7NSEEEpYF308958FCcDn2++OGoUdSVbEQHyEhkW65HfbtiHJcQJ9Z70TYjNPfF4fpLSly6vmryZAJCy7PhrPdpBJbY+QkrKC9rlrlG9bKq1JoN4gjrSB23kR1zCi473qZFyD4rrypz4flwQFNl5nS3eWcu/AQVjuuvlN9ayEgxsb0rmQJ+ELcTzDnmLPnMEYuG3ZeYtJIx/drtsbzZAZ3Fp9IGI8myjHaazAVlbmGw02nPdYaw+UKl2d09kh2I+HD5VbqZemV+6YeJHZ6gBqEwj3CxDaPoYwSOfPKQqhcqi9batQ== Received: from MWHPR15CA0064.namprd15.prod.outlook.com (2603:10b6:301:4c::26) by BY5PR12MB5014.namprd12.prod.outlook.com (2603:10b6:a03:1c4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Wed, 30 Jun 2021 02:25:17 +0000 Received: from CO1NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:301:4c:cafe::99) by MWHPR15CA0064.outlook.office365.com (2603:10b6:301:4c::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Wed, 30 Jun 2021 02:25:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT024.mail.protection.outlook.com (10.13.174.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4264.18 via Frontend Transport; Wed, 30 Jun 2021 02:25:16 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 30 Jun 2021 02:25:10 +0000 From: rongwei liu To: , , , , Shahaf Shuler , David Christensen , Jerin Jacob , Ruifeng Wang , Bruce Richardson , Konstantin Ananyev CC: , , Date: Wed, 30 Jun 2021 05:24:50 +0300 Message-ID: <20210630022450.1788739-1-rongweil@nvidia.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b1de28e-1c0c-4247-aca7-08d93b6e4c9f X-MS-TrafficTypeDiagnostic: BY5PR12MB5014: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mx6ewcF40uDlvaC4gViWc8mn7Sd8BxUFxsyPItkhfdRIqxvPhd6MwE6wvJd9PKlgLEro1XNxnE/AZsKTgh3ytHWfqgzPkLihvw38steyJtjpfJdwH7h9jUxDP+P1pTnAoTY1ZRZeqhrjsrckQgRgQR1ZOGeHeUiy3bDWKj6RIwabneHMG+Dpr9vMWTVAErt819+1Y7GQUU+txz+32sS2qlN0aEcpLYnITWlXyPHRddQ6kkw7cMgXHJnVC5fqQvCCz2ziIJN6KQJhfHcKnBTYRzfoml6FdSdLYayfO2Uw8Jwc4zTf4OsqpUdNvG3C8zxD9tAvwTI0MSCBG3pvAxMGHigrZnY1qoXpruQ7fOsMBslJqsFNKAvZcazVMRLhWy4YEiA56hccmq3UqYY3j+hE610ZCyoPV0e7VqwWy61ywaKrr6BHQpXUaQezr4hx23K7o+nkZwfsmuM9BtQB3O1q6UJHl6HQTcSZ8i1i5bFHbgoqb/W6NJ6oYy/K+aI7Ocp+v48K0g2KAnK1eIRIv32EIluB9p6KrItCBGEP3duXru6TlJX3N4tWKdplwYHmOpcsM9ZkHqEL4vzINZ9joeASLrbp3z6i1Ny0i+9MTQDAruyuRVTTy6GRJ5CQE6YFuhlD+X4hG96ZzKGICxsDEp5NOL4C7fcnainb2MoX/zUKF99fDwcH6NCLeu5oelhm4aY1qr5rZ1YD4oSWwopcWbcPC8KnHS0EPUGBktKQ9PbqTEU= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(376002)(136003)(396003)(346002)(46966006)(36840700001)(86362001)(82740400003)(921005)(8936002)(186003)(16526019)(4326008)(36860700001)(47076005)(2616005)(55016002)(26005)(83380400001)(1076003)(82310400003)(8676002)(36756003)(6286002)(7696005)(316002)(336012)(426003)(6666004)(356005)(70206006)(478600001)(2906002)(54906003)(7636003)(110136005)(5660300002)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2021 02:25:16.6580 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b1de28e-1c0c-4247-aca7-08d93b6e4c9f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB5014 Subject: [dpdk-stable] [PATCH] net/mlx5: fix metadata calculation in legacy mode X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Currently, we store metadata in BE and need to change it to CPU endian when attaching to mbuf. For dv_xmeta_en = 2, no bit shift. For dv_xmeta_en = 1, 16 bits shift. For the non-vector mode, endian change should be first, then bit shift. For the vector mode, the behavior is right. In this update, we use __builtin_clz instead of __builtin_popcount to avoid confusing. Fixes: 743ac28ddf0b ("net/mlx5: fix metadata calculation in legacy mode") Cc: stable@dpdk.org Signed-off-by: rongwei liu --- drivers/net/mlx5/mlx5_rx.c | 4 ++-- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 2 +- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 2 +- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c index 777a1d6e45..012745dc26 100644 --- a/drivers/net/mlx5/mlx5_rx.c +++ b/drivers/net/mlx5/mlx5_rx.c @@ -740,8 +740,8 @@ rxq_cq_to_mbuf(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, } } if (rxq->dynf_meta) { - uint32_t meta = rte_be_to_cpu_32(cqe->flow_table_metadata >> - __builtin_popcount(rxq->flow_meta_port_mask)) & + uint32_t meta = (rte_be_to_cpu_32(cqe->flow_table_metadata) >> + __builtin_clz(rxq->flow_meta_port_mask)) & rxq->flow_meta_port_mask; if (meta) { diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h index 648c59e2c2..4a0da1bd3b 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h @@ -1223,7 +1223,7 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, int32_t offs = rxq->flow_meta_offset; uint32_t mask = rxq->flow_meta_port_mask; uint32_t shift = - __builtin_popcount(rxq->flow_meta_port_mask); + __builtin_clz(rxq->flow_meta_port_mask); uint32_t metadata; /* This code is subject for futher optimization. */ diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index 5c569ee199..38cbcb6fdc 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -834,7 +834,7 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, int32_t offs = rxq->flow_meta_offset; uint32_t mask = rxq->flow_meta_port_mask; uint32_t shift = - __builtin_popcount(rxq->flow_meta_port_mask); + __builtin_clz(rxq->flow_meta_port_mask); *RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) = (rte_be_to_cpu_32(container_of diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index 661fa7273c..480583acbb 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -770,7 +770,7 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, int32_t offs = rxq->flow_meta_offset; uint32_t mask = rxq->flow_meta_port_mask; uint32_t shift = - __builtin_popcount(rxq->flow_meta_port_mask); + __builtin_clz(rxq->flow_meta_port_mask); *RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) = (rte_be_to_cpu_32 -- 2.27.0