62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
|
From f294405ab98594aa41269507dde95cc89bb20a61 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ciara Loftus <ciara.loftus@intel.com>
|
||
|
|
Date: Tue, 14 May 2024 08:41:53 +0000
|
||
|
|
Subject: [PATCH] net/af_xdp: count mbuf allocation failures
|
||
|
|
|
||
|
|
[ upstream commit f294405ab98594aa41269507dde95cc89bb20a61 ]
|
||
|
|
|
||
|
|
Failures to allocate mbufs in the receive path were not being
|
||
|
|
accounted for in the ethdev statistics. Fix this.
|
||
|
|
|
||
|
|
Bugzilla ID: 1429
|
||
|
|
Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD")
|
||
|
|
Cc: stable@dpdk.org
|
||
|
|
|
||
|
|
Reported-by: Stephen Hemminger <stephen@networkplumber.org>
|
||
|
|
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
|
||
|
|
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
|
||
|
|
---
|
||
|
|
drivers/net/af_xdp/rte_eth_af_xdp.c | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
|
||
|
|
index 0997543ee5..0db761a204 100644
|
||
|
|
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
|
||
|
|
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
|
||
|
|
@@ -320,6 +320,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
|
||
|
|
unsigned long rx_bytes = 0;
|
||
|
|
int i;
|
||
|
|
struct rte_mbuf *fq_bufs[ETH_AF_XDP_RX_BATCH_SIZE];
|
||
|
|
+ struct rte_eth_dev *dev = &rte_eth_devices[rxq->port];
|
||
|
|
|
||
|
|
nb_pkts = xsk_ring_cons__peek(rx, nb_pkts, &idx_rx);
|
||
|
|
|
||
|
|
@@ -347,6 +348,8 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
|
||
|
|
* xsk_ring_cons__peek
|
||
|
|
*/
|
||
|
|
rx->cached_cons -= nb_pkts;
|
||
|
|
+ dev->data->rx_mbuf_alloc_failed += nb_pkts;
|
||
|
|
+
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -398,6 +401,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
|
||
|
|
int i;
|
||
|
|
uint32_t free_thresh = fq->size >> 1;
|
||
|
|
struct rte_mbuf *mbufs[ETH_AF_XDP_RX_BATCH_SIZE];
|
||
|
|
+ struct rte_eth_dev *dev = &rte_eth_devices[rxq->port];
|
||
|
|
|
||
|
|
if (xsk_prod_nb_free(fq, free_thresh) >= free_thresh)
|
||
|
|
(void)reserve_fill_queue(umem, nb_pkts, NULL, fq);
|
||
|
|
@@ -416,6 +420,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
|
||
|
|
* xsk_ring_cons__peek
|
||
|
|
*/
|
||
|
|
rx->cached_cons -= nb_pkts;
|
||
|
|
+ dev->data->rx_mbuf_alloc_failed += nb_pkts;
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|