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 0B60D46211 for ; Thu, 13 Feb 2025 11:00:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0773A40287; Thu, 13 Feb 2025 11:00:38 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0BC2242ED4 for ; Thu, 13 Feb 2025 11:00:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C2XaIeN7q+cbTRaX7LP0attvhtDj4Mquw1b50H+Q2fw=; b=MJMU5uTB95hyYirrFdlRJyoK3NSER1zmueQW1CND2yggwhxBRQ8aRQccSpVFiydPxtQ3nK U6B9yyfGp9cVrtBvxXVu7ODexxgT2ZLmObQmq8R5RiryvM1WuS+hF+cQFiYZUg6tIw60AH mQ3DctnMKvYkpX1bZck8jhRkvhHE6Zc= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-vHHEw4fRMBiADPTNAWeSyw-1; Thu, 13 Feb 2025 05:00:32 -0500 X-MC-Unique: vHHEw4fRMBiADPTNAWeSyw-1 X-Mimecast-MFC-AGG-ID: vHHEw4fRMBiADPTNAWeSyw Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1076018D95DC; Thu, 13 Feb 2025 10:00:31 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1D1AD1800360; Thu, 13 Feb 2025 10:00:28 +0000 (UTC) From: Kevin Traynor To: Gavin Hu Cc: Changqi Dingluo , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix polling CQEs' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:57:47 +0000 Message-ID: <20250213095933.362078-20-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: pCwJMOHrkefm5Kb3mPAzkKANUZfr4eJgPwpsVsg_qaY_1739440831 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/17/25. So 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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a0008d4df03f25a264ae7a1a88131b2e07d50ad9 Thanks. Kevin --- >From a0008d4df03f25a264ae7a1a88131b2e07d50ad9 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 [ 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 2c7a5d007e..07ae8c48fc 100644 --- a/.mailmap +++ b/.mailmap @@ -226,4 +226,5 @@ Chang Miao Changchun Ouyang Changpeng Liu +Changqi Dingluo Changqing Wu Chaoyong He @@ -465,5 +466,5 @@ Gary Mussar Gaurav Singh Gautam Dawar -Gavin Hu +Gavin Hu Gavin Li Geoffrey Le Gourriérec diff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c index 1872bf310c..1b701801c5 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec.c +++ b/drivers/net/mlx5/mlx5_rxtx_vec.c @@ -326,4 +326,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, 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; -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:36.744515995 +0000 +++ 0020-net-mlx5-fix-polling-CQEs.patch 2025-02-12 17:29:34.190944975 +0000 @@ -1 +1 @@ -From 73f7ae1d721aa5c388123db11827937205985999 Mon Sep 17 00:00:00 2001 +From a0008d4df03f25a264ae7a1a88131b2e07d50ad9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 73f7ae1d721aa5c388123db11827937205985999 ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -35 +36 @@ -index 38e511a28b..1ed47e1cad 100644 +index 2c7a5d007e..07ae8c48fc 100644 @@ -44 +45 @@ -@@ -466,5 +467,5 @@ Gary Mussar +@@ -465,5 +466,5 @@ Gary Mussar