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 7BB3FA0032 for ; Fri, 18 Feb 2022 13:42:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 75EFE40141; Fri, 18 Feb 2022 13:42:20 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id 0B89740395 for ; Fri, 18 Feb 2022 13:42:19 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id m27so2585834wrb.4 for ; Fri, 18 Feb 2022 04:42:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s4Tr0yyI7NODBdpHbSv99C69DjLgPsgyA4xpcc+U0QM=; b=m3S3AQQOlr0p06UVdsY/6V6qhuRKgkQfnWKmckOe83+Bs+BhcO8sQ2KoqU1HGjgtKz Iti30OBKTGsMo89fRX1p8tBA7qW1EThliOxFHqg4G2T0p5EyldJe16rNSu2boemwKlmq /tKpzYNDO05isfDe9q9jFjlk5pQmgmdSX6VXeMYYoT7fz+r+vUkG2FT7o5WMIpj+n19E nIQ6zFYK6rbZeWZc2Sju7wuQ5z5GcCJmvFTagzypi4d1DVBaZEza7Wgq2HGHk5qgGt5O z2XHjS2KcKrmDFo71G0jWP0m7J3XJubsKL0qXQtEcPfjHLoWwkgoTNOZT4J/TxQ/qHG7 1OOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s4Tr0yyI7NODBdpHbSv99C69DjLgPsgyA4xpcc+U0QM=; b=r2244vGerYqPHYl0zwcH8C253AptcNgCpDWOPTOFhWN4SPdPlpy0b3hqhWcUnFMlwY z3gqes4r1rmGYXwc+2eTSeli73JZcLEYEh/PeGVcaK8DaEaj4xdHH3PR7Kj7IXuRF93y Zsp8K8M2jy25lZkmhOqaB8logju0qo831A9iCEv0WvSmDdDXbWLYFnpO4OhdqI0npprF kS+tW+LpavnA0EjBKzJ+V3jUg/UiqS6ewTUfz48RqdZFUHvzgRVVhDElXmIXwhqWsmDj NmjVJY4hdGy9PuDuVBbrM8by3/BGT/g05C6zC1HbOdRiOyZmLjeDF7E9W7eiLImo+/Fu yHSg== X-Gm-Message-State: AOAM530GelbQPz9Cl9cCicIchqCp21gCkuBWf7WUNjPCNb+QW1n6XMoD Lfp+7YENSxoc7UhBUJtdokfOnVMHiW7twLKK X-Google-Smtp-Source: ABdhPJyMYfFc7Mltm03kEknPDCP+II0Em7rXd5id77AQMIEabc1Zpgbr1XO3sWLYHKc55IhmCJsh8Q== X-Received: by 2002:adf:ef07:0:b0:1e3:333f:a101 with SMTP id e7-20020adfef07000000b001e3333fa101mr6057939wro.301.1645188138747; Fri, 18 Feb 2022 04:42:18 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id t18sm4066198wmi.30.2022.02.18.04.42.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:42:18 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.5 Date: Fri, 18 Feb 2022 12:38:22 +0000 Message-Id: <20220218123931.1749595-53-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7ee6d43e5e5ab91fb4b21ae393e3fc2245a47405 Thanks. Luca Boccassi --- >From 7ee6d43e5e5ab91fb4b21ae393e3fc2245a47405 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 4cfa818616..53ce63f07b 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -869,6 +869,7 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp) ring->ring_mask = ring->ring_size - 1; ring->vmem_size = 0; ring->vmem = NULL; + ring->fw_ring_id = INVALID_HW_RING_ID; bp->async_cp_ring = cpr; cpr->cp_ring_struct = ring; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:40.078696308 +0000 +++ 0053-net-bnxt-handle-ring-cleanup-in-case-of-error.patch 2022-02-18 12:37:37.678791652 +0000 @@ -1 +1 @@ -From 75915b2b3c577ee5bb938c3f1ab6b51958c431a3 Mon Sep 17 00:00:00 2001 +From 7ee6d43e5e5ab91fb4b21ae393e3fc2245a47405 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 75915b2b3c577ee5bb938c3f1ab6b51958c431a3 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index dc437f314e..5c6c27fed7 100644 +index 4cfa818616..53ce63f07b 100644 @@ -28 +29 @@ -@@ -851,6 +851,7 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp) +@@ -869,6 +869,7 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp)