linux: mvebu: backport mvneta XDP support fixes

[openwrt/staging/luka.git] / target / linux / mvebu / patches-5.4 / 021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch

diff --git a/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch b/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
new file mode 100644 (file)
index 0000000..a4ee285
--- /dev/null
+++ b/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
@@ -0,0 +1,39 @@
+From f383b2950070ce4f34e74db94f70bb565b746e97 Mon Sep 17 00:00:00 2001
+From: Lorenzo Bianconi <lorenzo@kernel.org>
+Date: Wed, 20 Nov 2019 16:54:17 +0200
+Subject: [PATCH] net: mvneta: rely on page_pool_recycle_direct in
+ mvneta_run_xdp
+
+Rely on page_pool_recycle_direct and not on xdp_return_buff in
+mvneta_run_xdp. This is a preliminary patch to limit the dma sync len
+to the one strictly necessary
+
+Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
+Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/marvell/mvneta.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/ethernet/marvell/mvneta.c
++++ b/drivers/net/ethernet/marvell/mvneta.c
+@@ -2108,7 +2108,8 @@ mvneta_run_xdp(struct mvneta_port *pp, s
+               err = xdp_do_redirect(pp->dev, xdp, prog);
+               if (err) {
+                       ret = MVNETA_XDP_DROPPED;
+-                      xdp_return_buff(xdp);
++                      page_pool_recycle_direct(rxq->page_pool,
++                                               virt_to_head_page(xdp->data));
+               } else {
+                       ret = MVNETA_XDP_REDIR;
+               }
+@@ -2117,7 +2118,8 @@ mvneta_run_xdp(struct mvneta_port *pp, s
+       case XDP_TX:
+               ret = mvneta_xdp_xmit_back(pp, xdp);
+               if (ret != MVNETA_XDP_TX)
+-                      xdp_return_buff(xdp);
++                      page_pool_recycle_direct(rxq->page_pool,
++                                               virt_to_head_page(xdp->data));
+               break;
+       default:
+               bpf_warn_invalid_xdp_action(act);