aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
diff options
context:
space:
mode:
authorJakov Petrina <jakov.petrina@sartura.hr>2020-05-25 14:14:40 +0200
committerLuka Perkov <luka.perkov@sartura.hr>2020-05-28 11:43:13 +0200
commit3dbb658d26062b34e5a540a4477e4a768628c42c (patch)
treeeb3342be7f0e8693c3ae1442668ee4a1ba26b04d /target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch
parent76f9aa6f4bfd12fba34fc44aef890c48d4fb1024 (diff)
downloadupstream-3dbb658d26062b34e5a540a4477e4a768628c42c.tar.gz
upstream-3dbb658d26062b34e5a540a4477e4a768628c42c.tar.bz2
upstream-3dbb658d26062b34e5a540a4477e4a768628c42c.zip
linux: mvebu: backport mvneta XDP support fixes
This patch backports additional fixes for XDP support in the mvneta driver. These changes are found upstream as commits: b37fa92e20ef2 net: mvneta: fix build skb for bm capable devices f383b2950070c net: mvneta: rely on page_pool_recycle_direct in mvneta_run_xdp 79572c98c554d mvneta driver disallow XDP program on hardware buffer management 44efc78d0e464 net: mvneta: fix XDP support if sw bm is used as fallback Signed-off-by: Jakov Petrina <jakov.petrina@sartura.hr>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch')
-rw-r--r--target/linux/mvebu/patches-5.4/021-net-mvneta-rely-on-page_pool_recycle_direct-in-mvnet.patch39
1 files changed, 39 insertions, 0 deletions
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
index 0000000000..a4ee285b04
--- /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);