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 6D738A0C41 for ; Tue, 30 Nov 2021 17:38:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 67522410F7; Tue, 30 Nov 2021 17:38:52 +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 01143410F7 for ; Tue, 30 Nov 2021 17:38:52 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 BBDD13F1B2 for ; Tue, 30 Nov 2021 16:38:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290331; bh=15/5h3BGwOH/WSUAa1CqglbB/2e+w0STC6p9otTYkcc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QtkP6NwxDvdkye79ohWh9nQ3KCYKO+3heJwNPN44mTQS5x275Da8wpDY00Y2x97sy 3ZMx8vlZvEK0vIB8Wx0yposTcOBP0x+l8jvIta7R90tFSMu6PyIfRsOEFa9KuoqICZ P0X2Go+YhgPsEIlamFwIhVaRPNiQH8m+oqTp8fggoM7G9pP/fFGnPCqVIZiLEXXnWI ueMWRfd617T2ijowSh9O5I194RjYFTpo0brX5OX4HsF4f+z2/u23rxIYtGVn2EGz0x ZrnrdYnHZHpViujUhK2BuGATnCIrFL1EjSmzIZmyl0dOqkBjy3Tix2On4D/jHujzPg kjpDqa4e+FARA== Received: by mail-ed1-f69.google.com with SMTP id v22-20020a50a456000000b003e7cbfe3dfeso17444088edb.11 for ; Tue, 30 Nov 2021 08:38:51 -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=15/5h3BGwOH/WSUAa1CqglbB/2e+w0STC6p9otTYkcc=; b=vf2RSDhAdCkB5uX1np4ekPtIhob0lv5B0oQJnPfXDyhv8c65rWOH7aDBQTjs0qPOGm SfQwlw1sP8PGjs3NgnzzdwEwEt1qhZm9DImwYnvJXlyk6mHnAYEmXlwSgYj5IkP7XC60 dxTgEwuERf8qvZ70wm/mdt6ySECZ++LPK4TJUCiKs42w2tQWq9kzbQppdhlQ9P3Xl+Wx XLN5DYox3rkWDw0RT7nDBZxPZzNER+A/wfGuTGk1WYcpwx/W0hLGCcpTDkWulR5EtPGh pdzYOiJRSgNOhoUgVnlOuHU7FROOEVdzmu81R8VjKboOMIMdz8hRg7HTpxJMY5rGD2eX ibFg== X-Gm-Message-State: AOAM531VpFcwAOKg2zJ9crNtj/DZaMmd7JARjxNZvAuuVKJVAXs8Mp+z M7KjdjB+p/Y+cfgszqmei+w5cPRCzPpQxSmYa1bI/jhxAMZNzpZaMOQo4IuSAzPSqM8Fn/UQYIx RLC/yRKHhaztlOSPnKCWbqNXf X-Received: by 2002:a17:907:3e0c:: with SMTP id hp12mr255678ejc.182.1638290330938; Tue, 30 Nov 2021 08:38:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJwTjuNulpyUSaeL89woMOcsPApPPhEiLbecTrtDV333HrFBKg568Yi9yDBtv2A89Rbh1OIlnw== X-Received: by 2002:a17:907:3e0c:: with SMTP id hp12mr255663ejc.182.1638290330772; Tue, 30 Nov 2021 08:38:50 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id he17sm9307168ejc.110.2021.11.30.08.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:38:50 -0800 (PST) From: christian.ehrhardt@canonical.com To: Ajit Khaparde Cc: Lance Richardson , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix memzone free for Tx and Rx rings' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:15 +0100 Message-Id: <20211130163605.2460997-51-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/20c6894eed7561e7830b5e6042407a5d89bede36 Thanks. Christian Ehrhardt --- >From 20c6894eed7561e7830b5e6042407a5d89bede36 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Mon, 20 Sep 2021 16:11:51 -0700 Subject: [PATCH] net/bnxt: fix memzone free for Tx and Rx rings [ upstream commit 64a4d59df5d668e18762a80d360a1aa8a9e8d81d ] The device cleanup logic was freeing most of the ring related memory, but was not freeing up the memzone associated with the rings. This patch fixes the issue. Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code") Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code") Signed-off-by: Ajit Khaparde Reviewed-by: Lance Richardson Reviewed-by: Somnath Kotur --- 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 f830bb6702..8133889297 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -849,6 +849,9 @@ void bnxt_free_rx_rings(struct bnxt *bp) rte_free(rxq->cp_ring->cp_ring_struct); rte_free(rxq->cp_ring); + rte_memzone_free(rxq->mz); + rxq->mz = NULL; + rte_free(rxq); bp->rx_queues[i] = NULL; } diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index 0d6d485ab2..78c3f2918c 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -37,6 +37,9 @@ void bnxt_free_tx_rings(struct bnxt *bp) rte_free(txq->cp_ring->cp_ring_struct); rte_free(txq->cp_ring); + rte_memzone_free(txq->mz); + txq->mz = NULL; + rte_free(txq); bp->tx_queues[i] = NULL; } -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:09.041287523 +0100 +++ 0051-net-bnxt-fix-memzone-free-for-Tx-and-Rx-rings.patch 2021-11-30 16:50:05.690872796 +0100 @@ -1 +1 @@ -From 64a4d59df5d668e18762a80d360a1aa8a9e8d81d Mon Sep 17 00:00:00 2001 +From 20c6894eed7561e7830b5e6042407a5d89bede36 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 64a4d59df5d668e18762a80d360a1aa8a9e8d81d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index a40fa50138..4c1ee4294e 100644 +index f830bb6702..8133889297 100644 @@ -26 +27 @@ -@@ -1207,6 +1207,9 @@ void bnxt_free_rx_rings(struct bnxt *bp) +@@ -849,6 +849,9 @@ void bnxt_free_rx_rings(struct bnxt *bp) @@ -37 +38 @@ -index 47824334ae..9e45ddd7a8 100644 +index 0d6d485ab2..78c3f2918c 100644 @@ -40 +41 @@ -@@ -38,6 +38,9 @@ void bnxt_free_tx_rings(struct bnxt *bp) +@@ -37,6 +37,9 @@ void bnxt_free_tx_rings(struct bnxt *bp)