fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump to 4.9.287, 4.14.251, 4.19.212

Browse Source 
Manually rebased:
- generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch

Refreshed all patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-10-17 21:51:51 +08:00
parent dbd46ed26a
commit 9e56c46a39
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
16 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/kernel-version.mk
View File

@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-4.9 = .285
LINUX_VERSION-4.14 = .249
LINUX_VERSION-4.19 = .209
LINUX_VERSION-4.9 = .287
LINUX_VERSION-4.14 = .251
LINUX_VERSION-4.19 = .212
LINUX_KERNEL_HASH-4.9.285 = 4b2a22d43d066984352c0a19d4b8bd481ae732100b7c8639cc16970c2b9973c2
LINUX_KERNEL_HASH-4.14.249 = 320f96eb2bea421ebcc894319fea54a77bbff26d50c86d27528347ea12f7c472
LINUX_KERNEL_HASH-4.19.209 = 7327d5b92e60b0134488c9bec463ef3d252ea49ac718117b37e80a8e5f87e913
LINUX_KERNEL_HASH-4.9.287 = d44128674702529dd26214d6cd1c19542c37c5cc516f352bebbb78f0a9ed97c2
LINUX_KERNEL_HASH-4.14.251 = d7463a4515e778a772436261b73131d7a20a5c8a2d3fa16d062572eab989e121
LINUX_KERNEL_HASH-4.19.212 = 5cefdb78ddd29ae5ccda7da803da07d7cc80d68d2f6de967b61712d87f1db643
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

6
target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch
View File

@ -26,7 +26,7 @@
#endif /* __MDIO_BOARD_INFO_H */
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -456,6 +456,17 @@ void mdiobus_free(struct mii_bus *bus)
@@ -463,6 +463,17 @@ void mdiobus_free(struct mii_bus *bus)
}
EXPORT_SYMBOL(mdiobus_free);
@ -44,7 +44,7 @@
/**
* mdiobus_scan - scan a bus for MDIO devices.
* @bus: mii_bus to scan
@@ -471,6 +482,7 @@ EXPORT_SYMBOL(mdiobus_free);
@@ -478,6 +489,7 @@ EXPORT_SYMBOL(mdiobus_free);
struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
{
struct phy_device *phydev;
@ -52,7 +52,7 @@
int err;
phydev = get_phy_device(bus, addr, false);
@@ -483,6 +495,12 @@ struct phy_device *mdiobus_scan(struct m
@@ -490,6 +502,12 @@ struct phy_device *mdiobus_scan(struct m
*/
of_mdiobus_link_mdiodev(bus, &phydev->mdio);

6
target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch
View File

