From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 8668CA046B for ; Mon, 24 Jun 2019 17:26:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 79EF41BEDD; Mon, 24 Jun 2019 17:26:31 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id CC8C61BCD4 for ; Mon, 24 Jun 2019 17:26:30 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48990307D981; Mon, 24 Jun 2019 15:26:30 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A42D19C69; Mon, 24 Jun 2019 15:26:29 +0000 (UTC) From: Kevin Traynor To: Shahed Shaikh Cc: Rasesh Mody , dpdk stable Date: Mon, 24 Jun 2019 16:24:46 +0100 Message-Id: <20190624152525.19349-22-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 24 Jun 2019 15:26:30 +0000 (UTC) Subject: [dpdk-stable] patch 'net/bnx2x: fix memory leak' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/19. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/fee77da946a3536cd35d0ec94195136e21c77f53 Thanks. Kevin Traynor --- >From fee77da946a3536cd35d0ec94195136e21c77f53 Mon Sep 17 00:00:00 2001 From: Shahed Shaikh Date: Tue, 4 Jun 2019 11:53:50 -0700 Subject: [PATCH] net/bnx2x: fix memory leak [ upstream commit 0cf8fdce99764e28c747027570126f965ad71eed ] bnx2x_free_hsi_mem() does not free DMA memory. Fix it here. Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Shahed Shaikh Acked-by: Rasesh Mody --- drivers/net/bnx2x/bnx2x.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index e9f05a73a..d3b260830 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -9019,4 +9019,5 @@ void bnx2x_free_hsi_mem(struct bnx2x_softc *sc) memset(&fp->status_block, 0, sizeof(fp->status_block)); + bnx2x_dma_free(&fp->sb_dma); } @@ -9025,4 +9026,5 @@ void bnx2x_free_hsi_mem(struct bnx2x_softc *sc) /***************************/ + bnx2x_dma_free(&sc->gz_buf_dma); sc->gz_buf = NULL; @@ -9031,4 +9033,5 @@ void bnx2x_free_hsi_mem(struct bnx2x_softc *sc) /*******************/ + bnx2x_dma_free(&sc->spq_dma); sc->spq = NULL; @@ -9037,4 +9040,5 @@ void bnx2x_free_hsi_mem(struct bnx2x_softc *sc) /*************/ + bnx2x_dma_free(&sc->sp_dma); sc->sp = NULL; @@ -9043,4 +9047,5 @@ void bnx2x_free_hsi_mem(struct bnx2x_softc *sc) /***************/ + bnx2x_dma_free(&sc->eq_dma); sc->eq = NULL; @@ -9049,4 +9054,5 @@ void bnx2x_free_hsi_mem(struct bnx2x_softc *sc) /************************/ + bnx2x_dma_free(&sc->def_sb_dma); sc->def_sb = NULL; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:56.243505633 +0100 +++ 0022-net-bnx2x-fix-memory-leak.patch 2019-06-24 16:18:55.032431200 +0100 @@ -1 +1 @@ -From 0cf8fdce99764e28c747027570126f965ad71eed Mon Sep 17 00:00:00 2001 +From fee77da946a3536cd35d0ec94195136e21c77f53 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0cf8fdce99764e28c747027570126f965ad71eed ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5a47fd8fe..d523f4f2c 100644 +index e9f05a73a..d3b260830 100644