Commit 8feb020f authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jakub Kicinski
Browse files

net: ethernet: enetc: unlock XDP_REDIRECT for XDP non-linear buffers 



Even if full XDP_REDIRECT is not supported yet for non-linear XDP buffers
since we allow redirecting just into CPUMAPs, unlock XDP_REDIRECT for
S/G XDP buffer and rely on XDP stack to properly take care of the
frames.

Tested-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4aea86b4

drivers/net/ethernet/freescale/enetc/enetc.c

+10 −14
Original line number Diff line number Diff line
@@ -1412,6 +1412,16 @@ static void enetc_add_rx_buff_to_xdp(struct enetc_bdr *rx_ring, int i, 
	/* To be used for XDP_TX */

	rx_swbd->len = size;



	if (!xdp_buff_has_frags(xdp_buff)) {

		xdp_buff_set_frags_flag(xdp_buff);

		shinfo->xdp_frags_size = size;

	} else {

		shinfo->xdp_frags_size += size;

	}



	if (page_is_pfmemalloc(rx_swbd->page))

		xdp_buff_set_frag_pfmemalloc(xdp_buff);



	skb_frag_off_set(frag, rx_swbd->page_offset);

	skb_frag_size_set(frag, size);

	__skb_frag_set_page(frag, rx_swbd->page);
@@ -1584,20 +1594,6 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring, 
			}

			break;

		case XDP_REDIRECT:

			/* xdp_return_frame does not support S/G in the sense

			 * that it leaks the fragments (__xdp_return should not

			 * call page_frag_free only for the initial buffer).

			 * Until XDP_REDIRECT gains support for S/G let's keep

			 * the code structure in place, but dead. We drop the

			 * S/G frames ourselves to avoid memory leaks which

			 * would otherwise leave the kernel OOM.

			 */

			if (unlikely(cleaned_cnt - orig_cleaned_cnt != 1)) {

				enetc_xdp_drop(rx_ring, orig_i, i);

				rx_ring->stats.xdp_redirect_sg++;

				break;

			}



			err = xdp_do_redirect(rx_ring->ndev, &xdp_buff, prog);

			if (unlikely(err)) {

				enetc_xdp_drop(rx_ring, orig_i, i);