[PATCH net-next] net: mvneta: fix build skb for bm capable devices

[PATCH net-next] net: mvneta: fix build skb for bm capable devices

[Lorenzo Bianconi]

Fix build_skb for bm capable devices when they fall-back using swbm path
(e.g. when bm properties are configured in device tree but
CONFIG_MVNETA_BM_ENABLE is not set). In this case rx_offset_correction is
overwritten so we need to use it building skb instead of
MVNETA_SKB_HEADROOM directly

Fixes: 8dc9a0888f4c ("net: mvneta: rely on build_skb in mvneta_rx_swbm poll routine")
Fixes: 0db51da7a8e9 ("net: mvneta: add basic XDP support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
 drivers/net/ethernet/marvell/mvneta.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 274ac39c0f0f..12e03b15f0ab 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2154,7 +2154,7 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp,
 	prefetch(data);
 
 	xdp->data_hard_start = data;
-	xdp->data = data + MVNETA_SKB_HEADROOM + MVNETA_MH_SIZE;
+	xdp->data = data + pp->rx_offset_correction + MVNETA_MH_SIZE;
 	xdp->data_end = xdp->data + data_len;
 	xdp_set_data_meta_invalid(xdp);
 
@@ -2219,7 +2219,7 @@ mvneta_swbm_add_rx_fragment(struct mvneta_port *pp,
 		/* refill descriptor with new buffer later */
 		skb_add_rx_frag(rxq->skb,
 				skb_shinfo(rxq->skb)->nr_frags,
-				page, MVNETA_SKB_HEADROOM, data_len,
+				page, pp->rx_offset_correction, data_len,
 				PAGE_SIZE);
 	}
 	page_pool_release_page(rxq->page_pool, page);
-- 
2.21.0

Re: [PATCH net-next] net: mvneta: fix build skb for bm capable devices

[Andrew Lunn]

On Thu, Nov 14, 2019 at 01:25:55AM +0200, Lorenzo Bianconi wrote:
> Fix build_skb for bm capable devices when they fall-back using swbm path
> (e.g. when bm properties are configured in device tree but
> CONFIG_MVNETA_BM_ENABLE is not set). In this case rx_offset_correction is
> overwritten so we need to use it building skb instead of
> MVNETA_SKB_HEADROOM directly
> 
> Fixes: 8dc9a0888f4c ("net: mvneta: rely on build_skb in mvneta_rx_swbm poll routine")
> Fixes: 0db51da7a8e9 ("net: mvneta: add basic XDP support")
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>

Reported-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

Re: [PATCH net-next] net: mvneta: fix build skb for bm capable devices

[David Miller]

From: Lorenzo Bianconi <lorenzo@kernel.org>
Date: Thu, 14 Nov 2019 01:25:55 +0200

> Fix build_skb for bm capable devices when they fall-back using swbm path
> (e.g. when bm properties are configured in device tree but
> CONFIG_MVNETA_BM_ENABLE is not set). In this case rx_offset_correction is
> overwritten so we need to use it building skb instead of
> MVNETA_SKB_HEADROOM directly
> 
> Fixes: 8dc9a0888f4c ("net: mvneta: rely on build_skb in mvneta_rx_swbm poll routine")
> Fixes: 0db51da7a8e9 ("net: mvneta: add basic XDP support")
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>

Applied.