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 E2D7FA00C4 for ; Fri, 18 Nov 2022 00:09:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E030642D13; Fri, 18 Nov 2022 00:09:28 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id A30974021F for ; Fri, 18 Nov 2022 00:09:27 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id i12so2497589wrb.0 for ; Thu, 17 Nov 2022 15:09:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=/LOGKv/kRRbiP1JSkAON1I4trgblIPRbziF0bP01ZFw=; b=ex+fuOngWixgtgLNSt6jCjGsnwPYvO3rT+5gJaoTejE/xj6QaBf2JqF02kb1qWipNY qnL3JeJKLedhxayJrHOrqFD3dIBSgKXaWrG/+Eg38i6PJVWvrqpP9PaUTR6yF7HIrU+7 odZ0evU2c806ZVAPgP+fOi4XzISy4/i64X4+1qj0AUV8t5tSoQAwfyCuhjiBABx8dqBT mfIns1Cv0Bfdxb+fJoHfxNlnFMgc4aH0N05KpcMWInS8FiSE4GMIJy6bOWTgu9pu4rAq RLdeQk2k+Supa2Ee2m+fI4eXa9ZCBy3MvoP4LFkxNKXO+/QMcjQfPfRJHDdVdgcs0E0+ CHGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=/LOGKv/kRRbiP1JSkAON1I4trgblIPRbziF0bP01ZFw=; b=ejmcm9ADsFEqXaw4c9u0xrG92oumz0aOX1NUuM5ecIGhuFmDriYIqMkShyQOkfhRap HsRahkkqvWpgZq6DE5BZ115bFLzOVIQcpZB20tpnGCKPakBGDpZVdUp/KRDEbEsCBNLO 2q8qunY+Wr5WU5WiL6uHEgIea10nTIbRt9IZclUff3cX9blTt8UVWcqV9E+1/bpDph6W ryvC2Dh0qGZurZjroOl6yhWUDzX4fJVsW5LcYqaj+EfCtH8T82td69vkwoOlKPwij6So y8v1qDIDJNUKaUCxepJr+XzwjiOSjDJ3DuKTyGDWSQaoVDKa6w3PEkDfkWqkOgeTfMwk f8MQ== X-Gm-Message-State: ANoB5pkVfKz0kWuIF6eLFe8T8ORRcf9jsbKrcdRWIF7vdcV9cN/KlTp1 ZxkPRVRSEsQDYdkutmZ7BTAQ8JneINw= X-Google-Smtp-Source: AA0mqf4XK38FF9yVf57RipUsWj3U6EpL5OvlCsy8EhpFcQiXO/geqlYM7S2RS2M/9TajHEUxysqhZQ== X-Received: by 2002:a5d:44c7:0:b0:236:7a11:b06a with SMTP id z7-20020a5d44c7000000b002367a11b06amr2781005wrr.298.1668726567384; Thu, 17 Nov 2022 15:09:27 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id d5-20020adffbc5000000b002417e7f0685sm2472813wrs.9.2022.11.17.15.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:09:26 -0800 (PST) From: luca.boccassi@gmail.com To: Jun Qiu Cc: David Marchand , dpdk stable Subject: patch 'hash: fix RCU configuration memory leak' has been queued to stable release 20.11.7 Date: Thu, 17 Nov 2022 23:08:33 +0000 Message-Id: <20221117230859.611465-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117230859.611465-1-luca.boccassi@gmail.com> References: <20221105171146.1520039-47-luca.boccassi@gmail.com> <20221117230859.611465-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 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/22. 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/9d8095a096ab6803748bac2472894655e0dc6e70 Thanks. Luca Boccassi --- >From 9d8095a096ab6803748bac2472894655e0dc6e70 Mon Sep 17 00:00:00 2001 From: Jun Qiu Date: Fri, 4 Nov 2022 09:51:23 +0000 Subject: [PATCH] hash: fix RCU configuration memory leak [ upstream commit bdd0c62c69b2b3c07e65d66daa7c564280e72480 ] The memory of h->hash_rcu_cfg which is allocated in rte_hash_rcu_qsbr_add was leaked. Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation") Signed-off-by: Jun Qiu Reviewed-by: David Marchand --- lib/librte_hash/rte_cuckoo_hash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c index 1191dfd81a..cff4242f79 100644 --- a/lib/librte_hash/rte_cuckoo_hash.c +++ b/lib/librte_hash/rte_cuckoo_hash.c @@ -527,6 +527,7 @@ rte_hash_free(struct rte_hash *h) rte_free(h->buckets_ext); rte_free(h->tbl_chng_cnt); rte_free(h->ext_bkt_to_free); + rte_free(h->hash_rcu_cfg); rte_free(h); rte_free(te); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-17 23:07:55.897800690 +0000 +++ 0009-hash-fix-RCU-configuration-memory-leak.patch 2022-11-17 23:07:55.444329286 +0000 @@ -1 +1 @@ -From bdd0c62c69b2b3c07e65d66daa7c564280e72480 Mon Sep 17 00:00:00 2001 +From 9d8095a096ab6803748bac2472894655e0dc6e70 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bdd0c62c69b2b3c07e65d66daa7c564280e72480 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/hash/rte_cuckoo_hash.c | 1 + + lib/librte_hash/rte_cuckoo_hash.c | 1 + @@ -18,5 +19,5 @@ -diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c -index 62c762439a..829b79c89a 100644 ---- a/lib/hash/rte_cuckoo_hash.c -+++ b/lib/hash/rte_cuckoo_hash.c -@@ -521,6 +521,7 @@ rte_hash_free(struct rte_hash *h) +diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c +index 1191dfd81a..cff4242f79 100644 +--- a/lib/librte_hash/rte_cuckoo_hash.c ++++ b/lib/librte_hash/rte_cuckoo_hash.c +@@ -527,6 +527,7 @@ rte_hash_free(struct rte_hash *h)