@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/*
* Because of non atomicity rules, all
@@ -400,31 +421,17 @@ struct sock {
@@ -400,33 +421,19 @@ struct sock {
#define SK_PROTOCOL_MAX U8_MAX
kmemcheck_bitfield_end(flags);
@ -137,15 +137,17 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u32 sk_max_ack_backlog;
- __u32 sk_priority;
- __u32 sk_mark;
spinlock_t sk_peer_lock;
struct pid *sk_peer_pid;
const struct cred *sk_peer_cred;
long sk_rcvtimeo;
- long sk_sndtimeo;
- struct timer_list sk_timer;
ktime_t sk_stamp;
#if BITS_PER_LONG==32
seqlock_t sk_stamp_seq;
@@ -434,10 +441,6 @@ struct sock {
@@ -436,10 +443,6 @@ struct sock {
u32 sk_tskey;
struct socket *sk_socket;
void *sk_user_data;

2
target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
View File

@ -55,7 +55,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
rwlock_t sk_callback_lock;
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2507,6 +2507,7 @@ void sock_init_data(struct socket *sock,
@@ -2513,6 +2513,7 @@ void sock_init_data(struct socket *sock,
sk->sk_max_pacing_rate = ~0U;
sk->sk_pacing_rate = ~0U;

2
target/linux/generic/backport-4.9/605-0001-tcp-internal-implementation-for-pacing.patch
View File

@ -123,7 +123,7 @@ Signed-off-by: Albert I <kras@raphielgang.org>
long sk_sndtimeo;
struct timer_list sk_timer;
__u32 sk_priority;
@@ -460,6 +462,12 @@ struct sock {
@@ -462,6 +464,12 @@ struct sock {
struct rcu_head sk_rcu;
};

2
target/linux/generic/hack-4.19/661-use_fq_codel_by_default.patch
View File

@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
device, it has to decide which ones to send first, which ones to
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -2163,7 +2163,7 @@ static int __init pktsched_init(void)
@@ -2169,7 +2169,7 @@ static int __init pktsched_init(void)
return err;
}

6
target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch
View File

@ -9,7 +9,7 @@
/**
* mdiobus_alloc_size - allocate a mii_bus structure
* @size: extra amount of memory to allocate for private storage.
@@ -401,6 +403,17 @@ void mdiobus_free(struct mii_bus *bus)
@@ -408,6 +410,17 @@ void mdiobus_free(struct mii_bus *bus)
}
EXPORT_SYMBOL(mdiobus_free);
@ -27,7 +27,7 @@
/**
* mdiobus_scan - scan a bus for MDIO devices.
* @bus: mii_bus to scan
@@ -416,6 +429,7 @@ EXPORT_SYMBOL(mdiobus_free);
@@ -423,6 +436,7 @@ EXPORT_SYMBOL(mdiobus_free);
struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
{
struct phy_device *phydev;
@ -35,7 +35,7 @@
int err;
phydev = get_phy_device(bus, addr, false);
@@ -428,6 +442,12 @@ struct phy_device *mdiobus_scan(struct m
@@ -435,6 +449,12 @@ struct phy_device *mdiobus_scan(struct m
*/
of_mdiobus_link_mdiodev(bus, &phydev->mdio);

2
target/linux/generic/hack-4.9/901-debloat_sock_diag.patch
View File

