tsnep: Fix mapping for zero copy XDP_TX action
Subsystems (3)
PATCH 1/1 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.
--- drivers/net/ethernet/engleder/tsnep_main.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/ethernet/engleder/tsnep_main.c +12 -4
@@ -721,17 +721,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)
@@ -1275,7 +1283,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;
@@ -1325,7 +1333,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;
Signature · 1 line
2.39.2
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 8 lines · On Wed, 31 Jan 2024 21:14:13 +0100 you wrote:
For
XDP_TXactionxdp_buffis converted toxdp_frame. The conversion is done byxdp_convert_buff_to_frame(). The memory type of the resultingxdp_framedepends on the memory type of thexdp_buff. For page pool basedxdp_buffit producesxdp_framewith memory typeMEM_TYPE_PAGE_POOL. For zero copy XSK pool basedxdp_buffit producesxdp_framewith memory typeMEM_TYPE_PAGE_ORDER0.[...]
Here is the summary with links:
- [net] tsnep: Fix mapping for zero copy XDP_TX action
https://git.kernel.org/netdev/net/c/d7f5fb33cf77
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html