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 340DC43C60 for ; Thu, 7 Mar 2024 02:36:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D58242F07; Thu, 7 Mar 2024 02:36:44 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 38F8642EE3 for ; Thu, 7 Mar 2024 02:36:42 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-412fc5f5099so2967375e9.2 for ; Wed, 06 Mar 2024 17:36:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775402; x=1710380202; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tLdmgJalb65aPooIgoCud6NBJ6JUhCO4bsBzeU+SADQ=; b=m1NjQTz83wDbsCcsGBM7jWT51KCZAfXiyIt6Nn956bu5pirKR7L0iwaNc/y/pKG9TH Z4uAAMMN8hmD6JCsCjc5J3poobnSDMbWrbQR/p+arN1XzWIE/z1uLT/orKWv5XGpcttH 8UWxwVLNhvwQPV8DxwqmQOJLK1t+cBRThTHL7/e3K/7zq3BAck8WKid1nwgeqY6LEcm4 uEmvmq/3capWBi6jQvS0bMCFN1MW63D1cxzHw+p7sA6ttkPz9N4jOyKFGHK9d8xPO4ze g2J5yReue8xeSLmWPPxnBvOc8qQawQMU2186i4zjcJDlNMKCJXuoXisheZp5PYLaDQfU P81Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775402; x=1710380202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tLdmgJalb65aPooIgoCud6NBJ6JUhCO4bsBzeU+SADQ=; b=SS9mb+12MZaqCc12knCRa1kmGshX9OEKF1TrQO1D2ouc1Y7DAmzuAAxSlXlilUJ37N djgqDraHjgFU9VBznbFAgGTWdnl5LdBy21a0v954faQ86cxAZKQfaY8tVWH/jWNPnM38 gSMxK28yCHRxyJp5uZY7fAV/y2DmJ0MnhOCdaDNv4tVdskmqMXLjCOG2mUoQhiWw6b2G dEhS3k+/0f3n7oukZJbu12fXJbDSq+H57lXMT2jgdfQMpaTiiFGIDH/7AkFs0q3zswYA DwGUOvB1v488fCJLrQzedkkkTc8Sn0PXkG8+iqiZk9dU7g6/jpHxNMPAtAnWfvZhhLTe ZA7Q== X-Gm-Message-State: AOJu0Yz4UD5XZ+Rq59FMn+iC86uEDN0OjQqLlDHqwOYbTfEl+7+8z6I3 AQfmEjLyb0OGk4yXy1BsPiaU7bUpkYFrLOIgW89J9fFLtxACAD6B5/TmnDc4DaQ= X-Google-Smtp-Source: AGHT+IHluj5xSdqrYNQHzRgIKk3s4hSWsmHV0hEftjvrl/r1An347vv3IFqmQRXoKwYTQ/Kxcv8V6Q== X-Received: by 2002:a5d:4d01:0:b0:33d:69c1:dcc3 with SMTP id z1-20020a5d4d01000000b0033d69c1dcc3mr8738855wrt.56.1709775401903; Wed, 06 Mar 2024 17:36:41 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id f14-20020a5d50ce000000b0033b66c2d61esm18843926wrt.48.2024.03.06.17.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:36:41 -0800 (PST) From: luca.boccassi@gmail.com To: Long Li Cc: dpdk stable Subject: patch 'net/mana: fix memory leak on MR allocation' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:36 +0000 Message-Id: <20240307013159.1735343-79-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.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 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/97789491e62bbae789dac10d6a0df851c85da595 Thanks. Luca Boccassi --- >From 97789491e62bbae789dac10d6a0df851c85da595 Mon Sep 17 00:00:00 2001 From: Long Li Date: Thu, 8 Feb 2024 16:05:03 -0800 Subject: [PATCH] net/mana: fix memory leak on MR allocation [ upstream commit 9d61fe41acaaf6bf88c173acce2b3165ddf0eb9d ] 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") Signed-off-by: Long Li --- 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 b8e6ea0bbf..dfb2412834 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 -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:41.492182054 +0000 +++ 0079-net-mana-fix-memory-leak-on-MR-allocation.patch 2024-03-07 01:05:34.930942818 +0000 @@ -1 +1 @@ -From 9d61fe41acaaf6bf88c173acce2b3165ddf0eb9d Mon Sep 17 00:00:00 2001 +From 97789491e62bbae789dac10d6a0df851c85da595 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9d61fe41acaaf6bf88c173acce2b3165ddf0eb9d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index d6a5ad1460..c9d0f7ef5a 100644 +index b8e6ea0bbf..dfb2412834 100644