From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <christian.ehrhardt@canonical.com>
Received: from youngberry.canonical.com (youngberry.canonical.com
[91.189.89.112]) by dpdk.org (Postfix) with ESMTP id 6E41C559C
for <dev@dpdk.org>; Wed, 16 Mar 2016 13:34:11 +0100 (CET)
Received: from 1.general.paelzer.uk.vpn ([10.172.196.172]
helo=localhost.localdomain)
by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16)
(Exim 4.76) (envelope-from <christian.ehrhardt@canonical.com>)
id 1agAeR-0002Hx-3M; Wed, 16 Mar 2016 12:34:11 +0000
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: christian.ehrhardt@canonical.com, bruce.richardson@intel.com, dev@dpdk.org
Date: Wed, 16 Mar 2016 13:33:48 +0100
Message-Id: <1458131629-21925-3-git-send-email-christian.ehrhardt@canonical.com>
X-Mailer: git-send-email 2.7.0
In-Reply-To: <1458131629-21925-1-git-send-email-christian.ehrhardt@canonical.com>
References: <1458131629-21925-1-git-send-email-christian.ehrhardt@canonical.com>
Subject: [dpdk-dev] [PATCH 2/3] lpm6: fix missing free of rules_tbl and lpm
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Mar 2016 12:34:11 -0000
lpm6 autotests failed with the default alloc of 512M Memory.
While >=2500M was a workaround it became clear while debugging that it
had a leak.
One could see a lot of output like:
LPM Test tests6[i]: FAIL
LPM: LPM memory allocation failed
It turned out that in rte_lpm6_free
- lpm might not be freed if it didn't find a te (early return)
- lpm->rules_tbl was not freed ever
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
lib/librte_lpm/rte_lpm6.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/librte_lpm/rte_lpm6.c b/lib/librte_lpm/rte_lpm6.c
index 48931cc..4c44cd7 100644
--- a/lib/librte_lpm/rte_lpm6.c
+++ b/lib/librte_lpm/rte_lpm6.c
@@ -278,15 +278,13 @@ rte_lpm6_free(struct rte_lpm6 *lpm)
if (te->data == (void *) lpm)
break;
}
- if (te == NULL) {
- rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
- return;
- }
- TAILQ_REMOVE(lpm_list, te, next);
+ if (te != NULL)
+ TAILQ_REMOVE(lpm_list, te, next);
rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+ rte_free(lpm->rules_tbl);
rte_free(lpm);
rte_free(te);
}
--
2.7.0