d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kni: fix possible memory leak

Browse Source 
alloc_q and rx_q fifos holds physical address of the mbufs, and not able
to free those mbufs explicitly.

But kernel thread reads from rx_q and puts used mbufs into free_q (with
their virtual addresses.) And kernel thread stopped when application
close the /dev/kni file on exit. So rx_q has time to be consumed by
kernel thread but leak is technically possible.

Another fifo, alloc_q has physical addresses too, but all those coming
from same mempool provided by application, when application quit, all
mempool already returned back, so this leak can be ignored.

Added check and wait logic for rx_q to be sure kernel consumed the fifo,
an error message printed after some ammount of wait, and an explicit
mempool free added for alloc_q.

Fixes: 8451269e6d ("kni: remove continuous memory restriction")
Cc: stable@dpdk.org

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Ferruh Yigit 2017-04-18 15:21:44 +01:00 committed by Thomas Monjalon
parent 999b2ee0fe
commit 8eba5ebd18
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/librte_kni/rte_kni.c
View File

@ -452,16 +452,16 @@ kni_free_fifo(struct rte_kni_fifo *fifo)
}
static void
kni_free_fifo_phy(struct rte_kni_fifo *fifo)
kni_free_fifo_phy(struct rte_mempool *pktmbuf_pool, struct rte_kni_fifo *fifo)
{
void *mbuf_phys;
int ret;
rte_mempool_free(pktmbuf_pool);
/* All mbufs alredy freed with rte_mempoll_free, just free the fifo */
do {
ret = kni_fifo_get(fifo, &mbuf_phys, 1);
/*
* TODO: free mbufs
*/
} while (ret);
}
@ -470,6 +470,7 @@ rte_kni_release(struct rte_kni *kni)
{
struct rte_kni_device_info dev_info;
uint32_t slot_id;
uint32_t retry = 5;
if (!kni || !kni->in_use)
return -1;
@ -481,9 +482,16 @@ rte_kni_release(struct rte_kni *kni)
}
/* mbufs in all fifo should be released, except request/response */
/* wait until all rxq packets processed by kernel */
while (kni_fifo_count(kni->rx_q) && retry--)
usleep(1000);
if (kni_fifo_count(kni->rx_q))
RTE_LOG(ERR, KNI, "Fail to free all Rx-q items\n");
kni_free_fifo_phy(kni->pktmbuf_pool, kni->alloc_q);
kni_free_fifo(kni->tx_q);
kni_free_fifo_phy(kni->rx_q);
kni_free_fifo_phy(kni->alloc_q);
kni_free_fifo(kni->free_q);
slot_id = kni->slot_id;

9
lib/librte_kni/rte_kni_fifo.h
View File

@ -91,3 +91,12 @@ kni_fifo_get(struct rte_kni_fifo *fifo, void **data, unsigned num)
fifo->read = new_read;
return i;
}
/**
* Get the num of elements in the fifo
*/
static inline uint32_t
kni_fifo_count(struct rte_kni_fifo *fifo)
{
return (fifo->len + fifo->write - fifo->read) & (fifo->len - 1);
}