From patchwork Fri Feb 9 00:05:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 136571 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3D6F143AB5; Fri, 9 Feb 2024 01:05:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FFA542E77; Fri, 9 Feb 2024 01:05:13 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 01B2440293; Fri, 9 Feb 2024 01:05:12 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1004) id 33ADD207E74F; Thu, 8 Feb 2024 16:05:11 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 33ADD207E74F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxonhyperv.com; s=default; t=1707437111; bh=qQFTy2fKQ9gflgcu2mtHh1FcBerMToAksV4MJ9znRCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To:From; b=L7CXm52opsnYRoKswcyx14ugGd18reNC+QSPv3huclv7z/IhzTTia2CN5WUTrb76y ho8zj8gBlm4MFaiI9piqjjO9qbrEwrNZI6GwjQj0L9gTWKYDy4FwtgCNp8IHjswMlN vKbALVUulM8iVFBWPxvrcyMe5kz38Szl/4ThF+3Q= From: longli@linuxonhyperv.com To: Ferruh Yigit , Andrew Rybchenko Cc: dev@dpdk.org, Long Li , stable@dpdk.org Subject: [Patch v2 1/2] net/mana: fix memory leak on MR variable allocation Date: Thu, 8 Feb 2024 16:05:03 -0800 Message-Id: <1707437104-23548-1-git-send-email-longli@linuxonhyperv.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1706577886-29483-2-git-send-email-longli@linuxonhyperv.com> References: <1706577886-29483-2-git-send-email-longli@linuxonhyperv.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: longli@microsoft.com Errors-To: dev-bounces@dpdk.org From: Long Li Use a MR on the stack instead of allocating it. This fixes the memory leak in the code where a MR is allocated but never freed. Fixes: 0f5db3c68ba7 ("net/mana: implement memory registration") Cc: stable@dpdk.org Signed-off-by: Long Li --- Change in v2: change commit message to indicate this is a fix. added "Fixes" tag. drivers/net/mana/mr.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/mana/mr.c b/drivers/net/mana/mr.c index d6a5ad1460..c9d0f7ef5a 100644 --- a/drivers/net/mana/mr.c +++ b/drivers/net/mana/mr.c @@ -40,7 +40,7 @@ mana_new_pmd_mr(struct mana_mr_btree *local_tree, struct mana_priv *priv, struct ibv_mr *ibv_mr; struct mana_range ranges[pool->nb_mem_chunks]; uint32_t i; - struct mana_mr_cache *mr; + struct mana_mr_cache mr; int ret; rte_mempool_mem_iter(pool, mana_mempool_chunk_cb, ranges); @@ -75,14 +75,13 @@ mana_new_pmd_mr(struct mana_mr_btree *local_tree, struct mana_priv *priv, DP_LOG(DEBUG, "MR lkey %u addr %p len %zu", ibv_mr->lkey, ibv_mr->addr, ibv_mr->length); - mr = rte_calloc("MANA MR", 1, sizeof(*mr), 0); - mr->lkey = ibv_mr->lkey; - mr->addr = (uintptr_t)ibv_mr->addr; - mr->len = ibv_mr->length; - mr->verb_obj = ibv_mr; + mr.lkey = ibv_mr->lkey; + mr.addr = (uintptr_t)ibv_mr->addr; + mr.len = ibv_mr->length; + mr.verb_obj = ibv_mr; rte_spinlock_lock(&priv->mr_btree_lock); - ret = mana_mr_btree_insert(&priv->mr_btree, mr); + ret = mana_mr_btree_insert(&priv->mr_btree, &mr); rte_spinlock_unlock(&priv->mr_btree_lock); if (ret) { ibv_dereg_mr(ibv_mr); @@ -90,7 +89,7 @@ mana_new_pmd_mr(struct mana_mr_btree *local_tree, struct mana_priv *priv, return ret; } - ret = mana_mr_btree_insert(local_tree, mr); + ret = mana_mr_btree_insert(local_tree, &mr); if (ret) { /* Don't need to clean up MR as it's already * in the global tree