-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.107 All patches automatically rebased. Build system: bcm53xx octeon Signed-off-by: Zxl hhyccc <[email protected]> Link: openwrt/openwrt#16283 Signed-off-by: Hauke Mehrtens <[email protected]>
- Loading branch information
Showing
12 changed files
with
30 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.1 = .106 | ||
LINUX_KERNEL_HASH-6.1.106 = 3773c9052c7ba7432e8337ca84bee115c1a94ccef9d62b72b99ae30c4cd5f80f | ||
LINUX_VERSION-6.1 = .107 | ||
LINUX_KERNEL_HASH-6.1.107 = f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -181,7 +181,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
dpaa2_switch_port_disconnect_mac(port_priv); | ||
else | ||
dpaa2_switch_port_connect_mac(port_priv); | ||
@@ -3249,6 +3272,8 @@ static int dpaa2_switch_probe_port(struc | ||
@@ -3250,6 +3273,8 @@ static int dpaa2_switch_probe_port(struc | ||
port_priv->netdev = port_netdev; | ||
port_priv->ethsw_data = ethsw; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -101,7 +101,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
} | ||
|
||
out: | ||
@@ -2951,9 +2949,7 @@ static void dpaa2_switch_remove_port(str | ||
@@ -2952,9 +2950,7 @@ static void dpaa2_switch_remove_port(str | ||
{ | ||
struct ethsw_port_priv *port_priv = ethsw->ports[port_idx]; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -335,23 +335,23 @@ Signed-off-by: T.J. Mercier <[email protected]> | |
if (order > 0) | ||
return 0; | ||
|
||
@@ -5387,6 +5400,7 @@ static int mem_cgroup_css_online(struct | ||
@@ -5390,6 +5403,7 @@ static int mem_cgroup_css_online(struct | ||
if (unlikely(mem_cgroup_is_root(memcg))) | ||
queue_delayed_work(system_unbound_wq, &stats_flush_dwork, | ||
2UL*HZ); | ||
+ lru_gen_online_memcg(memcg); | ||
return 0; | ||
offline_kmem: | ||
memcg_offline_kmem(memcg); | ||
@@ -5418,6 +5432,7 @@ static void mem_cgroup_css_offline(struc | ||
@@ -5421,6 +5435,7 @@ static void mem_cgroup_css_offline(struc | ||
memcg_offline_kmem(memcg); | ||
reparent_shrinker_deferred(memcg); | ||
wb_memcg_offline(memcg); | ||
+ lru_gen_offline_memcg(memcg); | ||
|
||
drain_all_stock(memcg); | ||
|
||
@@ -5429,6 +5444,7 @@ static void mem_cgroup_css_released(stru | ||
@@ -5432,6 +5447,7 @@ static void mem_cgroup_css_released(stru | ||
struct mem_cgroup *memcg = mem_cgroup_from_css(css); | ||
|
||
invalidate_reclaim_iterators(memcg); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -87,7 +87,7 @@ Signed-off-by: T.J. Mercier <[email protected]> | |
mark_page_accessed(page); | ||
} | ||
rss[mm_counter(page)]--; | ||
@@ -5219,8 +5218,8 @@ static inline void mm_account_fault(stru | ||
@@ -5218,8 +5217,8 @@ static inline void mm_account_fault(stru | ||
#ifdef CONFIG_LRU_GEN | ||
static void lru_gen_enter_fault(struct vm_area_struct *vma) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -202,7 +202,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
.mac_link_up = am65_cpsw_nuss_mac_link_up, | ||
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | ||
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | ||
@@ -1736,7 +1736,6 @@ static void axienet_mac_link_up(struct p | ||
@@ -1737,7 +1737,6 @@ static void axienet_mac_link_up(struct p | ||
} | ||
|
||
static const struct phylink_mac_ops axienet_phylink_ops = { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
supported = mac_dev->phylink_config.supported_interfaces; | ||
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | ||
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c | ||
@@ -1631,7 +1631,7 @@ static void axienet_pcs_an_restart(struc | ||
@@ -1632,7 +1632,7 @@ static void axienet_pcs_an_restart(struc | ||
phylink_mii_c22_pcs_an_restart(pcs_phy); | ||
} | ||
|
||
|
@@ -62,7 +62,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
phy_interface_t interface, | ||
const unsigned long *advertising, | ||
bool permit_pause_to_mac) | ||
@@ -1653,7 +1653,8 @@ static int axienet_pcs_config(struct phy | ||
@@ -1654,7 +1654,8 @@ static int axienet_pcs_config(struct phy | ||
} | ||
} | ||
|
||
|
@@ -72,7 +72,7 @@ Signed-off-by: Jakub Kicinski <[email protected]> | |
if (ret < 0) | ||
netdev_warn(ndev, "Failed to configure PCS: %d\n", ret); | ||
|
||
@@ -2129,6 +2130,7 @@ static int axienet_probe(struct platform | ||
@@ -2130,6 +2131,7 @@ static int axienet_probe(struct platform | ||
} | ||
of_node_put(np); | ||
lp->pcs.ops = &axienet_pcs_ops; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (!pe) | ||
--- a/mm/vmalloc.c | ||
+++ b/mm/vmalloc.c | ||
@@ -4222,6 +4222,8 @@ static const struct seq_operations vmall | ||
@@ -4215,6 +4215,8 @@ static const struct seq_operations vmall | ||
|
||
static int __init proc_vmalloc_init(void) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6)) | ||
return -1; | ||
|
||
@@ -1545,6 +1706,14 @@ ip6_tnl_change(struct ip6_tnl *t, const | ||
@@ -1546,6 +1707,14 @@ ip6_tnl_change(struct ip6_tnl *t, const | ||
t->parms.link = p->link; | ||
t->parms.proto = p->proto; | ||
t->parms.fwmark = p->fwmark; | ||
|
@@ -353,15 +353,15 @@ Signed-off-by: Steven Barth <[email protected]> | |
dst_cache_reset(&t->dst_cache); | ||
ip6_tnl_link_config(t); | ||
} | ||
@@ -1579,6 +1748,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ | ||
@@ -1580,6 +1749,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ | ||
p->flowinfo = u->flowinfo; | ||
p->link = u->link; | ||
p->proto = u->proto; | ||
+ p->fmrs = NULL; | ||
memcpy(p->name, u->name, sizeof(u->name)); | ||
} | ||
|
||
@@ -1965,6 +2135,15 @@ static int ip6_tnl_validate(struct nlatt | ||
@@ -1967,6 +2137,15 @@ static int ip6_tnl_validate(struct nlatt | ||
return 0; | ||
} | ||
|
||
|
@@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
static void ip6_tnl_netlink_parms(struct nlattr *data[], | ||
struct __ip6_tnl_parm *parms) | ||
{ | ||
@@ -2002,6 +2181,46 @@ static void ip6_tnl_netlink_parms(struct | ||
@@ -2004,6 +2183,46 @@ static void ip6_tnl_netlink_parms(struct | ||
|
||
if (data[IFLA_IPTUN_FWMARK]) | ||
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]); | ||
|
@@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
} | ||
|
||
static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, | ||
@@ -2085,6 +2304,12 @@ static void ip6_tnl_dellink(struct net_d | ||
@@ -2087,6 +2306,12 @@ static void ip6_tnl_dellink(struct net_d | ||
|
||
static size_t ip6_tnl_get_size(const struct net_device *dev) | ||
{ | ||
|
@@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
return | ||
/* IFLA_IPTUN_LINK */ | ||
nla_total_size(4) + | ||
@@ -2114,6 +2339,24 @@ static size_t ip6_tnl_get_size(const str | ||
@@ -2116,6 +2341,24 @@ static size_t ip6_tnl_get_size(const str | ||
nla_total_size(0) + | ||
/* IFLA_IPTUN_FWMARK */ | ||
nla_total_size(4) + | ||
|
@@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
0; | ||
} | ||
|
||
@@ -2121,6 +2364,9 @@ static int ip6_tnl_fill_info(struct sk_b | ||
@@ -2123,6 +2366,9 @@ static int ip6_tnl_fill_info(struct sk_b | ||
{ | ||
struct ip6_tnl *tunnel = netdev_priv(dev); | ||
struct __ip6_tnl_parm *parm = &tunnel->parms; | ||
|
@@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
|
||
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || | ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) || | ||
@@ -2130,9 +2376,27 @@ static int ip6_tnl_fill_info(struct sk_b | ||
@@ -2132,9 +2378,27 @@ static int ip6_tnl_fill_info(struct sk_b | ||
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || | ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || | ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) || | ||
|
@@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) || | ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) || | ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || | ||
@@ -2172,6 +2436,7 @@ static const struct nla_policy ip6_tnl_p | ||
@@ -2174,6 +2438,7 @@ static const struct nla_policy ip6_tnl_p | ||
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, | ||
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG }, | ||
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -211,7 +211,7 @@ Signe-off-by: Felix Fietkau <[email protected]> | |
if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) { | ||
const struct iphdr *iph = ip_hdr(skb); | ||
struct tcphdr *th = tcp_hdr(skb); | ||
@@ -177,61 +244,76 @@ out: | ||
@@ -180,61 +247,76 @@ out: | ||
return segs; | ||
} | ||
|
||
|
@@ -318,7 +318,7 @@ Signe-off-by: Felix Fietkau <[email protected]> | |
flush = NAPI_GRO_CB(p)->flush; | ||
flush |= (__force int)(flags & TCP_FLAG_CWR); | ||
flush |= (__force int)((flags ^ tcp_flag_word(th2)) & | ||
@@ -268,6 +350,19 @@ found: | ||
@@ -271,6 +353,19 @@ found: | ||
flush |= p->decrypted ^ skb->decrypted; | ||
#endif | ||
|
||
|
@@ -338,15 +338,15 @@ Signe-off-by: Felix Fietkau <[email protected]> | |
if (flush || skb_gro_receive(p, skb)) { | ||
mss = 1; | ||
goto out_check_final; | ||
@@ -289,7 +384,6 @@ out_check_final: | ||
@@ -292,7 +387,6 @@ out_check_final: | ||
if (p && (!NAPI_GRO_CB(skb)->same_flow || flush)) | ||
pp = p; | ||
|
||
-out: | ||
NAPI_GRO_CB(skb)->flush |= (flush != 0); | ||
|
||
return pp; | ||
@@ -315,18 +409,58 @@ int tcp_gro_complete(struct sk_buff *skb | ||
@@ -318,18 +412,58 @@ int tcp_gro_complete(struct sk_buff *skb | ||
} | ||
EXPORT_SYMBOL(tcp_gro_complete); | ||
|
||
|
@@ -410,7 +410,7 @@ Signe-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff) | ||
@@ -334,6 +468,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com | ||
@@ -337,6 +471,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_com | ||
const struct iphdr *iph = ip_hdr(skb); | ||
struct tcphdr *th = tcp_hdr(skb); | ||
|
||
|
@@ -428,7 +428,7 @@ Signe-off-by: Felix Fietkau <[email protected]> | |
skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV4; | ||
--- a/net/ipv4/udp_offload.c | ||
+++ b/net/ipv4/udp_offload.c | ||
@@ -425,33 +425,6 @@ out: | ||
@@ -437,33 +437,6 @@ out: | ||
return segs; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/netfilter/nf_tables_api.c | ||
+++ b/net/netfilter/nf_tables_api.c | ||
@@ -7969,7 +7969,7 @@ static int nft_register_flowtable_net_ho | ||
@@ -8012,7 +8012,7 @@ static int nft_register_flowtable_net_ho | ||
err = flowtable->data.type->setup(&flowtable->data, | ||
hook->ops.dev, | ||
FLOW_BLOCK_BIND); | ||
|