63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
|
From 9bab1d2667aec4942ae1d384671e5148960bd88f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ciara Loftus <ciara.loftus@intel.com>
|
||
|
|
Date: Tue, 14 May 2024 08:41:52 +0000
|
||
|
|
Subject: [PATCH] net/af_xdp: fix port ID in Rx mbuf
|
||
|
|
|
||
|
|
[ upstream commit 9bab1d2667aec4942ae1d384671e5148960bd88f ]
|
||
|
|
|
||
|
|
Record the port id in the af_xdp rx queue structure and use it
|
||
|
|
to set the port id of the mbuf of a received packed.
|
||
|
|
|
||
|
|
Bugzilla ID: 1428
|
||
|
|
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: Maryam Tahhan <mtahhan@redhat.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 2d6f64337e..0997543ee5 100644
|
||
|
|
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
|
||
|
|
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
|
||
|
|
@@ -133,6 +133,7 @@ struct pkt_rx_queue {
|
||
|
|
struct xsk_umem_info *umem;
|
||
|
|
struct xsk_socket *xsk;
|
||
|
|
struct rte_mempool *mb_pool;
|
||
|
|
+ uint16_t port;
|
||
|
|
|
||
|
|
struct rx_stats stats;
|
||
|
|
|
||
|
|
@@ -368,6 +369,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
|
||
|
|
bufs[i]->data_off = offset - sizeof(struct rte_mbuf) -
|
||
|
|
rte_pktmbuf_priv_size(umem->mb_pool) -
|
||
|
|
umem->mb_pool->header_size;
|
||
|
|
+ bufs[i]->port = rxq->port;
|
||
|
|
|
||
|
|
rte_pktmbuf_pkt_len(bufs[i]) = len;
|
||
|
|
rte_pktmbuf_data_len(bufs[i]) = len;
|
||
|
|
@@ -434,6 +436,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
|
||
|
|
rte_pktmbuf_data_len(mbufs[i]) = len;
|
||
|
|
rx_bytes += len;
|
||
|
|
bufs[i] = mbufs[i];
|
||
|
|
+ bufs[i]->port = rxq->port;
|
||
|
|
}
|
||
|
|
|
||
|
|
xsk_ring_cons__release(rx, nb_pkts);
|
||
|
|
@@ -1813,6 +1816,8 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
|
||
|
|
|
||
|
|
process_private->rxq_xsk_fds[rx_queue_id] = rxq->fds[0].fd;
|
||
|
|
|
||
|
|
+ rxq->port = dev->data->port_id;
|
||
|
|
+
|
||
|
|
dev->data->rx_queues[rx_queue_id] = rxq;
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|