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 6007846211 for ; Thu, 13 Feb 2025 11:02:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59AFE42EE7; Thu, 13 Feb 2025 11:02:20 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id E3F4B42EE7 for ; Thu, 13 Feb 2025 11:02:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440938; 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=0z62Y2dxnCakHvWkt3uXhBTa1UwbAPqy+Rg7h9rw+2E=; b=K/GVOhS3XngPLUbBrcZ1NNVsK+pvhav5nB4A9vmopl89YPZrAMetp1Fcnbqfviw06gD1s+ j46tztP1pXNVj75iUJrXBeR91kEpMZLX8j9bFrt6tmVnq55h/JPgYJndpqlyVwdOfeK+ri bZsAV2d/zrn9gbtd1dQt2FsdgV6QURI= Received: from mx-prod-mc-01.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-220-l2xJloikNzidy01gRI6NCw-1; Thu, 13 Feb 2025 05:02:15 -0500 X-MC-Unique: l2xJloikNzidy01gRI6NCw-1 X-Mimecast-MFC-AGG-ID: l2xJloikNzidy01gRI6NCw_1739440933 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4EF51975AFC; Thu, 13 Feb 2025 10:02:13 +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 A0CCB1800570; Thu, 13 Feb 2025 10:02:12 +0000 (UTC) From: Kevin Traynor To: Ajit Khaparde Cc: dpdk stable Subject: patch 'net/bnxt: fix Rx handler' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:58:32 +0000 Message-ID: <20250213095933.362078-65-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: lo0MYIYM52cWSpoA0jAI0FM4QjnyQ1yQCZwbqN_tqcs_1739440933 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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/165e2879f3e356e8aae633946999858608bbef2d Thanks. Kevin --- >From 165e2879f3e356e8aae633946999858608bbef2d Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Mon, 3 Feb 2025 11:50:39 -0800 Subject: [PATCH] net/bnxt: fix Rx handler [ upstream commit 73b05bbc6dd2d21c59b6ec6f72d8ae88d6bead3d ] Fix the code accounting the status of compressed CQE handler. The code was inside the block handling the normal CQE mode. Moved the code out. Without this the Rx datapath was broken for compressed CQEs in scalar mode. Fixes: 5c980062d895 ("net/bnxt: support compressed Rx CQE") Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 5b43bcbea6..b53d9a917a 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -1391,12 +1391,4 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, (CMP_TYPE(rxcmp) <= CMPL_BASE_TYPE_RX_TPA_START_V3)) { rc = bnxt_rx_pkt(&rx_pkts[nb_rx_pkts], rxq, &raw_cons); - if (!rc) - nb_rx_pkts++; - else if (rc == -EBUSY) /* partial completion */ - break; - else if (rc == -ENODEV) /* completion for representor */ - nb_rep_rx_pkts++; - else if (rc == -ENOMEM) - nb_rx_pkts++; } else if (!BNXT_NUM_ASYNC_CPR(rxq->bp)) { evt = @@ -1408,4 +1400,12 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, } + if (!rc) + nb_rx_pkts++; + else if (rc == -EBUSY) /* partial completion */ + break; + else if (rc == -ENODEV) /* completion for representor */ + nb_rep_rx_pkts++; + else if (rc == -ENOMEM) + nb_rx_pkts++; raw_cons = NEXT_RAW_CMP(raw_cons); /* -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:41.421539967 +0000 +++ 0065-net-bnxt-fix-Rx-handler.patch 2025-02-12 17:29:34.395946198 +0000 @@ -1 +1 @@ -From 73b05bbc6dd2d21c59b6ec6f72d8ae88d6bead3d Mon Sep 17 00:00:00 2001 +From 165e2879f3e356e8aae633946999858608bbef2d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 73b05bbc6dd2d21c59b6ec6f72d8ae88d6bead3d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org