* [PATCH net] net: mvneta: fix XDP support if sw bm is used as fallback
@ 2020-01-29 11:50 Lorenzo Bianconi
2020-01-29 12:59 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Lorenzo Bianconi @ 2020-01-29 11:50 UTC (permalink / raw)
To: netdev
Cc: ilias.apalodimas, davem, lorenzo.bianconi, brouer, sven.auhagen, andrew
In order to fix XDP support if sw buffer management is used as fallback
for hw bm devices, define MVNETA_SKB_HEADROOM as maximum between
XDP_PACKET_HEADROOM and NET_SKB_PAD and let the hw aligns the IP header
to 4-byte boundary.
Fix rx_offset_correction initialization if mvneta_bm_port_init fails in
mvneta_resume routine
Fixes: 0db51da7a8e9 ("net: mvneta: add basic XDP support")
Tested-by: Sven Auhagen <sven.auhagen@voleatech.de>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/ethernet/marvell/mvneta.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 2dfbfdff45a8..037e054b01a2 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -324,8 +324,7 @@
ETH_HLEN + ETH_FCS_LEN, \
cache_line_size())
-#define MVNETA_SKB_HEADROOM (max(XDP_PACKET_HEADROOM, NET_SKB_PAD) + \
- NET_IP_ALIGN)
+#define MVNETA_SKB_HEADROOM max(XDP_PACKET_HEADROOM, NET_SKB_PAD)
#define MVNETA_SKB_PAD (SKB_DATA_ALIGN(sizeof(struct skb_shared_info) + \
MVNETA_SKB_HEADROOM))
#define MVNETA_SKB_SIZE(len) (SKB_DATA_ALIGN(len) + MVNETA_SKB_PAD)
@@ -1167,6 +1166,7 @@ static void mvneta_bm_update_mtu(struct mvneta_port *pp, int mtu)
mvneta_bm_pool_destroy(pp->bm_priv, pp->pool_short, 1 << pp->id);
pp->bm_priv = NULL;
+ pp->rx_offset_correction = MVNETA_SKB_HEADROOM;
mvreg_write(pp, MVNETA_ACC_MODE, MVNETA_ACC_MODE_EXT1);
netdev_info(pp->dev, "fail to update MTU, fall back to software BM\n");
}
@@ -4948,7 +4948,6 @@ static int mvneta_probe(struct platform_device *pdev)
SET_NETDEV_DEV(dev, &pdev->dev);
pp->id = global_port_id++;
- pp->rx_offset_correction = MVNETA_SKB_HEADROOM;
/* Obtain access to BM resources if enabled and already initialized */
bm_node = of_parse_phandle(dn, "buffer-manager", 0);
@@ -4973,6 +4972,10 @@ static int mvneta_probe(struct platform_device *pdev)
}
of_node_put(bm_node);
+ /* sw buffer management */
+ if (!pp->bm_priv)
+ pp->rx_offset_correction = MVNETA_SKB_HEADROOM;
+
err = mvneta_init(&pdev->dev, pp);
if (err < 0)
goto err_netdev;
@@ -5130,6 +5133,7 @@ static int mvneta_resume(struct device *device)
err = mvneta_bm_port_init(pdev, pp);
if (err < 0) {
dev_info(&pdev->dev, "use SW buffer management\n");
+ pp->rx_offset_correction = MVNETA_SKB_HEADROOM;
pp->bm_priv = NULL;
}
}
--
2.21.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: mvneta: fix XDP support if sw bm is used as fallback
2020-01-29 11:50 [PATCH net] net: mvneta: fix XDP support if sw bm is used as fallback Lorenzo Bianconi
@ 2020-01-29 12:59 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-01-29 12:59 UTC (permalink / raw)
To: lorenzo
Cc: netdev, ilias.apalodimas, lorenzo.bianconi, brouer, sven.auhagen, andrew
From: Lorenzo Bianconi <lorenzo@kernel.org>
Date: Wed, 29 Jan 2020 12:50:53 +0100
> In order to fix XDP support if sw buffer management is used as fallback
> for hw bm devices, define MVNETA_SKB_HEADROOM as maximum between
> XDP_PACKET_HEADROOM and NET_SKB_PAD and let the hw aligns the IP header
> to 4-byte boundary.
> Fix rx_offset_correction initialization if mvneta_bm_port_init fails in
> mvneta_resume routine
>
> Fixes: 0db51da7a8e9 ("net: mvneta: add basic XDP support")
> Tested-by: Sven Auhagen <sven.auhagen@voleatech.de>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Applied and queued up for v5.5 -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-29 12:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-29 11:50 [PATCH net] net: mvneta: fix XDP support if sw bm is used as fallback Lorenzo Bianconi
2020-01-29 12:59 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.