From: Long Wu <long...@corigine.com>
nfp_net_recv_pkts() should not return a value that less than 0 and the
inappropriate return value in receive loop also causes the memory leak.
Modify code to avoid return a value less than 0. Furthermore, When
nfp_net_recv_pkts() break out from the receive loop because of packet
problems, a rte_mbuf will not be freed and it will cause memory leak.
Free the rte_mbuf before break out.
Fixes: b812daadad0d ("nfp: add Rx and Tx")
Cc: louis.pe...@corigine.com
Cc: sta...@dpdk.org
Signed-off-by: Long Wu <long...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderl...@corigine.com>
Signed-off-by: Niklas Söderlund <niklas.soderl...@corigine.com>
---
drivers/net/nfp/nfp_rxtx.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index 12db07c276f0..34493722f1a4 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -281,8 +281,9 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
struct rte_mbuf *new_mb;
uint16_t nb_hold;
uint64_t dma_addr;
- int avail;
+ uint16_t avail;
+ avail = 0;
rxq = rx_queue;
if (unlikely(rxq == NULL)) {
/*
@@ -290,11 +291,10 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
* enabled. But the queue needs to be configured
*/
RTE_LOG_DP(ERR, PMD, "RX Bad queue\n");
- return -EINVAL;
+ return avail;
}
hw = rxq->hw;
- avail = 0;
nb_hold = 0;
while (avail < nb_pkts) {
@@ -360,7 +360,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts, uint16_t nb_pkts)
hw->rx_offset,
rxq->mbuf_size - hw->rx_offset,
mb->data_len);
- return -EINVAL;
+ rte_pktmbuf_free(mb);
+ break;
}
/* Filling the received mbuf with packet info */
--
2.37.3
