bnxt_en: Change bnxt_rx_xdp function prototype

Change bnxt_rx_xdp() to take a pointer to xdp instead of stack
variable.
This is in prepartion for the XDP metadata patch change where
the BPF program can change the value of the xdp.meta_data.

Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com>
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jesper Dangaard Brouer <hawk@kernel.org>
Cc: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Link: https://lore.kernel.org/r/20240402093753.331120-5-pavan.chebbi@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 9fca1dee64869c30325209808c1245abe2c5ad94..5e54b7cacc454a672554c2643c48b3a8e0de86c7 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -2104,7 +2104,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
        }
 
        if (xdp_active) {
-               if (bnxt_rx_xdp(bp, rxr, cons, xdp, data, &data_ptr, &len, event)) {
+               if (bnxt_rx_xdp(bp, rxr, cons, &xdp, data, &data_ptr, &len, event)) {
                        rc = 1;
                        goto next_rx;
                }

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
index 4079538bc310eaaeee0ee568f6fcc3fbf2b4e758..6b904b4f4d342d2b7fc8a3736e9246f6a7803d10 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c
@@ -222,7 +222,7 @@ void bnxt_xdp_buff_frags_free(struct bnxt_rx_ring_info *rxr,
  * false   - packet should be passed to the stack.
  */
 bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
-                struct xdp_buff xdp, struct page *page, u8 **data_ptr,
+                struct xdp_buff *xdp, struct page *page, u8 **data_ptr,
                 unsigned int *len, u8 *event)
 {
        struct bpf_prog *xdp_prog = READ_ONCE(rxr->xdp_prog);
@@ -244,9 +244,9 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
 
        txr = rxr->bnapi->tx_ring[0];
        /* BNXT_RX_PAGE_MODE(bp) when XDP enabled */
-       orig_data = xdp.data;
+       orig_data = xdp->data;
 
-       act = bpf_prog_run_xdp(xdp_prog, &xdp);
+       act = bpf_prog_run_xdp(xdp_prog, xdp);
 
        tx_avail = bnxt_tx_avail(bp, txr);
        /* If the tx ring is not full, we must not update the rx producer yet
@@ -255,10 +255,10 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
        if (tx_avail != bp->tx_ring_size)
                *event &= ~BNXT_RX_EVENT;
 
-       *len = xdp.data_end - xdp.data;
-       if (orig_data != xdp.data) {
-               offset = xdp.data - xdp.data_hard_start;
-               *data_ptr = xdp.data_hard_start + offset;
+       *len = xdp->data_end - xdp->data;
+       if (orig_data != xdp->data) {
+               offset = xdp->data - xdp->data_hard_start;
+               *data_ptr = xdp->data_hard_start + offset;
        }
 
        switch (act) {
@@ -270,8 +270,8 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
                mapping = rx_buf->mapping - bp->rx_dma_offset;
                *event &= BNXT_TX_CMP_EVENT;
 
-               if (unlikely(xdp_buff_has_frags(&xdp))) {
-                       struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(&xdp);
+               if (unlikely(xdp_buff_has_frags(xdp))) {
+                       struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);
 
                        tx_needed += sinfo->nr_frags;
                        *event = BNXT_AGG_EVENT;
@@ -279,7 +279,7 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
 
                if (tx_avail < tx_needed) {
                        trace_xdp_exception(bp->dev, xdp_prog, act);
-                       bnxt_xdp_buff_frags_free(rxr, &xdp);
+                       bnxt_xdp_buff_frags_free(rxr, xdp);
                        bnxt_reuse_rx_data(rxr, cons, page);
                        return true;
                }
@@ -289,7 +289,7 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
 
                *event |= BNXT_TX_EVENT;
                __bnxt_xmit_xdp(bp, txr, mapping + offset, *len,
-                               NEXT_RX(rxr->rx_prod), &xdp);
+                               NEXT_RX(rxr->rx_prod), xdp);
                bnxt_reuse_rx_data(rxr, cons, page);
                return true;
        case XDP_REDIRECT:
@@ -306,12 +306,12 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
                /* if we are unable to allocate a new buffer, abort and reuse */
                if (bnxt_alloc_rx_data(bp, rxr, rxr->rx_prod, GFP_ATOMIC)) {
                        trace_xdp_exception(bp->dev, xdp_prog, act);
-                       bnxt_xdp_buff_frags_free(rxr, &xdp);
+                       bnxt_xdp_buff_frags_free(rxr, xdp);
                        bnxt_reuse_rx_data(rxr, cons, page);
                        return true;
                }
 
-               if (xdp_do_redirect(bp->dev, &xdp, xdp_prog)) {
+               if (xdp_do_redirect(bp->dev, xdp, xdp_prog)) {
                        trace_xdp_exception(bp->dev, xdp_prog, act);
                        page_pool_recycle_direct(rxr->page_pool, page);
                        return true;
@@ -326,7 +326,7 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
                trace_xdp_exception(bp->dev, xdp_prog, act);
                fallthrough;
        case XDP_DROP:
-               bnxt_xdp_buff_frags_free(rxr, &xdp);
+               bnxt_xdp_buff_frags_free(rxr, xdp);
                bnxt_reuse_rx_data(rxr, cons, page);
                break;
        }

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h
index 5e412c5655ba56fd7066803ff7f3071b322036be..0122782400b8a2d474682a6b82b47cd7b0bc7ecb 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h
@@ -18,7 +18,7 @@ struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp,
                                   struct xdp_buff *xdp);
 void bnxt_tx_int_xdp(struct bnxt *bp, struct bnxt_napi *bnapi, int budget);
 bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
-                struct xdp_buff xdp, struct page *page, u8 **data_ptr,
+                struct xdp_buff *xdp, struct page *page, u8 **data_ptr,
                 unsigned int *len, u8 *event);
 int bnxt_xdp(struct net_device *dev, struct netdev_bpf *xdp);
 int bnxt_xdp_xmit(struct net_device *dev, int num_frames,