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 BB16645BFE; Mon, 28 Oct 2024 17:43:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10F8F42797; Mon, 28 Oct 2024 17:43:34 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2057.outbound.protection.outlook.com [40.107.223.57]) by mails.dpdk.org (Postfix) with ESMTP id 6BC2D41060; Mon, 28 Oct 2024 17:43:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UCLhxCIgsyd9qGaPEB3MeDwk8X1VFCqaGTUA6d4R+etSN1zBmrC9gz3BQjNXLWF/gwp4zRFIWlCpT3a5G7Wyg2nUkK9vUTLDiX5is6CfMq8amfjdnDp2nlsfi5tRr+zskTXOZsvcECqrQsYvGoPgjz5Wa4jAjkucXifPttf7/Ztk0qXDSD/iS41aNS9XN+4FTTcatNO0E/6YiJcwvT/RU6PMrJAmPEUeRLJhyoPi8QZb5zrBpy2LytyBbRR7ZKlJCBRzIqpKCVzJJOZOb6OkccCiUGpHwBMGMHVwoJLNpENl5hI0JwahTLo4O0+bEeuCitVKKty6h2Sj3u8apXg+Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yWh2Qui64eVG33Ud9JuprBVEG628Se9pylgJqz78xBg=; b=XkbQTUcraq9VH9fRIMz8FHFicwuXqJadi7M4ZFf2Kxg7xfftFbZjEjJJtYu73jMFjp0I8oa0uvARBcnc2C5rZPq8g9Fw+W6HqjFYV2wxyybJhp3pzOrMhxiJvT0EnPTNzCJA4iGxK7Ype0fmhhnS1vBzdBl6J23sYkbUDap6hNB+ahm6GmWelOsqcKW5XDxjMZz4TZwvYOYixsxI9bZzMBn2wGLIwNsi4zdQpwAWYIU4nQoFZP7jdnwqzcOHRVLIYSDlmh12oesF1p+LTTILkLiieGgquZMdl+4bXgdG+HbQnhcOyzSLBECj/KRwwaxWdi2P4tacjxebvhPJtvqt+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=yWh2Qui64eVG33Ud9JuprBVEG628Se9pylgJqz78xBg=; b=HKhXGiu1jy2wLtlUOFzO5+ToOGuUm1LF3Gs7c2R5wjxDd2/6H5ddOPei+SfEILkCKXjF2tgvBSHUc2s9S8lFeLgNiyyaKGdVyI7zaJ5qAEhXEBbodHNZYl5Uv7Nm9nShEwpffhi8qSMO/cKI1TY5lGfETh/U36GknZVTQdPKNZzKNsGmuAORNf0Xu9ag00a78LFHTLTXDyc1l3LmC7LQAWBp3S7yXi4reMaW9KTXJgNbuK2ROvcYCjiQbk5qogUh4wZwlyEFFNK99GK7MtfEAdfP8snB7Lm91YjMpRcbmAsBePgGUc+R+bka9jWnZAu+hRM5iei+QrRlKW6rvlMUyg== Received: from MW2PR16CA0016.namprd16.prod.outlook.com (2603:10b6:907::29) by PH7PR12MB9204.namprd12.prod.outlook.com (2603:10b6:510:2e7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8048.18; Mon, 28 Oct 2024 16:43:25 +0000 Received: from CO1PEPF000075F4.namprd03.prod.outlook.com (2603:10b6:907:0:cafe::93) by MW2PR16CA0016.outlook.office365.com (2603:10b6:907::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.23 via Frontend Transport; Mon, 28 Oct 2024 16:43:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1PEPF000075F4.mail.protection.outlook.com (10.167.249.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8114.16 via Frontend Transport; Mon, 28 Oct 2024 16:43:24 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 28 Oct 2024 09:43:06 -0700 Received: from pegasus01.mtr.labs.mlnx (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 28 Oct 2024 09:43:03 -0700 From: Alexander Kozyrev To: CC: , , , , , , Subject: [PATCH] net/mlx5: fix miniCQEs number calculation Date: Mon, 28 Oct 2024 18:42:37 +0200 Message-ID: <20241028164244.2262641-1-akozyrev@nvidia.com> X-Mailer: git-send-email 2.43.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000075F4:EE_|PH7PR12MB9204:EE_ X-MS-Office365-Filtering-Correlation-Id: 750b6137-1771-4308-38f7-08dcf76fa441 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?iq0YyFC+X8o9YeN99FB562PjCec4Mcb0Zsn6pbNO0fbd/iFbmNyD+BATqvUI?= =?us-ascii?Q?7m8Detu2eo5OmVQ2e7Qr+fDc+P1qisasQI487cukzAIW3h/ElFR7SatE4ZKO?= =?us-ascii?Q?NczLB7/wowY+JQftkf+Bv3me5mQiSduJIVSsfNzg4r1coMXWOO6c28AoiqSY?= =?us-ascii?Q?wEORepKjDTGR8Zyr728yvPzjkdbn/3CAp5ljE/oxz3jAEM7Kkhq7zIRxDZ1X?= =?us-ascii?Q?q9/5l+54SGIUvogpj6GbVui9hYOa3AaOT4A7uzRmXYVC2eXjX9+EITi4avfM?= =?us-ascii?Q?mTkUlbOVxBuUlpg5/yI7P6+mBv+VsXvpzhwNh4juXubs2/+fZEzvvDbR17i2?= =?us-ascii?Q?o58jukJ5i5lp8MD4smJnWdIayO8xL9OG2sqecsacr5zu0ymjza34g6LZ5Wrf?= =?us-ascii?Q?8x0kaBf6+/YyKhaq9WLg38OvJ3NaljYaQ/mrUuU8d3MGny4OvLmsz4PMviXU?= =?us-ascii?Q?++wLqGFDSS9LaeYTgPFs0HouORXib4q1YhI48kmTtSNenkVtMMU0x/7UN+WF?= =?us-ascii?Q?HBx9Q1TupV0WmzAXBKRAcsNPPX1IZPHy8kSDV4XYQoN2pxJGXQG4OojGog8k?= =?us-ascii?Q?1F8HyRyN3v/u/PiR3io1I4k3oCjBPp1Ay4TiiMIxVjiIXHWmByACsv2j8A96?= =?us-ascii?Q?v3TRG/PEGzBp6/NPbKzrsIA0Wmunx2DMPr0DJcihrCfgrmiXJmbw0VvX4Bpq?= =?us-ascii?Q?0owkp7ltlTd4EHfiygjkzPFw32JFnb2USV6PRdLdnNQyDIK0qKG7ajoeNs4Q?= =?us-ascii?Q?V7v7Wu0PUXMWzsoJ5gtac29h/ZbjTP/negofBmFo4CgYKRb0uK+zF8ICtdH/?= =?us-ascii?Q?D9bDuRBDnpiC3fB8/NZNW0KL+5uX6LZxC7dffxyana4plgyi3YJNWoehYbE+?= =?us-ascii?Q?2SvtgfXVn6Wxt5Ne4GyrUmcr3nZiKB1gU34jEEf27VEaG2cuHBJZvFvRVj02?= =?us-ascii?Q?z6D2zuW2MfpfynQD7gncu5PXIjvqVF/7HEO6cjJIfk3+Ju20klsaDSmXUiIC?= =?us-ascii?Q?6ZR0sJu+ncQYeN1Y7E+UP4PagAjmNJxohMOXmW3Dzkez/T7AfTZ+Mr3hQ+Em?= =?us-ascii?Q?vxjbT64ACNyqfO6Hmc1z+AOz+MZfYN0WhLtzfQZpa36zSKJammUP4qtQG/mo?= =?us-ascii?Q?EmPc7t0xfcwKpb8pP3CErlnbXdBEBLW4wmid1ArocPNcn26xRa+hkICpliSv?= =?us-ascii?Q?K6nfcKTQbRyDhNoqgVoKH/xQT2sVhGZmOu91PMUV4ak6nxBoiHo/Ui/LA9kr?= =?us-ascii?Q?QopZAVb5sRQoA+NRJyrlffxSh7lnbQXO/dHONXPmoje/GRplaNBcQJMa4e/8?= =?us-ascii?Q?IUBQ7HGWVJE0rX0+g2FZefejhMeoHabyoGPOOEJ0AC0/4XO9eRvLb5i3WTII?= =?us-ascii?Q?LWCU1bnY1fZzE4iuzkZvDaxuuc+I+jK7PiMY+8I4zg1XaMoazA=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2024 16:43:24.7686 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 750b6137-1771-4308-38f7-08dcf76fa441 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000075F4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9204 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use the information from the CQE, not from the title packet, for getting the number of miniCQEs in the compressed CQEs array. This way we can avoid segfaults in the rxq_cq_decompress_v() in case of mbuf corruption (due to double mbuf free, for example). Fixes: 6cb559d67b ("net/mlx5: add vectorized Rx/Tx burst for x86") Signed-off-by: Alexander Kozyrev --- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 3 +-- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 3 +-- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h index b2bbc4ba17..3c6a14670d 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h @@ -98,8 +98,7 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, 11, 10, 9, 8}; /* bswap32, rss */ /* Restore the compressed count. Must be 16 bits. */ uint16_t mcqe_n = (rxq->cqe_comp_layout) ? - (MLX5_CQE_NUM_MINIS(cq->op_own) + 1) : - t_pkt->data_len + (rxq->crc_present * RTE_ETHER_CRC_LEN); + (MLX5_CQE_NUM_MINIS(cq->op_own) + 1) : rte_be_to_cpu_32(cqe->byte_cnt) uint16_t pkts_n = mcqe_n; const __vector unsigned char rearm = (__vector unsigned char)vec_vsx_ld(0, diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index 510f60b25d..ba79b460a4 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -97,8 +97,7 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, }; /* Restore the compressed count. Must be 16 bits. */ uint16_t mcqe_n = (rxq->cqe_comp_layout) ? - (MLX5_CQE_NUM_MINIS(cq->op_own) + 1) : - t_pkt->data_len + (rxq->crc_present * RTE_ETHER_CRC_LEN); + (MLX5_CQE_NUM_MINIS(cq->op_own) + 1) : rte_be_to_cpu_32(cq->byte_cnt); uint16_t pkts_n = mcqe_n; const uint64x2_t rearm = vld1q_u64((void *)&t_pkt->rearm_data); diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index e71d6c303f..bd4010f2fe 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -96,8 +96,7 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, -1, -1, -1, -1 /* skip packet_type */); /* Restore the compressed count. Must be 16 bits. */ uint16_t mcqe_n = (rxq->cqe_comp_layout) ? - (MLX5_CQE_NUM_MINIS(cq->op_own) + 1) : - t_pkt->data_len + (rxq->crc_present * RTE_ETHER_CRC_LEN); + (MLX5_CQE_NUM_MINIS(cq->op_own) + 1) : rte_be_to_cpu_32(cq->byte_cnt); uint16_t pkts_n = mcqe_n; const __m128i rearm = _mm_loadu_si128((__m128i *)&t_pkt->rearm_data); -- 2.43.5