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 886A4A034E for ; Mon, 21 Feb 2022 16:38:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 833744013F; Mon, 21 Feb 2022 16:38:36 +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 57F8A410E0 for ; Mon, 21 Feb 2022 16:38:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457913; 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=rCWoPzegDJKMOeoa/LOnEO17dB8ZLkBODmggAkApi8I=; b=XJEZPPyu6AHfNleMrnznLT29lFVBxOvhK7E3hdEB/U3h3m0J/jJ4M3j8pX+nxLbkbAYQuN Pet7/iBy4bknmf3nWdxZPceqsk0orZnlbBg/1pRH8Ts5yszlnTJH27nsGW/HdWgwjWwrGF QZuXeBuQIeeDYAWynfVuMeLPrR4YYXI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-176-c53AFbGRP1aegSylGWv63g-1; Mon, 21 Feb 2022 10:38:30 -0500 X-MC-Unique: c53AFbGRP1aegSylGWv63g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4608E100C661; Mon, 21 Feb 2022 15:38:29 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0964D7E2EF; Mon, 21 Feb 2022 15:38:27 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: set fast-path pointers only if recovery succeeds' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:05 +0000 Message-Id: <20220221153625.152324-56-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/26/22. 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/a31a8b6a97468dd90387e992355772cb6068d189 Thanks. Kevin --- >From a31a8b6a97468dd90387e992355772cb6068d189 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 4 Jan 2022 14:08:13 +0530 Subject: [PATCH] net/bnxt: set fast-path pointers only if recovery succeeds [ upstream commit de3fef20b94a9a1e46ef5d274b38dcde1095487a ] During reset recovery, fixed to set the fast-path pointers only if recovery succeeds. Fixes: 720b55ad278e ("net/bnxt: fix crash caused by error recovery") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 82350a5008..80de320970 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4377,4 +4377,8 @@ static void bnxt_dev_recover(void *arg) } + rc = bnxt_restore_filters(bp); + if (rc) + goto err_start; + rte_eth_fp_ops[bp->eth_dev->data->port_id].rx_pkt_burst = bp->eth_dev->rx_pkt_burst; @@ -4383,8 +4387,4 @@ static void bnxt_dev_recover(void *arg) rte_mb(); - rc = bnxt_restore_filters(bp); - if (rc) - goto err_start; - PMD_DRV_LOG(INFO, "Port: %u Recovered from FW reset\n", bp->eth_dev->data->port_id); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.874355545 +0000 +++ 0056-net-bnxt-set-fast-path-pointers-only-if-recovery-suc.patch 2022-02-21 15:22:44.126704204 +0000 @@ -1 +1 @@ -From de3fef20b94a9a1e46ef5d274b38dcde1095487a Mon Sep 17 00:00:00 2001 +From a31a8b6a97468dd90387e992355772cb6068d189 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit de3fef20b94a9a1e46ef5d274b38dcde1095487a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org