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 6088845804 for ; Fri, 23 Aug 2024 18:23:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5AF7E4336F; Fri, 23 Aug 2024 18:23:25 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C44C5402BE for ; Fri, 23 Aug 2024 18:23:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430203; 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=+11BFSyoOXlackdjM2lyN6aDzmbIJxqVR2I4dYlzgLo=; b=NZdtJE1wWd4MgAHphwjzs2kLavq593An4dxoF8bln7LAAtBNrscKYDwESFlI894aKlEORc Df4EPITQXOZNyO8YbqfDwxtTIPsoW0St2/35EEV0efltDjw+ON5FTnttDilO5JG5M1j+o4 zb54KHpiY5CmbbgkUAK5fHGcK+ZSrDI= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-329-A5VaOsviO3e6qtfvpbfpgQ-1; Fri, 23 Aug 2024 12:23:20 -0400 X-MC-Unique: A5VaOsviO3e6qtfvpbfpgQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4C1781955D4A; Fri, 23 Aug 2024 16:23:19 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3F8201955F45; Fri, 23 Aug 2024 16:23:18 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: fix memory leaks' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:54 +0100 Message-ID: <20240823161929.1004778-106-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/11c04eef36780305b65cfec8cd769b5d1af7ff4e Thanks. Kevin --- >From 11c04eef36780305b65cfec8cd769b5d1af7ff4e Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:46 +0800 Subject: [PATCH] net/ngbe: fix memory leaks [ upstream commit fea7422f7a4ec2b4c406865629b5ebea699f6588 ] Fix some memory leaks caused by not release resource in time. Fixes: 43b7e5ea60ac ("net/ngbe: support Rx queue setup/release") Fixes: a58e7c312c6b ("net/ngbe: support Tx queue setup/release") Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_rxtx.c | 5 +++++ drivers/net/ngbe/ngbe_rxtx.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c index 5df4186c72..fcff13fb22 100644 --- a/drivers/net/ngbe/ngbe_rxtx.c +++ b/drivers/net/ngbe/ngbe_rxtx.c @@ -1775,4 +1775,5 @@ ngbe_tx_queue_release(struct ngbe_tx_queue *txq) txq->ops->release_mbufs(txq); txq->ops->free_swring(txq); + rte_memzone_free(txq->mz); } rte_free(txq); @@ -1979,4 +1980,5 @@ ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev, } + txq->mz = tz; txq->nb_tx_desc = nb_desc; txq->tx_free_thresh = tx_free_thresh; @@ -2081,4 +2083,5 @@ ngbe_rx_queue_release(struct ngbe_rx_queue *rxq) rte_free(rxq->sw_ring); rte_free(rxq->sw_sc_ring); + rte_memzone_free(rxq->mz); rte_free(rxq); } @@ -2171,4 +2174,5 @@ ngbe_reset_rx_queue(struct ngbe_adapter *adapter, struct ngbe_rx_queue *rxq) rxq->rx_tail = 0; rxq->nb_rx_hold = 0; + rte_pktmbuf_free(rxq->pkt_first_seg); rxq->pkt_first_seg = NULL; rxq->pkt_last_seg = NULL; @@ -2261,4 +2265,5 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev, } + rxq->mz = rz; /* * Zero init all the descriptors in the ring. diff --git a/drivers/net/ngbe/ngbe_rxtx.h b/drivers/net/ngbe/ngbe_rxtx.h index 9130f9d0df..2914b9a756 100644 --- a/drivers/net/ngbe/ngbe_rxtx.h +++ b/drivers/net/ngbe/ngbe_rxtx.h @@ -277,4 +277,5 @@ struct ngbe_rx_queue { /** hold packets to return to application */ struct rte_mbuf *rx_stage[RTE_PMD_NGBE_RX_MAX_BURST * 2]; + const struct rte_memzone *mz; }; @@ -354,4 +355,5 @@ struct ngbe_tx_queue { const struct ngbe_txq_ops *ops; /**< txq ops */ + const struct rte_memzone *mz; }; -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.832603683 +0100 +++ 0106-net-ngbe-fix-memory-leaks.patch 2024-08-23 17:18:09.842430532 +0100 @@ -1 +1 @@ -From fea7422f7a4ec2b4c406865629b5ebea699f6588 Mon Sep 17 00:00:00 2001 +From 11c04eef36780305b65cfec8cd769b5d1af7ff4e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fea7422f7a4ec2b4c406865629b5ebea699f6588 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index c54c67f7ee..f3eb797d0c 100644 +index 5df4186c72..fcff13fb22 100644 @@ -22 +23 @@ -@@ -1814,4 +1814,5 @@ ngbe_tx_queue_release(struct ngbe_tx_queue *txq) +@@ -1775,4 +1775,5 @@ ngbe_tx_queue_release(struct ngbe_tx_queue *txq) @@ -28 +29 @@ -@@ -2031,4 +2032,5 @@ ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -1979,4 +1980,5 @@ ngbe_dev_tx_queue_setup(struct rte_eth_dev *dev, @@ -34 +35 @@ -@@ -2139,4 +2141,5 @@ ngbe_rx_queue_release(struct ngbe_rx_queue *rxq) +@@ -2081,4 +2083,5 @@ ngbe_rx_queue_release(struct ngbe_rx_queue *rxq) @@ -40 +41 @@ -@@ -2229,4 +2232,5 @@ ngbe_reset_rx_queue(struct ngbe_adapter *adapter, struct ngbe_rx_queue *rxq) +@@ -2171,4 +2174,5 @@ ngbe_reset_rx_queue(struct ngbe_adapter *adapter, struct ngbe_rx_queue *rxq) @@ -46 +47 @@ -@@ -2324,4 +2328,5 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -2261,4 +2265,5 @@ ngbe_dev_rx_queue_setup(struct rte_eth_dev *dev, @@ -53 +54 @@ -index 41580ba0b9..7574db32d8 100644 +index 9130f9d0df..2914b9a756 100644 @@ -56 +57 @@ -@@ -292,4 +292,5 @@ struct ngbe_rx_queue { +@@ -277,4 +277,5 @@ struct ngbe_rx_queue { @@ -62 +63 @@ -@@ -374,4 +375,5 @@ struct ngbe_tx_queue { +@@ -354,4 +355,5 @@ struct ngbe_tx_queue {