Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.208 (#11815)
Browse files Browse the repository at this point in the history
  • Loading branch information
Beginner-Go authored Jan 22, 2024
1 parent 1975f13 commit b15250f
Show file tree
Hide file tree
Showing 20 changed files with 232 additions and 594 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .205
LINUX_KERNEL_HASH-5.10.205 = c55217a80d74f81b83116289a8bfe4302293390b45aeabb76f64814920788863
LINUX_VERSION-5.10 = .208
LINUX_KERNEL_HASH-5.10.208 = 9025147a09547f28ec8f496c12efc30bd2fc03b2824a668e8636b2ca0ef1fb6e
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Signed-off-by: Linus Walleij <[email protected]>

#include <asm/byteorder.h>
#include <asm/irq.h>
@@ -5553,6 +5557,72 @@ static void fotg210_init(struct fotg210_
@@ -5550,6 +5554,72 @@ static void fotg210_init(struct fotg210_
}

/*
Expand Down Expand Up @@ -116,7 +116,7 @@ Signed-off-by: Linus Walleij <[email protected]>
* fotg210_hcd_probe - initialize faraday FOTG210 HCDs
*
* Allocates basic resources for this USB host controller, and
@@ -5629,6 +5699,12 @@ static int fotg210_hcd_probe(struct plat
@@ -5626,6 +5696,12 @@ static int fotg210_hcd_probe(struct plat

fotg210_init(fotg210);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2091,7 +2091,7 @@ config CPU_MIPS32
@@ -2089,7 +2089,7 @@ config CPU_MIPS32
config CPU_MIPS64
bool
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6817,15 +6817,10 @@ void __netif_napi_del(struct napi_struct
@@ -6825,15 +6825,10 @@ void __netif_napi_del(struct napi_struct
}
EXPORT_SYMBOL(__netif_napi_del);

Expand All @@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <[email protected]>
weight = n->weight;

/* This NAPI_STATE_SCHED test is for avoiding a race
@@ -6845,7 +6840,7 @@ static int napi_poll(struct napi_struct
@@ -6853,7 +6848,7 @@ static int napi_poll(struct napi_struct
n->poll, work, weight);

if (likely(work < weight))
Expand All @@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <[email protected]>

/* Drivers must not modify the NAPI state if they
* consume the entire weight. In such cases this code
@@ -6854,7 +6849,7 @@ static int napi_poll(struct napi_struct
@@ -6862,7 +6857,7 @@ static int napi_poll(struct napi_struct
*/
if (unlikely(napi_disable_pending(n))) {
napi_complete(n);
Expand All @@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <[email protected]>
}

if (n->gro_bitmask) {
@@ -6872,12 +6867,29 @@ static int napi_poll(struct napi_struct
@@ -6880,12 +6875,29 @@ static int napi_poll(struct napi_struct
if (unlikely(!list_empty(&n->poll_list))) {
pr_warn_once("%s: Budget exhausted after napi rescheduled\n",
n->dev ? n->dev->name : "backlog");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <[email protected]>
static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack)
{
const struct net_device_ops *ops = dev->netdev_ops;
@@ -4276,6 +4298,21 @@ int gro_normal_batch __read_mostly = 8;
@@ -4284,6 +4306,21 @@ int gro_normal_batch __read_mostly = 8;
static inline void ____napi_schedule(struct softnet_data *sd,
struct napi_struct *napi)
{
Expand All @@ -153,7 +153,7 @@ Signed-off-by: David S. Miller <[email protected]>
list_add_tail(&napi->poll_list, &sd->poll_list);
__raise_softirq_irqoff(NET_RX_SOFTIRQ);
}
@@ -6770,6 +6807,12 @@ void netif_napi_add(struct net_device *d
@@ -6778,6 +6815,12 @@ void netif_napi_add(struct net_device *d
set_bit(NAPI_STATE_NPSVC, &napi->state);
list_add_rcu(&napi->dev_list, &dev->napi_list);
napi_hash_add(napi);
Expand All @@ -166,7 +166,7 @@ Signed-off-by: David S. Miller <[email protected]>
}
EXPORT_SYMBOL(netif_napi_add);

@@ -6786,9 +6829,28 @@ void napi_disable(struct napi_struct *n)
@@ -6794,9 +6837,28 @@ void napi_disable(struct napi_struct *n)
hrtimer_cancel(&n->timer);

clear_bit(NAPI_STATE_DISABLE, &n->state);
Expand Down Expand Up @@ -195,7 +195,7 @@ Signed-off-by: David S. Miller <[email protected]>
static void flush_gro_hash(struct napi_struct *napi)
{
int i;
@@ -6814,6 +6876,11 @@ void __netif_napi_del(struct napi_struct
@@ -6822,6 +6884,11 @@ void __netif_napi_del(struct napi_struct

flush_gro_hash(napi);
napi->gro_bitmask = 0;
Expand All @@ -207,7 +207,7 @@ Signed-off-by: David S. Miller <[email protected]>
}
EXPORT_SYMBOL(__netif_napi_del);

@@ -6895,6 +6962,51 @@ static int napi_poll(struct napi_struct
@@ -6903,6 +6970,51 @@ static int napi_poll(struct napi_struct
return work;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <[email protected]>
* @n: NAPI context
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4302,8 +4302,9 @@ static inline void ____napi_schedule(str
@@ -4310,8 +4310,9 @@ static inline void ____napi_schedule(str

if (test_bit(NAPI_STATE_THREADED, &napi->state)) {
/* Paired with smp_mb__before_atomic() in
Expand All @@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <[email protected]>
* wake_up_process() when it's not NULL.
*/
thread = READ_ONCE(napi->thread);
@@ -6780,6 +6781,49 @@ static void init_gro_hash(struct napi_st
@@ -6788,6 +6789,49 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Cc: Hannes Frederic Sowa <[email protected]>
enum gro_result {
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4309,6 +4309,8 @@ static inline void ____napi_schedule(str
@@ -4317,6 +4317,8 @@ static inline void ____napi_schedule(str
*/
thread = READ_ONCE(napi->thread);
if (thread) {
Expand All @@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa <[email protected]>
wake_up_process(thread);
return;
}
@@ -6572,7 +6574,8 @@ bool napi_complete_done(struct napi_stru
@@ -6580,7 +6582,8 @@ bool napi_complete_done(struct napi_stru

WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED));

Expand All @@ -64,7 +64,7 @@ Cc: Hannes Frederic Sowa <[email protected]>

/* If STATE_MISSED was set, leave STATE_SCHED set,
* because we will call napi->poll() one more time.
@@ -7008,16 +7011,25 @@ static int napi_poll(struct napi_struct
@@ -7016,16 +7019,25 @@ static int napi_poll(struct napi_struct

static int napi_thread_wait(struct napi_struct *napi)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7015,7 +7015,7 @@ static int napi_thread_wait(struct napi_
@@ -7023,7 +7023,7 @@ static int napi_thread_wait(struct napi_

set_current_state(TASK_INTERRUPTIBLE);

Expand All @@ -43,7 +43,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
/* Testing SCHED_THREADED bit here to make sure the current
* kthread owns this napi and could poll on this napi.
* Testing SCHED bit is not enough because SCHED bit might be
@@ -7033,6 +7033,7 @@ static int napi_thread_wait(struct napi_
@@ -7041,6 +7041,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <[email protected]>

--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6826,6 +6826,7 @@ int dev_set_threaded(struct net_device *
@@ -6834,6 +6834,7 @@ int dev_set_threaded(struct net_device *

return err;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1172,6 +1172,10 @@ config MIPS_MSC
@@ -1171,6 +1171,10 @@ config MIPS_MSC
config SYNC_R4K
bool

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3658,6 +3658,11 @@ static int xmit_one(struct sk_buff *skb,
@@ -3666,6 +3666,11 @@ static int xmit_one(struct sk_buff *skb,
if (dev_nit_active(dev))
dev_queue_xmit_nit(skb, dev);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/902-debloat_proc.patch
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3725,6 +3725,8 @@ static __net_initdata struct pernet_oper
@@ -3726,6 +3726,8 @@ static __net_initdata struct pernet_oper

static int __init proto_init(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
struct net_bridge_port *p;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3654,9 +3654,17 @@ static int xmit_one(struct sk_buff *skb,
@@ -3662,9 +3662,17 @@ static int xmit_one(struct sk_buff *skb,
{
unsigned int len;
int rc;
Expand All @@ -99,7 +99,7 @@

#ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
@@ -5210,6 +5218,11 @@ void netdev_rx_handler_unregister(struct
@@ -5218,6 +5226,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);

Expand All @@ -111,7 +111,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5258,6 +5271,10 @@ static int __netif_receive_skb_core(stru
@@ -5266,6 +5279,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;

Expand All @@ -122,7 +122,7 @@
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);

trace_netif_receive_skb(skb);
@@ -5297,6 +5314,15 @@ another_round:
@@ -5305,6 +5322,15 @@ another_round:
goto out;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1087,9 +1087,6 @@ config FW_ARC
@@ -1086,9 +1086,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool

Expand All @@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
config CEVT_BCM1480
bool

@@ -3185,6 +3182,18 @@ choice
@@ -3183,6 +3180,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
case RTN_THROW:
case RTN_UNREACHABLE:
default:
@@ -4449,6 +4468,17 @@ static int ip6_pkt_prohibit_out(struct n
@@ -4446,6 +4465,17 @@ static int ip6_pkt_prohibit_out(struct n
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}

Expand All @@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
/*
* Allocate a dst for local (unicast / anycast) address.
*/
@@ -4936,7 +4966,8 @@ static int rtm_to_fib6_config(struct sk_
@@ -4933,7 +4963,8 @@ static int rtm_to_fib6_config(struct sk_
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
Expand All @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
cfg->fc_flags |= RTF_REJECT;

if (rtm->rtm_type == RTN_LOCAL)
@@ -6136,6 +6167,8 @@ static int ip6_route_dev_notify(struct n
@@ -6133,6 +6164,8 @@ static int ip6_route_dev_notify(struct n
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
Expand All @@ -194,15 +194,15 @@ Signed-off-by: Jonas Gorski <[email protected]>
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
@@ -6147,6 +6180,7 @@ static int ip6_route_dev_notify(struct n
@@ -6144,6 +6177,7 @@ static int ip6_route_dev_notify(struct n
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
+ in6_dev_put_clear(&net->ipv6.ip6_policy_failed_entry->rt6i_idev);
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
#endif
}
@@ -6338,6 +6372,8 @@ static int __net_init ip6_route_net_init
@@ -6335,6 +6369,8 @@ static int __net_init ip6_route_net_init

#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.fib6_has_custom_rules = false;
Expand All @@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
sizeof(*net->ipv6.ip6_prohibit_entry),
GFP_KERNEL);
@@ -6348,11 +6384,21 @@ static int __net_init ip6_route_net_init
@@ -6345,11 +6381,21 @@ static int __net_init ip6_route_net_init
ip6_template_metrics, true);
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);

Expand All @@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
@@ -6379,6 +6425,8 @@ out:
@@ -6376,6 +6422,8 @@ out:
return ret;

#ifdef CONFIG_IPV6_MULTIPLE_TABLES
Expand All @@ -243,15 +243,15 @@ Signed-off-by: Jonas Gorski <[email protected]>
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
@@ -6398,6 +6446,7 @@ static void __net_exit ip6_route_net_exi
@@ -6395,6 +6443,7 @@ static void __net_exit ip6_route_net_exi
kfree(net->ipv6.ip6_null_entry);
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
+ kfree(net->ipv6.ip6_policy_failed_entry);
kfree(net->ipv6.ip6_blk_hole_entry);
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
@@ -6481,6 +6530,9 @@ void __init ip6_route_init_special_entri
@@ -6478,6 +6527,9 @@ void __init ip6_route_init_special_entri
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6073,6 +6073,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;

Expand All @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (netif_elide_gro(skb->dev))
goto normal;

@@ -8052,6 +8055,48 @@ static void __netdev_adjacent_dev_unlink
@@ -8060,6 +8063,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}

Expand Down Expand Up @@ -91,23 +91,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
@@ -8103,6 +8148,7 @@ static int __netdev_upper_dev_link(struc
@@ -8111,6 +8156,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;

+ netdev_update_addr_mask(dev);
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -8199,6 +8245,7 @@ static void __netdev_upper_dev_unlink(st
@@ -8207,6 +8253,7 @@ static void __netdev_upper_dev_unlink(st

__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);

+ netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);

@@ -8985,6 +9032,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;
Expand Down
Loading

0 comments on commit b15250f

Please sign in to comment.