diff options
author | Daniel Golle <daniel@makrotopia.org> | 2022-08-29 08:54:41 +0200 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-09-22 23:55:02 +0100 |
commit | c93c5365c0eb78ba8b479a9fe0cc5ec96f773978 (patch) | |
tree | b250435d0f0e8e66c56d0486d1151d4eb1fc827e /target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch | |
parent | 524f52a471495d2c4e764539e000cb699610de1f (diff) | |
download | upstream-c93c5365c0eb78ba8b479a9fe0cc5ec96f773978.tar.gz upstream-c93c5365c0eb78ba8b479a9fe0cc5ec96f773978.tar.bz2 upstream-c93c5365c0eb78ba8b479a9fe0cc5ec96f773978.zip |
kernel: pick patches for MediaTek Ethernet from linux-next
Pick patches with several fixes and improvements, preparation for
upcoming WED (TX) [1] as well as basic XDP support [2] with MediaTek's
Filogic SoCs to the mtk_eth_soc driver.
Also pick follow-up patch fixing Ethernet on MT7621 [3].
Tested on Bananapi BPi-R3 (MT7986), Bananapi BPi-R64 (MT7622),
Bananapi BPi-R2 (MT7623), MikroTik RouterBoard M11G (MT7621).
[1]: https://patchwork.kernel.org/project/netdevbpf/list/?series=662108&state=*
[2]: https://patchwork.kernel.org/project/netdevbpf/list/?series=675368&state=*
(the first part of the series adding wed nodes to mt7986a.dtsi was
applied to the copy of mt7986a.dtsi in our tree)
[3]: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=5e69163d3b9931098922b3fc2f8e786af8c1f37e
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch b/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch new file mode 100644 index 0000000000..5ded882f90 --- /dev/null +++ b/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch @@ -0,0 +1,29 @@ +commit d16697cb6261d4cc23422e6b1cb2759df8aa76d0 +Author: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Fri Jan 21 11:09:44 2022 +0100 + + net: skbuff: add size metadata to skb_shared_info for xdp + + Introduce xdp_frags_size field in skb_shared_info data structure + to store xdp_buff/xdp_frame frame paged size (xdp_frags_size will + be used in xdp frags support). In order to not increase + skb_shared_info size we will use a hole due to skb_shared_info + alignment. + + Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> + Acked-by: John Fastabend <john.fastabend@gmail.com> + Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> + Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> + Link: https://lore.kernel.org/r/8a849819a3e0a143d540f78a3a5add76e17e980d.1642758637.git.lorenzo@kernel.org + Signed-off-by: Alexei Starovoitov <ast@kernel.org> + +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -567,6 +567,7 @@ struct skb_shared_info { + * Warning : all fields before dataref are cleared in __alloc_skb() + */ + atomic_t dataref; ++ unsigned int xdp_frags_size; + + /* Intermediate layers must ensure that destructor_arg + * remains valid until skb destructor */ |