From ad112456633154137b27f48a41a6a2d4404a6396 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Mon, 20 May 2024 23:40:29 +0800 Subject: [PATCH] kernel: bump 5.10 to 5.10.217 (#12174) --- include/kernel-5.10 | 4 ++-- .../630-v5.15-page_pool_frag_support.patch | 16 ++++++++-------- ...race-between-coalescing-and-releasing-S.patch | 2 +- .../hack-5.10/721-net-add-packet-mangeling.patch | 10 +++++----- ...tch-linux-kernel-to-support-shortcut-fe.patch | 4 ++-- .../pending-5.10/655-increase_skb_pad.patch | 2 +- ...-NET-skip-GRO-for-foreign-MAC-addresses.patch | 16 ++++++++-------- ...ge-pool-and-page-referenced-frags-in-GR.patch | 2 +- ...mtkhnat-fix-pskb-expand-head-limitation.patch | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 13b903b54..23d4abf66 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .216 -LINUX_KERNEL_HASH-5.10.216 = e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151 +LINUX_VERSION-5.10 = .217 +LINUX_KERNEL_HASH-5.10.217 = c52bc1ffc396c11bce335c9ee5cd55fe4213cbc1fb4026ff62bb90c864c61f62 diff --git a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch index 60075af2c..bc5be29bd 100644 --- a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch +++ b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch @@ -574,7 +574,7 @@ union { --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -594,13 +594,22 @@ static void skb_clone_fraglist(struct sk +@@ -595,13 +595,22 @@ static void skb_clone_fraglist(struct sk skb_get(list); } @@ -599,7 +599,7 @@ kfree(head); } -@@ -612,16 +621,27 @@ static void skb_release_data(struct sk_b +@@ -613,16 +622,27 @@ static void skb_release_data(struct sk_b if (skb->cloned && atomic_sub_return(skb->nohdr ? (1 << SKB_DATAREF_SHIFT) + 1 : 1, &shinfo->dataref)) @@ -629,7 +629,7 @@ } /* -@@ -1002,6 +1022,7 @@ static struct sk_buff *__skb_clone(struc +@@ -1003,6 +1023,7 @@ static struct sk_buff *__skb_clone(struc n->nohdr = 0; n->peeked = 0; C(pfmemalloc); @@ -637,7 +637,7 @@ n->destructor = NULL; C(tail); C(end); -@@ -3420,7 +3441,7 @@ int skb_shift(struct sk_buff *tgt, struc +@@ -3432,7 +3453,7 @@ int skb_shift(struct sk_buff *tgt, struc fragto = &skb_shinfo(tgt)->frags[merge]; skb_frag_size_add(fragto, skb_frag_size(fragfrom)); @@ -646,7 +646,7 @@ } /* Reposition in the original skb */ -@@ -5204,6 +5225,20 @@ bool skb_try_coalesce(struct sk_buff *to +@@ -5216,6 +5237,20 @@ bool skb_try_coalesce(struct sk_buff *to if (skb_cloned(to)) return false; @@ -687,7 +687,7 @@ #ifdef CONFIG_SKB_EXTENSIONS __u8 active_extensions; #endif -@@ -3030,9 +3032,15 @@ static inline void skb_frag_ref(struct s +@@ -3045,9 +3047,15 @@ static inline void skb_frag_ref(struct s * * Releases a reference on the paged fragment @frag. */ @@ -705,7 +705,7 @@ } /** -@@ -3044,7 +3052,7 @@ static inline void __skb_frag_unref(skb_ +@@ -3059,7 +3067,7 @@ static inline void __skb_frag_unref(skb_ */ static inline void skb_frag_unref(struct sk_buff *skb, int f) { @@ -714,7 +714,7 @@ } /** -@@ -4643,5 +4651,12 @@ static inline u64 skb_get_kcov_handle(st +@@ -4658,5 +4666,12 @@ static inline u64 skb_get_kcov_handle(st #endif } diff --git a/target/linux/generic/backport-5.10/633-v6.3-skbuff-Fix-a-race-between-coalescing-and-releasing-S.patch b/target/linux/generic/backport-5.10/633-v6.3-skbuff-Fix-a-race-between-coalescing-and-releasing-S.patch index a461734b6..57230fcd1 100644 --- a/target/linux/generic/backport-5.10/633-v6.3-skbuff-Fix-a-race-between-coalescing-and-releasing-S.patch +++ b/target/linux/generic/backport-5.10/633-v6.3-skbuff-Fix-a-race-between-coalescing-and-releasing-S.patch @@ -56,7 +56,7 @@ Signed-off-by: Jakub Kicinski --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -5225,18 +5225,18 @@ bool skb_try_coalesce(struct sk_buff *to +@@ -5237,18 +5237,18 @@ bool skb_try_coalesce(struct sk_buff *to if (skb_cloned(to)) return false; diff --git a/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch index 8f6702e43..cea9bb000 100644 --- a/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch +++ b/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2728,6 +2728,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2743,6 +2743,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2859,16 +2863,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2874,16 +2878,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -119,15 +119,15 @@ Signed-off-by: Felix Fietkau trace_net_dev_start_xmit(skb, dev); --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -60,6 +60,7 @@ - #include +@@ -61,6 +61,7 @@ #include #include + #include +#include #include #include -@@ -553,6 +554,22 @@ skb_fail: +@@ -554,6 +555,22 @@ skb_fail: } EXPORT_SYMBOL(__napi_alloc_skb); diff --git a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 11a15a6fe..2a76af106 100644 --- a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -12,9 +12,9 @@ struct list_head *br_ip_list); --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -866,6 +866,10 @@ struct sk_buff { +@@ -865,6 +865,10 @@ struct sk_buff { + #endif __u8 scm_io_uring:1; - __u8 gro_skip:1; +#ifdef CONFIG_SHORTCUT_FE + __u8 fast_forwarded:1; diff --git a/target/linux/generic/pending-5.10/655-increase_skb_pad.patch b/target/linux/generic/pending-5.10/655-increase_skb_pad.patch index dafafad58..c94563a6a 100644 --- a/target/linux/generic/pending-5.10/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-5.10/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2694,7 +2694,7 @@ static inline int pskb_network_may_pull( +@@ -2709,7 +2709,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 78c6d2a54..8b06c2ca2 100644 --- a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1995,6 +1995,8 @@ struct net_device { +@@ -2061,6 +2061,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; @@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau #endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -831,6 +831,7 @@ struct sk_buff { +@@ -868,6 +868,7 @@ struct sk_buff { #ifdef CONFIG_NET_SCHED __u16 tc_index; /* traffic control index */ #endif @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __wsum csum; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5516,6 +5516,9 @@ static enum gro_result dev_gro_receive(s +@@ -6081,6 +6081,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -7318,6 +7321,48 @@ static void __netdev_adjacent_dev_unlink +@@ -8060,6 +8063,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7368,6 +7413,7 @@ static int __netdev_upper_dev_link(struc +@@ -8111,6 +8156,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7461,6 +7507,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -8207,6 +8253,7 @@ static void __netdev_upper_dev_unlink(st __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -8191,6 +8238,7 @@ int dev_set_mac_address(struct net_devic +@@ -8993,6 +9040,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; @@ -136,7 +136,7 @@ Signed-off-by: Felix Fietkau /** * eth_type_trans - determine the packet's protocol ID. * @skb: received socket data -@@ -184,6 +184,9 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) +@@ -166,6 +178,9 @@ __be16 eth_type_trans(struct sk_buff *sk eth_skb_pkt_type(skb, dev); diff --git a/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch b/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch index 278a0b7e8..d64e334af 100644 --- a/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch +++ b/target/linux/generic/pending-5.10/750-skb-Do-mix-page-pool-and-page-referenced-frags-in-GR.patch @@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -4176,6 +4176,15 @@ int skb_gro_receive(struct sk_buff *p, s +@@ -4188,6 +4188,15 @@ int skb_gro_receive(struct sk_buff *p, s if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush)) return -E2BIG; diff --git a/target/linux/ramips/patches-5.10/902-mtkhnat-fix-pskb-expand-head-limitation.patch b/target/linux/ramips/patches-5.10/902-mtkhnat-fix-pskb-expand-head-limitation.patch index 9bd7432de..53b3b1b5b 100644 --- a/target/linux/ramips/patches-5.10/902-mtkhnat-fix-pskb-expand-head-limitation.patch +++ b/target/linux/ramips/patches-5.10/902-mtkhnat-fix-pskb-expand-head-limitation.patch @@ -1,6 +1,6 @@ --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -70,6 +70,7 @@ +@@ -71,6 +71,7 @@ #include #include #include @@ -8,7 +8,7 @@ #include #include -@@ -1686,6 +1687,9 @@ int pskb_expand_head(struct sk_buff *skb +@@ -1693,6 +1694,9 @@ int pskb_expand_head(struct sk_buff *skb skb_shinfo(skb), offsetof(struct skb_shared_info, frags[skb_shinfo(skb)->nr_frags]));