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 00284A034E for ; Mon, 21 Feb 2022 16:38:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EF5484013F; Mon, 21 Feb 2022 16:38:44 +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 3973F4013F for ; Mon, 21 Feb 2022 16:38:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457921; 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=IEIqmseSNB5F2midlPxIMpCaeTlKJ57amZoUZOB92bE=; b=JNiEZXeuMnj2R/HzroFXDApjXwLAVbEhavgcEBfZKrDtbtbJgQH2taX1r/FELjIacuwcya nWhrg3KQhcxELPyLdcklMWuviHK7YESP7e+oSW8ujbnXPiUtne3fZsyjDfBC3EHAQW38bK Dxej5IwUtbsUP//BkhDeMzTqoZmp3aQ= 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-668-jhVhVoz3Pk6W7VWekm8gUw-1; Mon, 21 Feb 2022 10:38:38 -0500 X-MC-Unique: jhVhVoz3Pk6W7VWekm8gUw-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 75B951842BE5; Mon, 21 Feb 2022 15:38:37 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 313057E2F1; Mon, 21 Feb 2022 15:38:36 +0000 (UTC) From: Kevin Traynor To: Ajit Khaparde Cc: Somnath Kotur , Kalesh AP , dpdk stable Subject: patch 'net/bnxt: fix ring teardown' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:10 +0000 Message-Id: <20220221153625.152324-61-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/6c57090c01f03337b1eb75ae8a9524396f04aff2 Thanks. Kevin --- >From 6c57090c01f03337b1eb75ae8a9524396f04aff2 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Tue, 4 Jan 2022 14:08:20 +0530 Subject: [PATCH] net/bnxt: fix ring teardown [ upstream commit 54c6aad567839d4c9f0faa52093a2ef7641f77c3 ] Check for valid bit while scanning for hwrm_done completion during ring teardown. Not checking the valid bit could cause a ring overflow when we ring the doorbell. Fixes: 4fb6ab3f866d ("net/bnxt: check flush status during ring free") Signed-off-by: Ajit Khaparde Reviewed-by: Somnath Kotur Reviewed-by: Kalesh AP --- drivers/net/bnxt/bnxt_rxr.c | 3 +++ drivers/net/bnxt/bnxt_txr.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 9621809bd9..b60c2470f3 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -1412,4 +1412,7 @@ int bnxt_flush_rx_cmp(struct bnxt_cp_ring_info *cpr) rxcmp = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[cons]; + if (!bnxt_cpr_cmp_valid(rxcmp, raw_cons, ring_mask + 1)) + break; + if (CMP_TYPE(rxcmp) == CMPL_BASE_TYPE_HWRM_DONE) return 1; diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index e2b7e40571..3b8f2382f9 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -603,4 +603,7 @@ int bnxt_flush_tx_cmp(struct bnxt_cp_ring_info *cpr) txcmp = (struct tx_cmpl *)&cp_desc_ring[cons]; + if (!bnxt_cpr_cmp_valid(txcmp, raw_cons, ring_mask + 1)) + break; + opaque = rte_cpu_to_le_32(txcmp->opaque); raw_cons = NEXT_RAW_CMP(raw_cons); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.988318372 +0000 +++ 0061-net-bnxt-fix-ring-teardown.patch 2022-02-21 15:22:44.140704236 +0000 @@ -1 +1 @@ -From 54c6aad567839d4c9f0faa52093a2ef7641f77c3 Mon Sep 17 00:00:00 2001 +From 6c57090c01f03337b1eb75ae8a9524396f04aff2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 54c6aad567839d4c9f0faa52093a2ef7641f77c3 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org