@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
obj-$(CONFIG_PROC_FS) += net-procfs.o
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1468,9 +1468,11 @@ void sk_destruct(struct sock *sk)
@@ -1472,9 +1472,11 @@ void sk_destruct(struct sock *sk)
static void __sk_free(struct sock *sk)
{

2
target/linux/generic/hack-4.9/902-debloat_proc.patch
View File

@ -328,7 +328,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3120,6 +3120,8 @@ static __net_initdata struct pernet_oper
@@ -3126,6 +3126,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{

10
target/linux/generic/pending-4.14/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -5129,6 +5142,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -5157,6 +5170,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
@@ -6032,6 +6048,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -6060,6 +6076,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -6053,6 +6072,12 @@ static void ata_host_release(struct devi
@@ -6081,6 +6100,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -6499,7 +6524,23 @@ int ata_host_register(struct ata_host *h
@@ -6527,7 +6552,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}
@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
@@ -895,6 +898,12 @@ struct ata_port {
@@ -896,6 +899,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif

2
target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch
View File

@ -1295,7 +1295,7 @@
void nf_queue_entry_release_refs(struct nf_queue_entry *entry);
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -114,6 +114,8 @@ bool sch_direct_xmit(struct sk_buff *skb
@@ -115,6 +115,8 @@ bool sch_direct_xmit(struct sk_buff *skb
void __qdisc_run(struct Qdisc *q);

10
target/linux/generic/pending-4.19/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -5139,6 +5152,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -5167,6 +5180,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = qc->hw_tag = tag;
@@ -6075,6 +6091,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -6103,6 +6119,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -6110,6 +6129,12 @@ static void ata_host_release(struct kref
@@ -6138,6 +6157,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -6573,7 +6598,23 @@ int ata_host_register(struct ata_host *h
@@ -6601,7 +6626,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}
@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
@@ -898,6 +901,12 @@ struct ata_port {
@@ -899,6 +902,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif

10
target/linux/generic/pending-4.9/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -5003,6 +5016,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -5031,6 +5044,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
@@ -5906,6 +5922,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -5934,6 +5950,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
@@ -5927,6 +5946,12 @@ static void ata_host_release(struct devi
@@ -5955,6 +5974,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
@@ -6373,7 +6398,23 @@ int ata_host_register(struct ata_host *h
@@ -6401,7 +6426,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}
@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
@@ -889,6 +892,12 @@ struct ata_port {
@@ -890,6 +893,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif

2
target/linux/layerscape/patches-4.14/801-sata-support-layerscape.patch
View File

@ -278,7 +278,7 @@ Signed-off-by: Tang Yuantian <andy.tang@nxp.com>
#include "libata.h"
#include "libata-transport.h"
@@ -4118,6 +4119,8 @@ int sata_link_hardreset(struct ata_link
@@ -4144,6 +4145,8 @@ int sata_link_hardreset(struct ata_link
*/
ata_msleep(link->ap, 1);

8
target/linux/oxnas/patches-4.14/999-libata-hacks.patch
View File

@ -15,7 +15,7 @@
/* initialize internal qc */
/* XXX: Tag 0 is used for drivers with legacy EH as some
@@ -5136,6 +5144,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
@@ -5164,6 +5172,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
return NULL;
@ -25,7 +25,7 @@
/* libsas case */
if (ap->flags & ATA_FLAG_SAS_HOST) {
tag = ata_sas_allocate_tag(ap);
@@ -5181,6 +5192,8 @@ void ata_qc_free(struct ata_queued_cmd *
@@ -5209,6 +5220,8 @@ void ata_qc_free(struct ata_queued_cmd *
qc->tag = ATA_TAG_POISON;
if (ap->flags & ATA_FLAG_SAS_HOST)
ata_sas_free_tag(tag, ap);
@ -36,7 +36,7 @@
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -924,6 +924,8 @@ struct ata_port_operations {
@@ -925,6 +925,8 @@ struct ata_port_operations {
enum ata_completion_errors (*qc_prep)(struct ata_queued_cmd *qc);
unsigned int (*qc_issue)(struct ata_queued_cmd *qc);
bool (*qc_fill_rtf)(struct ata_queued_cmd *qc);
@ -45,7 +45,7 @@
/*
* Configuration and exception handling
@@ -1014,6 +1016,9 @@ struct ata_port_operations {
@@ -1015,6 +1017,9 @@ struct ata_port_operations {
void (*phy_reset)(struct ata_port *ap);
void (*eng_timeout)(struct ata_port *ap);

12
target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -494,6 +494,55 @@ struct phy_device *mdiobus_scan(struct m
@@ -501,6 +501,55 @@ struct phy_device *mdiobus_scan(struct m
EXPORT_SYMBOL(mdiobus_scan);
/**
@ -75,7 +75,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* mdiobus_read_nested - Nested version of the mdiobus_read function
* @bus: the mii_bus struct
* @addr: the phy address
@@ -513,11 +562,9 @@ int mdiobus_read_nested(struct mii_bus *
@@ -520,11 +569,9 @@ int mdiobus_read_nested(struct mii_bus *
BUG_ON(in_interrupt());
mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return retval;
}
EXPORT_SYMBOL(mdiobus_read_nested);
@@ -539,11 +586,9 @@ int mdiobus_read(struct mii_bus *bus, in
@@ -546,11 +593,9 @@ int mdiobus_read(struct mii_bus *bus, in
BUG_ON(in_interrupt());
mutex_lock(&bus->mdio_lock);
@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return retval;
}
EXPORT_SYMBOL(mdiobus_read);
@@ -569,11 +614,9 @@ int mdiobus_write_nested(struct mii_bus
@@ -576,11 +621,9 @@ int mdiobus_write_nested(struct mii_bus
BUG_ON(in_interrupt());
mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return err;
}
EXPORT_SYMBOL(mdiobus_write_nested);
@@ -596,11 +639,9 @@ int mdiobus_write(struct mii_bus *bus, i
@@ -603,11 +646,9 @@ int mdiobus_write(struct mii_bus *bus, i
BUG_ON(in_interrupt());
mutex_lock(&bus->mdio_lock);
@ -129,7 +129,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
EXPORT_SYMBOL(mdiobus_write);
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -257,6 +257,9 @@ static inline u16 ethtool_adv_to_mmd_eee
@@ -260,6 +260,9 @@ static inline u16 ethtool_adv_to_mmd_eee
return reg;
}