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 8A27FA0350 for ; Mon, 21 Feb 2022 16:39:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85F29410F3; Mon, 21 Feb 2022 16:39:42 +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 B836E4013F for ; Mon, 21 Feb 2022 16:39:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457980; 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=wMYd+J+Ys/TkEgLEVmV2IMOkxvBEBc2nX2JA5R4yj5w=; b=iIEnLcaTSt3haks0prZT8sLPlnX0oTykAxJER3uPi+uRkPoneS3FWpXkX7RuVVmzuo3Qie xp4IN3zLrGwETvW6+408s5uNSOZ1FIbXTmtHikLv5bTUXq5XV9+jV00VWgshYhVTaWAsiZ pVNXaH0XYNCXrddSOVNUhrPT5YkdhSc= 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-478-7TfeALE_N9-zsvkeWyZ5Vw-1; Mon, 21 Feb 2022 10:39:36 -0500 X-MC-Unique: 7TfeALE_N9-zsvkeWyZ5Vw-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 9CD9F1846088; Mon, 21 Feb 2022 15:39:35 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28A7D7E2C5; Mon, 21 Feb 2022 15:39:33 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: handle ring cleanup in case of error' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:45 +0000 Message-Id: <20220221153625.152324-96-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/e44c18821c1fcf731f3ae7e369ff8c49524b1577 Thanks. Kevin --- >From e44c18821c1fcf731f3ae7e369ff8c49524b1577 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 20 Jan 2022 14:42:26 +0530 Subject: [PATCH] net/bnxt: handle ring cleanup in case of error [ upstream commit 75915b2b3c577ee5bb938c3f1ab6b51958c431a3 ] In bnxt_alloc_mem(), after bnxt_alloc_async_ring_struct(), any of the functions failure causes an error: bnxt_hwrm_ring_free(): hwrm_ring_free nq failed. rc:1 Fix this by initializing ring->fw_ring_id to INVALID_HW_RING_ID in bnxt_alloc_async_ring_struct(). Fixes: bd0a14c99f65 ("net/bnxt: use dedicated CPR for async events") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ring.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c index dc437f314e..5c6c27fed7 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -852,4 +852,5 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp) ring->vmem_size = 0; ring->vmem = NULL; + ring->fw_ring_id = INVALID_HW_RING_ID; bp->async_cp_ring = cpr; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.701399666 +0000 +++ 0096-net-bnxt-handle-ring-cleanup-in-case-of-error.patch 2022-02-21 15:22:44.196704362 +0000 @@ -1 +1 @@ -From 75915b2b3c577ee5bb938c3f1ab6b51958c431a3 Mon Sep 17 00:00:00 2001 +From e44c18821c1fcf731f3ae7e369ff8c49524b1577 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 75915b2b3c577ee5bb938c3f1ab6b51958c431a3 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org