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 E4E0FA034C for ; Fri, 25 Feb 2022 18:16:58 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DCB12410FD; Fri, 25 Feb 2022 18:16:58 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 2E312410FD for ; Fri, 25 Feb 2022 18:16:57 +0100 (CET) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id EDD793FCA5 for ; Fri, 25 Feb 2022 17:16:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809416; bh=IzwCIoFq/WA1zgfQrebqnvT/oLhem/5tl2LCDY7vGnk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ohMxFwnYyRW30ODGzpJ35G0XMruTUehUfjZqj1y7RJvx1SBt61PdTT3CIMClmSXX4 +/ZkX0MYdQEFiCZF+CF8v3VxtcutWyahxcWKQ9zMuUW9r2QpgbHPHUdXPL0ETkpg2v LYi+Mzk/0J+lhiD6lbtS7U4xQsL4n4x0HgU21o72q1XX3wn4LcOWMFhBd9Wk46AeTl Ynm356Mlj/N2LLLzRES8EjKeoEfEIjCXxzWZS7E7mvD1lq5mA0qEPpiCr8gjeBP4rR Ls9spjvvKqJrEtpsnVsZxYu+9qUT5meS/7Mm3qBUPFmexhfOcsLqaMqYF/AhAFc2+O 1X9rkEE5ttwRw== Received: by mail-wm1-f72.google.com with SMTP id 10-20020a1c020a000000b0037fae68fcc2so1833141wmc.8 for ; Fri, 25 Feb 2022 09:16:56 -0800 (PST) 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=IzwCIoFq/WA1zgfQrebqnvT/oLhem/5tl2LCDY7vGnk=; b=WENJcZtmzlpNrgpO9zmW5mAXdOBEXqQT7byY8kz0ykaM2kK2ZSjfusXLUF1jFOs+bN HiRP4bJQQ5Jdmh7K0e+SsXL6JY+Yu9danRt74dGxl0pV35Ox8beMX/Jn3QCTg2y5rdNM 3sijcx7FfYUFoiiJ+NMd8LxiHVxngEfMY1PxMgo7N9ekIPNokIuUliUOGuVVfcnX8nuV MoVK69EZyNPnhOu9FBjhvWpixwlZ4En4sHmD8nCI1PV4FImNCbsZUxItl3bRBffa9wKY 6ZoWML9EnyYn/E3P0ThYpN+6Kcr1Eqe5Lwf1SbTgC27VAKYMWbdK0b+zJiduoUhk42tj latg== X-Gm-Message-State: AOAM533sPVJXdmTSPW5bLfr1owKEKESbMBH1ayWFKqeL/EZpXiC6Qtm7 D/5ZmoNA8YH2U3KU52JztDv65fbjcs5NP4iCpdZLNNKpsmXwrx/1yX7y/AdXpBrvrqApIwIPjyQ fLvEKGpzFq051ctUi3rslIH3f X-Received: by 2002:a05:600c:3483:b0:380:edaf:d479 with SMTP id a3-20020a05600c348300b00380edafd479mr3536248wmq.20.1645809416453; Fri, 25 Feb 2022 09:16:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzn5xY3dzqki+Fi63LCe243DV6+VNMkO6NSQlIfmpaL5hCzGKkkOZno+PSYRltnjBuAJi1X4g== X-Received: by 2002:a05:600c:3483:b0:380:edaf:d479 with SMTP id a3-20020a05600c348300b00380edafd479mr3536229wmq.20.1645809416251; Fri, 25 Feb 2022 09:16:56 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id bj8-20020a0560001e0800b001edbf1b462asm2745162wrb.77.2022.02.25.09.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:16:55 -0800 (PST) From: christian.ehrhardt@canonical.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 19.11.12 Date: Fri, 25 Feb 2022 18:15:14 +0100 Message-Id: <20220225171550.3499040-21-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 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/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/4eb2c96733074b6f9c5841f96aa32bd7730e3ad9 Thanks. Christian Ehrhardt --- >From 4eb2c96733074b6f9c5841f96aa32bd7730e3ad9 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 d601f249da..b56313a6a9 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -841,6 +841,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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.104331957 +0100 +++ 0021-net-bnxt-handle-ring-cleanup-in-case-of-error.patch 2022-02-25 16:58:44.224990398 +0100 @@ -1 +1 @@ -From 75915b2b3c577ee5bb938c3f1ab6b51958c431a3 Mon Sep 17 00:00:00 2001 +From 4eb2c96733074b6f9c5841f96aa32bd7730e3ad9 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 d601f249da..b56313a6a9 100644 @@ -28 +29 @@ -@@ -851,6 +851,7 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp) +@@ -841,6 +841,7 @@ int bnxt_alloc_async_ring_struct(struct bnxt *bp)