net: netsec: Correct dma sync for XDP_TX frames
authorIlias Apalodimas <ilias.apalodimas@linaro.org>
Wed, 16 Oct 2019 11:40:32 +0000 (14:40 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Jan 2020 09:01:04 +0000 (10:01 +0100)
[ Upstream commit d9496f3ecfe4823c1e12aecbcc29220147fa012c ]

bpf_xdp_adjust_head() can change the frame boundaries. Account for the
potential shift properly by calculating the new offset before
syncing the buffer to the device for XDP_TX

Fixes: ba2b232108d3 ("net: netsec: add XDP support")
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/socionext/netsec.c

index f9e6744..41ddd8f 100644 (file)
@@ -847,8 +847,8 @@ static u32 netsec_xdp_queue_one(struct netsec_priv *priv,
                enum dma_data_direction dma_dir =
                        page_pool_get_dma_dir(rx_ring->page_pool);
 
-               dma_handle = page_pool_get_dma_addr(page) +
-                       NETSEC_RXBUF_HEADROOM;
+               dma_handle = page_pool_get_dma_addr(page) + xdpf->headroom +
+                       sizeof(*xdpf);
                dma_sync_single_for_device(priv->dev, dma_handle, xdpf->len,
                                           dma_dir);
                tx_desc.buf_type = TYPE_NETSEC_XDP_TX;