Commit d7f5fb33 authored by Gerhard Engleder's avatar Gerhard Engleder Committed by David S. Miller
Browse files

tsnep: Fix mapping for zero copy XDP_TX action 



For XDP_TX action xdp_buff is converted to xdp_frame. The conversion is
done by xdp_convert_buff_to_frame(). The memory type of the resulting
xdp_frame depends on the memory type of the xdp_buff. For page pool
based xdp_buff it produces xdp_frame with memory type
MEM_TYPE_PAGE_POOL. For zero copy XSK pool based xdp_buff it produces
xdp_frame with memory type MEM_TYPE_PAGE_ORDER0.

tsnep_xdp_xmit_back() is not prepared for that and uses always the page
pool buffer type TSNEP_TX_TYPE_XDP_TX. This leads to invalid mappings
and the transmission of undefined data.

Improve tsnep_xdp_xmit_back() to use the generic buffer type
TSNEP_TX_TYPE_XDP_NDO for zero copy XDP_TX.

Fixes: 3fc23339 ("tsnep: Add XDP socket zero-copy RX support")
Signed-off-by: default avatarGerhard Engleder <gerhard@engleder-embedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 010e03db

drivers/net/ethernet/engleder/tsnep_main.c

+12 −4
Original line number Diff line number Diff line
@@ -719,17 +719,25 @@ static void tsnep_xdp_xmit_flush(struct tsnep_tx *tx) 


static bool tsnep_xdp_xmit_back(struct tsnep_adapter *adapter,

				struct xdp_buff *xdp,

				struct netdev_queue *tx_nq, struct tsnep_tx *tx)

				struct netdev_queue *tx_nq, struct tsnep_tx *tx,

				bool zc)

{

	struct xdp_frame *xdpf = xdp_convert_buff_to_frame(xdp);

	bool xmit;

	u32 type;



	if (unlikely(!xdpf))

		return false;



	/* no page pool for zero copy */

	if (zc)

		type = TSNEP_TX_TYPE_XDP_NDO;

	else

		type = TSNEP_TX_TYPE_XDP_TX;



	__netif_tx_lock(tx_nq, smp_processor_id());



	xmit = tsnep_xdp_xmit_frame_ring(xdpf, tx, TSNEP_TX_TYPE_XDP_TX);

	xmit = tsnep_xdp_xmit_frame_ring(xdpf, tx, type);



	/* Avoid transmit queue timeout since we share it with the slow path */

	if (xmit)
@@ -1273,7 +1281,7 @@ static bool tsnep_xdp_run_prog(struct tsnep_rx *rx, struct bpf_prog *prog, 
	case XDP_PASS:

		return false;

	case XDP_TX:

		if (!tsnep_xdp_xmit_back(rx->adapter, xdp, tx_nq, tx))

		if (!tsnep_xdp_xmit_back(rx->adapter, xdp, tx_nq, tx, false))

			goto out_failure;

		*status |= TSNEP_XDP_TX;

		return true;
@@ -1323,7 +1331,7 @@ static bool tsnep_xdp_run_prog_zc(struct tsnep_rx *rx, struct bpf_prog *prog, 
	case XDP_PASS:

		return false;

	case XDP_TX:

		if (!tsnep_xdp_xmit_back(rx->adapter, xdp, tx_nq, tx))

		if (!tsnep_xdp_xmit_back(rx->adapter, xdp, tx_nq, tx, true))

			goto out_failure;

		*status |= TSNEP_XDP_TX;

		return true;