diff mbox series

[net-next,v2,4/7] net: octeontx2: Add metadata support for xdp mode

Message ID 20250318-mvneta-xdp-meta-v2-4-b6075778f61f@kernel.org (mailing list archive)
State New
Headers show
Series net: xdp: Add missing metadata support for some xdp drvs | expand

Commit Message

Lorenzo Bianconi March 18, 2025, 11:46 a.m. UTC 
Set metadata size building the skb from xdp_buff in octeontx2 driver.
octeontx2 driver sets xdp headroom to OTX2_HEAD_ROOM

OTX2_HEAD_ROOM	OTX2_ALIGN
OTX2_ALIGN	128

so the headroom is large enough to contain xdp_frame and xdp metadata.
Please note this patch is just compiled tested.

Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
 drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

Jakub Kicinski March 25, 2025, 11:41 a.m. UTC | #1 
On Tue, 18 Mar 2025 12:46:08 +0100 Lorenzo Bianconi wrote:
> @@ -1514,13 +1518,14 @@ static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf,
>  
>  	hard_start = (unsigned char *)phys_to_virt(pa);
>  	xdp_prepare_buff(&xdp, hard_start, OTX2_HEAD_ROOM,
> -			 cqe->sg.seg_size, false);
> +			 cqe->sg.seg_size, true);
>  
>  	act = bpf_prog_run_xdp(prog, &xdp);
>  
>  handle_xdp_verdict:
>  	switch (act) {
>  	case XDP_PASS:
> +		*metasize = xdp.data - xdp.data_meta;
>  		break;
>  	case XDP_TX:
>  		qidx += pfvf->hw.tx_queues;

This one handles ABORT and invalid return codes as PASS not DROP.
That should probably be fixed separately?
Lorenzo Bianconi March 25, 2025, 1:28 p.m. UTC | #2 
> On Tue, 18 Mar 2025 12:46:08 +0100 Lorenzo Bianconi wrote:
> > @@ -1514,13 +1518,14 @@ static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf,
> >  
> >  	hard_start = (unsigned char *)phys_to_virt(pa);
> >  	xdp_prepare_buff(&xdp, hard_start, OTX2_HEAD_ROOM,
> > -			 cqe->sg.seg_size, false);
> > +			 cqe->sg.seg_size, true);
> >  
> >  	act = bpf_prog_run_xdp(prog, &xdp);
> >  
> >  handle_xdp_verdict:
> >  	switch (act) {
> >  	case XDP_PASS:
> > +		*metasize = xdp.data - xdp.data_meta;
> >  		break;
> >  	case XDP_TX:
> >  		qidx += pfvf->hw.tx_queues;
> 
> This one handles ABORT and invalid return codes as PASS not DROP.
> That should probably be fixed separately?

Yes, right. I will post a fix for it.

Regards,
Lorenzo
diff mbox series

Patch

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
index 6bc5ce5a9f61cc2830975e7cc5219344760b0e51..af8cabe828d05c8832085d24d183312f24d00330 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c
@@ -41,7 +41,7 @@  static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf,
 				     struct bpf_prog *prog,
 				     struct nix_cqe_rx_s *cqe,
 				     struct otx2_cq_queue *cq,
-				     bool *need_xdp_flush);
+				     u32 *metasize, bool *need_xdp_flush);
 
 static void otx2_sq_set_sqe_base(struct otx2_snd_queue *sq,
 				 struct sk_buff *skb)
@@ -336,6 +336,7 @@  static void otx2_rcv_pkt_handler(struct otx2_nic *pfvf,
 	struct nix_rx_sg_s *sg = &cqe->sg;
 	struct sk_buff *skb = NULL;
 	void *end, *start;
+	u32 metasize = 0;
 	u64 *seg_addr;
 	u16 *seg_size;
 	int seg;
@@ -346,7 +347,8 @@  static void otx2_rcv_pkt_handler(struct otx2_nic *pfvf,
 	}
 
 	if (pfvf->xdp_prog)
-		if (otx2_xdp_rcv_pkt_handler(pfvf, pfvf->xdp_prog, cqe, cq, need_xdp_flush))
+		if (otx2_xdp_rcv_pkt_handler(pfvf, pfvf->xdp_prog, cqe, cq,
+					     &metasize, need_xdp_flush))
 			return;
 
 	skb = napi_get_frags(napi);
@@ -378,6 +380,8 @@  static void otx2_rcv_pkt_handler(struct otx2_nic *pfvf,
 		skb->mark = parse->match_id;
 
 	skb_mark_for_recycle(skb);
+	if (metasize)
+		skb_metadata_set(skb, metasize);
 
 	napi_gro_frags(napi);
 }
@@ -1482,7 +1486,7 @@  static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf,
 				     struct bpf_prog *prog,
 				     struct nix_cqe_rx_s *cqe,
 				     struct otx2_cq_queue *cq,
-				     bool *need_xdp_flush)
+				     u32 *metasize, bool *need_xdp_flush)
 {
 	struct xdp_buff xdp, *xsk_buff = NULL;
 	unsigned char *hard_start;
@@ -1514,13 +1518,14 @@  static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf,
 
 	hard_start = (unsigned char *)phys_to_virt(pa);
 	xdp_prepare_buff(&xdp, hard_start, OTX2_HEAD_ROOM,
-			 cqe->sg.seg_size, false);
+			 cqe->sg.seg_size, true);
 
 	act = bpf_prog_run_xdp(prog, &xdp);
 
 handle_xdp_verdict:
 	switch (act) {
 	case XDP_PASS:
+		*metasize = xdp.data - xdp.data_meta;
 		break;
 	case XDP_TX:
 		qidx += pfvf->hw.tx_queues;