DPDK patches and discussions
 help / color / mirror / Atom feed
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: christian.ehrhardt@canonical.com, bruce.richardson@intel.com,
	dev@dpdk.org, olivier.matz@6wind.com
Subject: [dpdk-dev] [PATCH v4 2/5] lpm6: fix missing free of rules_tbl and lpm
Date: Mon, 21 Mar 2016 15:06:12 +0100	[thread overview]
Message-ID: <1458569175-8742-3-git-send-email-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <1458569175-8742-1-git-send-email-christian.ehrhardt@canonical.com>

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>
Acked-by: Olivier Matz <olivier.matz@6wind.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.3

  parent reply	other threads:[~2016-03-21 14:06 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-16 12:33 [dpdk-dev] [PATCH 0/3] lpm allocation fixes - v2 Christian Ehrhardt
2016-03-16 12:33 ` [dpdk-dev] [PATCH 1/3] lpm6: fix use after free of lpm in rte_lpm6_create Christian Ehrhardt
2016-03-16 12:33 ` [dpdk-dev] [PATCH 2/3] lpm6: fix missing free of rules_tbl and lpm Christian Ehrhardt
2016-03-16 12:33 ` [dpdk-dev] [PATCH 3/3] lpm: fix missing free of lpm Christian Ehrhardt
2016-03-16 13:14   ` Olivier MATZ
2016-03-16 13:34     ` Christian Ehrhardt
2016-03-21 14:06 ` [dpdk-dev] [PATCH v4 0/5] lpm allocation fixes Christian Ehrhardt
2016-03-21 14:06   ` [dpdk-dev] [PATCH v4 1/5] lpm6: fix use after free of lpm in rte_lpm6_create Christian Ehrhardt
2016-03-21 14:06   ` Christian Ehrhardt [this message]
2016-03-21 14:06   ` [dpdk-dev] [PATCH v4 3/5] lpm: fix missing free of lpm Christian Ehrhardt
2016-03-21 14:06   ` [dpdk-dev] [PATCH v4 4/5] lpm: fix use after free of lpm in rte_lpm_create* Christian Ehrhardt
2016-03-21 14:06   ` [dpdk-dev] [PATCH v4 5/5] lpm: fix missing free of rules_tbl and lpm in rte_lpm_free* Christian Ehrhardt
2016-03-22 16:14   ` [dpdk-dev] [PATCH v4 0/5] lpm allocation fixes Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458569175-8742-3-git-send-email-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=olivier.matz@6wind.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).