net, xdp: Introduce xdp_init_buff utility routine

Introduce xdp_init_buff utility routine to initialize xdp_buff fields const over NAPI iterations (e.g. frame_sz or rxq pointer). Rely on xdp_init_buff in all XDP capable drivers. Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Reviewed-by: Alexander Duyck <alexanderduyck@fb.com> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: John Fastabend <john.fastabend@gmail.com> Acked-by: Shay Agroskin <shayagr@amazon.com> Acked-by: Martin Habets <habetsm.xilinx@gmail.com> Acked-by: Camelia Groza <camelia.groza@nxp.com> Acked-by: Marcin Wojtas <mw@semihalf.com> Link: https://lore.kernel.org/bpf/7f8329b6da1434dc2b05a77f2e800b29628a8913.1608670965.git.lorenzo@kernel.org

Author: LorenzoBianconi

drivers/net/ethernet/amazon/ena/ena_netdev.c

@@ -1634,8 +1634,7 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,
 netif_dbg(rx_ring->adapter, rx_status, rx_ring->netdev,
  "%s qid %d\n", __func__, rx_ring->qid);
 res_budget = budget;
-xdp.rxq = &rx_ring->xdp_rxq;
-xdp.frame_sz = ENA_PAGE_SIZE;
+xdp_init_buff(&xdp, ENA_PAGE_SIZE, &rx_ring->xdp_rxq);
 
 do {
 xdp_verdict = XDP_PASS;

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

@@ -133,12 +133,12 @@ bool bnxt_rx_xdp(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, u16 cons,
 dma_sync_single_for_cpu(&pdev->dev, mapping + offset, *len, bp->rx_dir);
 
 txr = rxr->bnapi->tx_ring;
+/* BNXT_RX_PAGE_MODE(bp) when XDP enabled */
+xdp_init_buff(&xdp, PAGE_SIZE, &rxr->xdp_rxq);
 xdp.data_hard_start = *data_ptr - offset;
 xdp.data = *data_ptr;
 xdp_set_data_meta_invalid(&xdp);
 xdp.data_end = *data_ptr + *len;
-xdp.rxq = &rxr->xdp_rxq;
-xdp.frame_sz = PAGE_SIZE; /* BNXT_RX_PAGE_MODE(bp) when XDP enabled */
 orig_data = xdp.data;
 
 rcu_read_lock();

drivers/net/ethernet/cavium/thunder/nicvf_main.c

@@ -547,12 +547,12 @@ static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog,
 cpu_addr = (u64)phys_to_virt(cpu_addr);
 page = virt_to_page((void *)cpu_addr);
 
+xdp_init_buff(&xdp, RCV_FRAG_LEN + XDP_PACKET_HEADROOM,
+ &rq->xdp_rxq);
 xdp.data_hard_start = page_address(page);
 xdp.data = (void *)cpu_addr;
 xdp_set_data_meta_invalid(&xdp);
 xdp.data_end = xdp.data + len;
-xdp.rxq = &rq->xdp_rxq;
-xdp.frame_sz = RCV_FRAG_LEN + XDP_PACKET_HEADROOM;
 orig_data = xdp.data;
 
 rcu_read_lock();

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

@@ -2532,12 +2532,12 @@ static u32 dpaa_run_xdp(struct dpaa_priv *priv, struct qm_fd *fd, void *vaddr,
 return XDP_PASS;
 }
 
+xdp_init_buff(&xdp, DPAA_BP_RAW_SIZE - DPAA_TX_PRIV_DATA_SIZE,
+ &dpaa_fq->xdp_rxq);
 xdp.data = vaddr + fd_off;
 xdp.data_meta = xdp.data;
 xdp.data_hard_start = xdp.data - XDP_PACKET_HEADROOM;
 xdp.data_end = xdp.data + qm_fd_get_length(fd);
-xdp.frame_sz = DPAA_BP_RAW_SIZE - DPAA_TX_PRIV_DATA_SIZE;
-xdp.rxq = &dpaa_fq->xdp_rxq;
 
 /* We reserve a fixed headroom of 256 bytes under the erratum and we
  * offer it all to XDP programs to use. If no room is left for the

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

@@ -358,14 +358,14 @@ static u32 dpaa2_eth_run_xdp(struct dpaa2_eth_priv *priv,
 if (!xdp_prog)
 goto out;
 
+xdp_init_buff(&xdp,
+ DPAA2_ETH_RX_BUF_RAW_SIZE -
+ (dpaa2_fd_get_offset(fd) - XDP_PACKET_HEADROOM),
+ &ch->xdp_rxq);
 xdp.data = vaddr + dpaa2_fd_get_offset(fd);
 xdp.data_end = xdp.data + dpaa2_fd_get_len(fd);
 xdp.data_hard_start = xdp.data - XDP_PACKET_HEADROOM;
 xdp_set_data_meta_invalid(&xdp);
-xdp.rxq = &ch->xdp_rxq;
-
-xdp.frame_sz = DPAA2_ETH_RX_BUF_RAW_SIZE -
-(dpaa2_fd_get_offset(fd) - XDP_PACKET_HEADROOM);
 
 xdp_act = bpf_prog_run_xdp(xdp_prog, &xdp);
 

drivers/net/ethernet/intel/i40e/i40e_txrx.c

@@ -2344,17 +2344,17 @@ static void i40e_inc_ntc(struct i40e_ring *rx_ring)
  **/
 static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
 {
-unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+unsigned int total_rx_bytes = 0, total_rx_packets = 0, frame_sz = 0;
 struct sk_buff *skb = rx_ring->skb;
 u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);
 unsigned int xdp_xmit = 0;
 bool failure = false;
 struct xdp_buff xdp;
 
 #if (PAGE_SIZE < 8192)
-xdp.frame_sz = i40e_rx_frame_truesize(rx_ring, 0);
+frame_sz = i40e_rx_frame_truesize(rx_ring, 0);
 #endif
-xdp.rxq = &rx_ring->xdp_rxq;
+xdp_init_buff(&xdp, frame_sz, &rx_ring->xdp_rxq);
 
 while (likely(total_rx_packets < (unsigned int)budget)) {
 struct i40e_rx_buffer *rx_buffer;

drivers/net/ethernet/intel/ice/ice_txrx.c

@@ -1089,18 +1089,18 @@ ice_is_non_eop(struct ice_ring *rx_ring, union ice_32b_rx_flex_desc *rx_desc,
  */
 int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)
 {
-unsigned int total_rx_bytes = 0, total_rx_pkts = 0;
+unsigned int total_rx_bytes = 0, total_rx_pkts = 0, frame_sz = 0;
 u16 cleaned_count = ICE_DESC_UNUSED(rx_ring);
 unsigned int xdp_res, xdp_xmit = 0;
 struct bpf_prog *xdp_prog = NULL;
 struct xdp_buff xdp;
 bool failure;
 
-xdp.rxq = &rx_ring->xdp_rxq;
 /* Frame size depend on rx_ring setup when PAGE_SIZE=4K */
 #if (PAGE_SIZE < 8192)
-xdp.frame_sz = ice_rx_frame_truesize(rx_ring, 0);
+frame_sz = ice_rx_frame_truesize(rx_ring, 0);
 #endif
+xdp_init_buff(&xdp, frame_sz, &rx_ring->xdp_rxq);
 
 /* start the loop to process Rx packets bounded by 'budget' */
 while (likely(total_rx_pkts < (unsigned int)budget)) {

drivers/net/ethernet/intel/igb/igb_main.c

@@ -8681,13 +8681,13 @@ static int igb_clean_rx_irq(struct igb_q_vector *q_vector, const int budget)
 u16 cleaned_count = igb_desc_unused(rx_ring);
 unsigned int xdp_xmit = 0;
 struct xdp_buff xdp;
-
-xdp.rxq = &rx_ring->xdp_rxq;
+u32 frame_sz = 0;
 
 /* Frame size depend on rx_ring setup when PAGE_SIZE=4K */
 #if (PAGE_SIZE < 8192)
-xdp.frame_sz = igb_rx_frame_truesize(rx_ring, 0);
+frame_sz = igb_rx_frame_truesize(rx_ring, 0);
 #endif
+xdp_init_buff(&xdp, frame_sz, &rx_ring->xdp_rxq);
 
 while (likely(total_packets < budget)) {
 union e1000_adv_rx_desc *rx_desc;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

@@ -2291,7 +2291,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
  struct ixgbe_ring *rx_ring,
  const int budget)
 {
-unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+unsigned int total_rx_bytes = 0, total_rx_packets = 0, frame_sz = 0;
 struct ixgbe_adapter *adapter = q_vector->adapter;
 #ifdef IXGBE_FCOE
 int ddp_bytes;
@@ -2301,12 +2301,11 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
 unsigned int xdp_xmit = 0;
 struct xdp_buff xdp;
 
-xdp.rxq = &rx_ring->xdp_rxq;
-
 /* Frame size depend on rx_ring setup when PAGE_SIZE=4K */
 #if (PAGE_SIZE < 8192)
-xdp.frame_sz = ixgbe_rx_frame_truesize(rx_ring, 0);
+frame_sz = ixgbe_rx_frame_truesize(rx_ring, 0);
 #endif
+xdp_init_buff(&xdp, frame_sz, &rx_ring->xdp_rxq);
 
 while (likely(total_rx_packets < budget)) {
 union ixgbe_adv_rx_desc *rx_desc;

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

@@ -1121,19 +1121,18 @@ static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector,
 struct ixgbevf_ring *rx_ring,
 int budget)
 {
-unsigned int total_rx_bytes = 0, total_rx_packets = 0;
+unsigned int total_rx_bytes = 0, total_rx_packets = 0, frame_sz = 0;
 struct ixgbevf_adapter *adapter = q_vector->adapter;
 u16 cleaned_count = ixgbevf_desc_unused(rx_ring);
 struct sk_buff *skb = rx_ring->skb;
 bool xdp_xmit = false;
 struct xdp_buff xdp;
 
-xdp.rxq = &rx_ring->xdp_rxq;
-
 /* Frame size depend on rx_ring setup when PAGE_SIZE=4K */
 #if (PAGE_SIZE < 8192)
-xdp.frame_sz = ixgbevf_rx_frame_truesize(rx_ring, 0);
+frame_sz = ixgbevf_rx_frame_truesize(rx_ring, 0);
 #endif
+xdp_init_buff(&xdp, frame_sz, &rx_ring->xdp_rxq);
 
 while (likely(total_rx_packets < budget)) {
 struct ixgbevf_rx_buffer *rx_buffer;