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 3C52E4625C for ; Tue, 18 Feb 2025 13:37:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34797402DF; Tue, 18 Feb 2025 13:37:37 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2046.outbound.protection.outlook.com [40.107.223.46]) by mails.dpdk.org (Postfix) with ESMTP id 2A113402A0 for ; Tue, 18 Feb 2025 13:37:36 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CAAwwMUuBQs4YYLHbZDejST4nBcxbtw/LHKDcfdoJx1ezQnrCoWbWdZAZ9zitLBc3qu1En/XsKklRKc2TLZlKCTY5ziha3Wor5Bbmtyhb0tUPXTdmeP/f4d87HLQHBCjuUx+ToXJqlYDNmNZuhXWL271oPRj5e7Zf5qLitgSjJNJgU/BU8o7IKcUnkFXKPzu6l7Z5m56skRzljZwTIwd6wmGfjdPvZz73YaoDKtQp15yWcPRSPaZa5qC8XsVvI0Q2aSwDVSZ9GAlvCOO27nKkK7d6fZWpXlW0X1AEcWRez/twyEcXE+Bvj3YMupmtqrQUnhSm8NMJjqt+qTH/WyokQ== 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=C0iBF6i0PVkPL7aM05ZnpN22JC6YlvUmcl788DN+oPQ=; b=VHiTkvW8AZlO4E9SeI+FsnUnhkQC1jeAFEkJpf0g5Ks0hbB4k/bKNdwBHHdVx5wvJZBOvwdHE7Ol+TQEerQovebQG0UolfyigwWRQskkZe1rkt6h7JmsVJgnM3XTS/WsNaujyVIERPtbHzjdjiB3QgzeoP5EuTn/q9nW93tV7/w9IB0m4dsvr7XPjx+3SbxmT4Fr9WUlN1k8X1ueKmeSz3wrjCXdNmqiLyCGxze6xj+y9PS/apBQfXPeQBnAgG/mfmdjmjvFQMyhti3201Wcbs6LJ/9DvXkozUp9U8WSM8DHniVHDGQnYNGRBR4RaXoaGT83FHrfnl0zhcOsnfz2pw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=bytedance.com 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=C0iBF6i0PVkPL7aM05ZnpN22JC6YlvUmcl788DN+oPQ=; b=p12EtcL5UK22K4Ll+uj8dPFhPxDDyx6nhTIcqYwkvW5kih9KbwEhfa/XzuautzISGC1qudT69t5gs36wOqI5FlINVJydWZsJLNQsYIInUbRezc8Iey3Qtg7SDJpJH1PqiUZQERnGbihD5xagDEYDWsuzc7nYJCMGm4Xk6Eok6VHKHaoPuR/IfkCFZRPxMjuVoVeP1cSeFrmawnCugz5uP18AIZ3dNGUxWB+z6G64eZ8pL1R50hqAGdsCJClFuUrcfQ2+siMiMnQBpmkR1qyNLy8xU5Rg1OHpXmKH/zA5STu4EcoTe4rU5wSRjv3uOE4sjaTjrul3xYC7oUZrepbpoA== Received: from BN8PR04CA0030.namprd04.prod.outlook.com (2603:10b6:408:70::43) by IA1PR12MB8495.namprd12.prod.outlook.com (2603:10b6:208:44d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:37:31 +0000 Received: from BN3PEPF0000B069.namprd21.prod.outlook.com (2603:10b6:408:70:cafe::27) by BN8PR04CA0030.outlook.office365.com (2603:10b6:408:70::43) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Tue, 18 Feb 2025 12:37:31 +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 BN3PEPF0000B069.mail.protection.outlook.com (10.167.243.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:37:31 +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; Tue, 18 Feb 2025 04:37:17 -0800 Received: from nvidia.com (10.126.230.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.14; Tue, 18 Feb 2025 04:37:15 -0800 From: Xueming Li To: Gavin Hu CC: , Changqi Dingluo , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix polling CQEs' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:10 +0800 Message-ID: <20250218123523.36836-16-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B069:EE_|IA1PR12MB8495:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e6ac678-e154-4901-1100-08dd50190317 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|13003099007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?dEFqdVg4MHVPTGJjTWNOVUZzeVd4M2FDMmk5NWtkSU5wUU05U2JPMUlaUGRw?= =?utf-8?B?NENCMVpZYkdqOWVhMzZqRkVZL0xUVlVab1FaVGxnVitZSXdQd1QvZS80TGZm?= =?utf-8?B?ZFdmcy9LdW9QN0cvaURxSWV6VHhUekxRMnJpVHBDWU14MjRwYll2NW1VVkNa?= =?utf-8?B?MzFDY25Wa2VNcm81VTJuSE9hTTNqbmYwWERaK0hSYkt6dW1CVVE0eXVObnVp?= =?utf-8?B?dFh6K05BOU55TlRiUnA4TnFLSmQvd1QzdEhKSjZiTS9rZW16YkNxOVpHak9B?= =?utf-8?B?dzVZZHFVcU5pd1EvVXRrWTRxWDZTbGQwY1IzT0pLVXZiRTdjbXp4VmJPTmxr?= =?utf-8?B?TTZ6eWJ3NTdVaUE2dld3K1FOK1ZOLzUrTW1DR1FRemdWSHZQTTZYYUpxMGkz?= =?utf-8?B?RHJHOTBvUmV0K1VHS1hZWFMwMmNrWUFvVHVFZnJwWXhmTUltNys2MndFbHRE?= =?utf-8?B?RC9zMTdqSklQSS9yQU1TR2diT2EyV2o4ZkFYU1NyOG1vVWt2MVAvUWQrVnBi?= =?utf-8?B?RXk4UHdncHlsOGZmckdoZytVb0NCcFBTczNFemQ0dm1vd3ZaQTNZeFI4TjdI?= =?utf-8?B?SzNOdCtKMUxvL3ZKZUQ2T1cwbmtZZVgvYkVZdUJvYkZrTXc1Um9VSk9jY1Zv?= =?utf-8?B?dHNYUzJXckpsNmhOaWFmbjZIK0hWTjJIb09nazdqeVNRbTBMM0VoaWlVbC9C?= =?utf-8?B?b2hxTmEyWUx0Yk5IRmh4M1BzR2JCMUh6MC9wbGpnZGJybTZIdTIwZWhPdXdh?= =?utf-8?B?SDdOOStLbVFlaSs5WTBFNmM1SzZPVzRWQjQwVE0zRStHdlEzZDhuQTdwOVhB?= =?utf-8?B?MHFxenA1T1V1bmZwSVF3RnYveUlEcjJIYVY2aW9VOHpCa0M1RkdMUGVGUmhi?= =?utf-8?B?bmJKN1k2VHhiU3NySkg5YUU2cGl5ay9oNktlZUhqbUtWY1k3N0htQU8zaHRK?= =?utf-8?B?dDlWb3JPTGM1MEtUK01yb0UxVkpDUmVWRGhTdjlWcEM4N2lOcExQVFk5Vmh6?= =?utf-8?B?TUg3cGM0MXVMYzRCMEhadVQ0dnV4MWJIdlpSb1BaQTBJRnk2a3RKVjhGWW9B?= =?utf-8?B?WGJIcm1KbXhROFZYVElmajM0L3prQktTY0pOd0xwK1JGM2k4Qi9kR0JDOU03?= =?utf-8?B?YlFHdlBGS3NtSFJKYWQ2b3B5dmpJRk5veUk4S0piT2tWdVpXK29YZkNzUEtx?= =?utf-8?B?QVRTR3VtZVJHbXFwdWo3YTBXekNIZ0ZRMEpqWDVRUXpBeUNXZlVpbUZRclFn?= =?utf-8?B?b2wvNDhnSldyM3BkczNYdDc1bFNlZzN6UzhUZFhTVXlRZFRaU3AzQjhJUVd3?= =?utf-8?B?UURsZ3NPOHl5eFpZQldZZ0trdmdHNGZ6TXBpRnZnZCtlcEZVZCtwTDZ6dnFu?= =?utf-8?B?bk9TSERUUDR2Sm14NVRXaWZjaDNUbmJXOGFjeVFjcGJTNXRLMEgvM2lzTndl?= =?utf-8?B?R2ZNN2p2cjAvWUZkTmpnVkdvalRhdFJyb3BaYVZpYU1PS3UvVFZyNjVnWUlq?= =?utf-8?B?bFF5Wkw0Q2JoT0poakJnVVRBZkdEeFdFelhHazBPYUlCbXdlc3l1QmRmdmpv?= =?utf-8?B?Uk84TVRaTE9sc3d1eE5BRFBmYVVoQTBTdlpJOHp1UE5nYUNFQmZsZ1NiekNB?= =?utf-8?B?MTY2MG03ckhyeUhMenFYMUxsU2F1ZFJZcWpQdXFnd2cxbUkyalppdDJBWTdJ?= =?utf-8?B?QmprNEsvRzVlSjBjUXJyQzIyYlZ5QTBDTHpwMGRxU2wzYzUwVWdCZ0FpRTZ1?= =?utf-8?B?Q0EyeWd6TWExV0lrTnNvTmpoQTJ1MGVOeHdndW5mMUlJNUxCU0E0YUxRQnBK?= =?utf-8?B?YXJFcGJLVU4vbEp1UG9vMHMwZXVNcUxBQjYwMWN6TDM5anBXOG5kN1lkWWNF?= =?utf-8?B?U1dYNExKL3pST0hlRDZmelYzbjNkRVo3ODZsSVNFNUlwaWFjMVVuK05hLzll?= =?utf-8?B?U1RqdlkxcXBoNFNwL1pBU1JNK1hjSlFWalBGY0NvdSsrZkJDY3NMelZBMEgr?= =?utf-8?Q?bJHt1LdAEsYyzRTxWgAEMHaBOi3aMY=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)(82310400026)(376014)(1800799024)(36860700013)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:37:31.0695 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2e6ac678-e154-4901-1100-08dd50190317 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: BN3PEPF0000B069.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8495 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 Hi, FYI, your patch has been queued to stable release 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. Please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=ffb0f31822050174353cf595bc9c3258fd304f6b Thanks. Xueming Li --- >From ffb0f31822050174353cf595bc9c3258fd304f6b Mon Sep 17 00:00:00 2001 From: Gavin Hu Date: Fri, 6 Dec 2024 02:58:11 +0200 Subject: [PATCH] net/mlx5: fix polling CQEs Cc: Xueming Li [ upstream commit 73f7ae1d721aa5c388123db11827937205985999 ] In certain situations, the receive queue (rxq) fails to replenish its internal ring with memory buffers (mbufs) from the pool. This can happen when the pool has a limited number of mbufs allocated, and the user application holds incoming packets for an extended period, resulting in a delayed release of mbufs. Consequently, the pool becomes depleted, preventing the rxq from replenishing from it. There was a bug in the behavior of the vectorized rxq_cq_process_v routine, which handled completion queue entries (CQEs) in batches of four. This routine consistently accessed four mbufs from the internal queue ring, regardless of whether they had been replenished. As a result, it could access mbufs that no longer belonged to the poll mode driver (PMD). The fix involves checking if there are four replenished mbufs available before allowing rxq_cq_process_v to handle the batch. Once replenishment succeeds during the polling process, the routine will resume its operation. Fixes: 1ded26239aa0 ("net/mlx5: refactor vectorized Rx") Reported-by: Changqi Dingluo Signed-off-by: Gavin Hu Acked-by: Viacheslav Ovsiienko --- .mailmap | 3 ++- drivers/net/mlx5/mlx5_rxtx_vec.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 861d69289f..820c201bfe 100644 --- a/.mailmap +++ b/.mailmap @@ -212,6 +212,7 @@ Chandubabu Namburu Chang Miao Changchun Ouyang Changpeng Liu +Changqi Dingluo Changqing Wu Chaoyong He Chao Zhu @@ -440,7 +441,7 @@ Gargi Sau Gary Mussar Gaurav Singh Gautam Dawar -Gavin Hu +Gavin Hu Geoffrey Le Gourriérec Geoffrey Lv Geoff Thorpe diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c index 2363d7ed27..9b9c63f862 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec.c +++ b/drivers/net/mlx5/mlx5_rxtx_vec.c @@ -325,6 +325,9 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, /* Not to cross queue end. */ pkts_n = RTE_MIN(pkts_n, q_n - elts_idx); pkts_n = RTE_MIN(pkts_n, q_n - cq_idx); + /* Not to move past the allocated mbufs. */ + pkts_n = RTE_MIN(pkts_n, RTE_ALIGN_FLOOR(rxq->rq_ci - rxq->rq_pi, + MLX5_VPMD_DESCS_PER_LOOP)); if (!pkts_n) { *no_cq = !rcvd_pkt; return rcvd_pkt; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.285030635 +0800 +++ 0015-net-mlx5-fix-polling-CQEs.patch 2025-02-18 19:39:00.448244079 +0800 @@ -1 +1 @@ -From 73f7ae1d721aa5c388123db11827937205985999 Mon Sep 17 00:00:00 2001 +From ffb0f31822050174353cf595bc9c3258fd304f6b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 73f7ae1d721aa5c388123db11827937205985999 ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org @@ -35 +37 @@ -index 38e511a28b..1ed47e1cad 100644 +index 861d69289f..820c201bfe 100644 @@ -38 +40 @@ -@@ -225,6 +225,7 @@ Chandubabu Namburu +@@ -212,6 +212,7 @@ Chandubabu Namburu @@ -46 +48 @@ -@@ -465,7 +466,7 @@ Gargi Sau +@@ -440,7 +441,7 @@ Gargi Sau @@ -52 +53,0 @@ - Gavin Li @@ -54,0 +56 @@ + Geoff Thorpe @@ -56 +58 @@ -index 1872bf310c..1b701801c5 100644 +index 2363d7ed27..9b9c63f862 100644