Commit 5b24324a authored by Song Yoong Siang's avatar Song Yoong Siang Committed by Jakub Kicinski
Browse files

net: stmmac: introduce wrapper for struct xdp_buff 



Introduce struct stmmac_xdp_buff as a preparation to support XDP Rx
metadata via kfuncs.

Signed-off-by: default avatarSong Yoong Siang <yoong.siang.song@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6c829efe

drivers/net/ethernet/stmicro/stmmac/stmmac.h

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ struct stmmac_rx_buffer { 
	dma_addr_t sec_addr;

};



struct stmmac_xdp_buff {

	struct xdp_buff xdp;

};



struct stmmac_rx_queue {

	u32 rx_count_frames;

	u32 queue_index;

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+9 −9
Original line number Diff line number Diff line
@@ -5190,7 +5190,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) 
	enum dma_data_direction dma_dir;

	unsigned int desc_size;

	struct sk_buff *skb = NULL;

	struct xdp_buff xdp;

	struct stmmac_xdp_buff ctx;

	int xdp_status = 0;

	int buf_sz;
@@ -5311,17 +5311,17 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) 
			dma_sync_single_for_cpu(priv->device, buf->addr,

						buf1_len, dma_dir);



			xdp_init_buff(&xdp, buf_sz, &rx_q->xdp_rxq);

			xdp_prepare_buff(&xdp, page_address(buf->page),

			xdp_init_buff(&ctx.xdp, buf_sz, &rx_q->xdp_rxq);

			xdp_prepare_buff(&ctx.xdp, page_address(buf->page),

					 buf->page_offset, buf1_len, false);



			pre_len = xdp.data_end - xdp.data_hard_start -

			pre_len = ctx.xdp.data_end - ctx.xdp.data_hard_start -

				  buf->page_offset;

			skb = stmmac_xdp_run_prog(priv, &xdp);

			skb = stmmac_xdp_run_prog(priv, &ctx.xdp);

			/* Due xdp_adjust_tail: DMA sync for_device

			 * cover max len CPU touch

			 */

			sync_len = xdp.data_end - xdp.data_hard_start -

			sync_len = ctx.xdp.data_end - ctx.xdp.data_hard_start -

				   buf->page_offset;

			sync_len = max(sync_len, pre_len);
@@ -5331,7 +5331,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) 


				if (xdp_res & STMMAC_XDP_CONSUMED) {

					page_pool_put_page(rx_q->page_pool,

							   virt_to_head_page(xdp.data),

							   virt_to_head_page(ctx.xdp.data),

							   sync_len, true);

					buf->page = NULL;

					priv->dev->stats.rx_dropped++;
@@ -5359,7 +5359,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) 


		if (!skb) {

			/* XDP program may expand or reduce tail */

			buf1_len = xdp.data_end - xdp.data;

			buf1_len = ctx.xdp.data_end - ctx.xdp.data;



			skb = napi_alloc_skb(&ch->rx_napi, buf1_len);

			if (!skb) {
@@ -5369,7 +5369,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) 
			}



			/* XDP program may adjust header */

			skb_copy_to_linear_data(skb, xdp.data, buf1_len);

			skb_copy_to_linear_data(skb, ctx.xdp.data, buf1_len);

			skb_put(skb, buf1_len);



			/* Data payload copied into SKB, page ready for recycle */