[1/3] net/af_xdp: Fix port id not set in rx mbuf

Message ID 20240510100358.18815-1-ciara.loftus@intel.com (mailing list archive)
State Superseded
Delegated to: Ferruh Yigit
Headers
Series [1/3] net/af_xdp: Fix port id not set in rx mbuf |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Loftus, Ciara May 10, 2024, 10:03 a.m. UTC
  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.og

Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
---
 drivers/net/af_xdp/rte_eth_af_xdp.c | 5 +++++
 1 file changed, 5 insertions(+)
  

Comments

Maryam Tahhan May 10, 2024, 12:20 p.m. UTC | #1
On 10/05/2024 11:03, Ciara Loftus wrote:
> 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.og
>
> Reported-by: Stephen Hemminger <stephen@networkplumber.org>
> Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>

Acked-by:Maryam Tahhan <mtahhan@redhat.com>

> ---
>   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 268a130c49..fee0d5d5f3 100644
> --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
> +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
> @@ -131,6 +131,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;
>   
> @@ -360,6 +361,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;
> @@ -426,6 +428,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);
> @@ -1779,6 +1782,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;
>
  
Stephen Hemminger May 10, 2024, 2:58 p.m. UTC | #2
On Fri, 10 May 2024 10:03:56 +0000
Ciara Loftus <ciara.loftus@intel.com> wrote:

> 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.og
> 
> Reported-by: Stephen Hemminger <stephen@networkplumber.org>
> Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>

Acked-by: Stephen Hemminger <stephen@networkplumber.org>
  

Patch

diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 268a130c49..fee0d5d5f3 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -131,6 +131,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;
 
@@ -360,6 +361,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;
@@ -426,6 +428,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);
@@ -1779,6 +1782,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;