summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNipun Gupta <nipun.gupta@nxp.com>2016-11-11 21:17:10 +0530
committerThomas Monjalon <thomas.monjalon@6wind.com>2016-11-12 22:27:09 +0100
commitf5e9ed5c4e35a4cc2db7c10cf855e701472af864 (patch)
tree4f6b80357a1a9a4d364ea04520a9536c9bc7938f
parent1ea56b80f961ade9ec0501bec51720291ce26d39 (diff)
downloaddpdk-f5e9ed5c4e35a4cc2db7c10cf855e701472af864.zip
dpdk-f5e9ed5c4e35a4cc2db7c10cf855e701472af864.tar.gz
dpdk-f5e9ed5c4e35a4cc2db7c10cf855e701472af864.tar.xz
mempool: fix leak if populate fails
This patch fixes the issue of memzone not being freed incase the rte_mempool_populate_phys fails in the rte_mempool_populate_default This issue was identified when testing with OVS ~2.6 - configure the system with low memory (e.g. < 500 MB) - add bridge and dpdk interfaces - delete brigde - keep on repeating the above sequence. Fixes: d1d914ebbc25 ("mempool: allocate in several memory chunks by default") Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com> Acked-by: Olivier Matz <olivier.matz@6wind.com>
-rw-r--r--lib/librte_mempool/rte_mempool.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index e94e56f..aa513b9 100644
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -578,8 +578,10 @@ rte_mempool_populate_default(struct rte_mempool *mp)
mz->len, pg_sz,
rte_mempool_memchunk_mz_free,
(void *)(uintptr_t)mz);
- if (ret < 0)
+ if (ret < 0) {
+ rte_memzone_free(mz);
goto fail;
+ }
}
return mp->size;