DPDK patches and discussions
 help / color / mirror / Atom feed
* [PATCH] lib/kni : fix memory-leak on rte_kni_rx_burst
@ 2023-05-16 10:48 Yasin CANER
  2023-05-16 11:03 ` [PATCH v2] lib/kni : coding style is fixed Yasin CANER
  2023-05-17 18:25 ` [PATCH] lib/kni : fix memory-leak on rte_kni_rx_burst Ferruh Yigit
  0 siblings, 2 replies; 4+ messages in thread
From: Yasin CANER @ 2023-05-16 10:48 UTC (permalink / raw)
  To: dev; +Cc: stable, stephen

Coverity issue:
Bugzilla ID: 1227
Fixes:
Cc: stable@dpdk.org
Cc: stephen@networkplumber.org

Adding new condition to check buffer is removed or not.
it prevent allocation each time when rte_kni_rx_burst function called
that cause memory-leak.

Signed-off-by: Yasin CANER <yasinncaner@gmail.com>
---
 lib/kni/rte_kni.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c
index bfa6a001ff..2244892aae 100644
--- a/lib/kni/rte_kni.c
+++ b/lib/kni/rte_kni.c
@@ -660,7 +660,8 @@ kni_allocate_mbufs(struct rte_kni *kni)
 	int i, ret;
 	struct rte_mbuf *pkts[MAX_MBUF_BURST_NUM];
 	void *phys[MAX_MBUF_BURST_NUM];
-	int allocq_free;
+	int allocq_free, allocq_count;
+	uint32_t allocq;
 
 	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pool) !=
 			 offsetof(struct rte_kni_mbuf, pool));
@@ -682,10 +683,26 @@ kni_allocate_mbufs(struct rte_kni *kni)
 		RTE_LOG(ERR, KNI, "No valid mempool for allocating mbufs\n");
 		return;
 	}
-
+	/* First, getting allocation count from alloc_q. alloc_q is allocated in this function 
+	 * and/or kni_alloc function from mempool.
+	 * If alloc_q is completely removed, it shall be allocated again.
+	 * */
+	allocq = kni_fifo_count(kni->alloc_q);
+	/* How many free allocation is possible from mempool. */
 	allocq_free = kni_fifo_free_count(kni->alloc_q);
-	allocq_free = (allocq_free > MAX_MBUF_BURST_NUM) ?
-		MAX_MBUF_BURST_NUM : allocq_free;
+	/* Allocated alloc_q count shall be max MAX_MBUF_BURST_NUM. */
+	allocq_count = MAX_MBUF_BURST_NUM - (int)allocq;
+	/* Try to figure out how many allocation is possible. allocq_free is max possible.*/
+	allocq_free = (allocq_free > MAX_MBUF_BURST_NUM )? MAX_MBUF_BURST_NUM : allocq_free;
+	/* Buffer is not removed so no need re-allocate*/
+
+	if(!allocq_count) {
+		/* Buffer is not removed so no need re-allocation*/
+		return;
+	} else if (allocq_free > allocq_count) {
+		allocq_free = allocq_count;
+	}
+
 	for (i = 0; i < allocq_free; i++) {
 		pkts[i] = rte_pktmbuf_alloc(kni->pktmbuf_pool);
 		if (unlikely(pkts[i] == NULL)) {
-- 
2.25.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-05-17 18:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-16 10:48 [PATCH] lib/kni : fix memory-leak on rte_kni_rx_burst Yasin CANER
2023-05-16 11:03 ` [PATCH v2] lib/kni : coding style is fixed Yasin CANER
2023-05-16 15:16   ` Stephen Hemminger
2023-05-17 18:25 ` [PATCH] lib/kni : fix memory-leak on rte_kni_rx_burst Ferruh Yigit

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).