diff options
| author | Olliver Schinagl <oliver@schinagl.nl> | 2022-09-20 12:01:48 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2022-10-01 02:47:56 +0200 |
| commit | d5bf46bbe8f425182ea07787ae5d92145715da1b (patch) | |
| tree | 2400e91eaba3059f12e39574f0e5fb3a62bb351f /target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch | |
| parent | 5d09118f8e60fa151e03916f255f5511e197af68 (diff) | |
| download | upstream-d5bf46bbe8f425182ea07787ae5d92145715da1b.tar.gz upstream-d5bf46bbe8f425182ea07787ae5d92145715da1b.tar.bz2 upstream-d5bf46bbe8f425182ea07787ae5d92145715da1b.zip | |
generic: Convert incorrect generic/5.10 patches
OpenWRT's developer guide prefers having actual patches so they an be
sent upstream more easily.
However, in this case, Adding proper fields also allows for `git am` to
properly function. Some of these patches are quite old, and lack much
traceable history.
This commit tries to rectify that, by digging in the history to find
where and how it was first added.
It is by no means perfect and also shows some patches that should have
been long gone.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
Diffstat (limited to 'target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch b/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch index 9b16fc00b7..5ca38d2403 100644 --- a/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch +++ b/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch @@ -1,22 +1,27 @@ -commit 5142239a22219921a7863cf00c9ab853c00689d8 -Author: Lorenzo Bianconi <lorenzo@kernel.org> -Date: Fri Mar 11 10:14:18 2022 +0100 +From 5142239a22219921a7863cf00c9ab853c00689d8 Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Fri, 11 Mar 2022 10:14:18 +0100 +Subject: [PATCH] net: veth: Account total xdp_frame len running ndo_xdp_xmit - net: veth: Account total xdp_frame len running ndo_xdp_xmit - - Even if this is a theoretical issue since it is not possible to perform - XDP_REDIRECT on a non-linear xdp_frame, veth driver does not account - paged area in ndo_xdp_xmit function pointer. - Introduce xdp_get_frame_len utility routine to get the xdp_frame full - length and account total frame size running XDP_REDIRECT of a - non-linear xdp frame into a veth device. - - Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> - Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> - Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> - Acked-by: John Fastabend <john.fastabend@gmail.com> - Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.1646989407.git.lorenzo@kernel.org +Even if this is a theoretical issue since it is not possible to perform +XDP_REDIRECT on a non-linear xdp_frame, veth driver does not account +paged area in ndo_xdp_xmit function pointer. +Introduce xdp_get_frame_len utility routine to get the xdp_frame full +length and account total frame size running XDP_REDIRECT of a +non-linear xdp frame into a veth device. +Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> +Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> +Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> +Acked-by: John Fastabend <john.fastabend@gmail.com> +Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.1646989407.git.lorenzo@kernel.org +--- + drivers/net/veth.c | 4 ++-- + include/net/xdp.h | 14 ++++++++++++++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/veth.c b/drivers/net/veth.c +index 58b20ea171dd..b77ce3fdcfe8 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -501,7 +501,7 @@ static int veth_xdp_xmit(struct net_devi |