c/pve-kernel-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Ubuntu-5.15.0-14.14

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-12-14 16:41:56 +01:00
parent dd539d4154
commit 7ffd90ef3e
8 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch
View File

@ -21,10 +21,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 7 insertions(+), 3 deletions(-) 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index a72b154de7b0..4dd111086466 100755 index 6a2a04d92f42..6c9430ee1a09 100755
--- a/scripts/mkcompile_h --- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h +++ b/scripts/mkcompile_h
@@ -24,10 +24,14 @@ else @@ -22,10 +22,14 @@ else
VERSION=$KBUILD_BUILD_VERSION VERSION=$KBUILD_BUILD_VERSION
fi fi

8
patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
View File

@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2 files changed, 111 insertions(+) 2 files changed, 111 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 8deb4cd7b133..291885ea26dd 100644 index 69a6eb5dbb90..bdb05853d6c9 100644
--- a/Documentation/admin-guide/kernel-parameters.txt --- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3808,6 +3808,15 @@ @@ -3902,6 +3902,15 @@
Also, it enforces the PCI Local Bus spec Also, it enforces the PCI Local Bus spec
rule that those bits should be 0 in system reset rule that those bits should be 0 in system reset
events (useful for kexec/kdump cases). events (useful for kexec/kdump cases).
@ -75,7 +75,7 @@ index 8deb4cd7b133..291885ea26dd 100644
Safety option to keep boot IRQs enabled. This Safety option to keep boot IRQs enabled. This
should never be necessary. should never be necessary.
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index d44037a6e109..1f576ba148dd 100644 index 993eff5d2e39..e76bfd054dba 100644
--- a/drivers/pci/quirks.c --- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c
@@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void) @@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void)
@ -185,7 +185,7 @@ index d44037a6e109..1f576ba148dd 100644
/* /*
* Decoding should be disabled for a PCI device during BAR sizing to avoid * Decoding should be disabled for a PCI device during BAR sizing to avoid
* conflict. But doing so may cause problems on host bridge and perhaps other * conflict. But doing so may cause problems on host bridge and perhaps other
@@ -4875,6 +4975,8 @@ static const struct pci_dev_acs_enabled { @@ -4912,6 +5012,8 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs }, { PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs },
/* APM X-Gene */ /* APM X-Gene */
{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },

4
patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
View File

@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 3b316cb42554..71aba634a6a8 100644 index ce1847bc898b..8f2f8db422b4 100644
--- a/virt/kvm/kvm_main.c --- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c
@@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644); @@ -79,7 +79,7 @@ module_param(halt_poll_ns, uint, 0644);
EXPORT_SYMBOL_GPL(halt_poll_ns); EXPORT_SYMBOL_GPL(halt_poll_ns);
/* Default doubles per-vcpu halt_poll_ns. */ /* Default doubles per-vcpu halt_poll_ns. */

4
patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch
View File

@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/dev.c b/net/core/dev.c diff --git a/net/core/dev.c b/net/core/dev.c
index 156b44f35102..66014d76a61b 100644 index 91f53eeb0e79..c0b35ed33b30 100644
--- a/net/core/dev.c --- a/net/core/dev.c
+++ b/net/core/dev.c +++ b/net/core/dev.c
@@ -10521,7 +10521,7 @@ static void netdev_wait_allrefs(struct net_device *dev) @@ -10518,7 +10518,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
if (refcnt != 1 && if (refcnt != 1 &&
time_after(jiffies, warning_time + time_after(jiffies, warning_time +
netdev_unregister_timeout_secs * HZ)) { netdev_unregister_timeout_secs * HZ)) {

21
patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch
View File

@ -15,14 +15,14 @@ Link: https://lore.kernel.org/r/20210709231529.GA3270116@roeck-us.net
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
drivers/pci/probe.c | 50 ++++----------------------------------------- drivers/pci/probe.c | 52 +++++----------------------------------------
1 file changed, 4 insertions(+), 46 deletions(-) 1 file changed, 5 insertions(+), 47 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index f6046a16dac1..275204646c68 100644 index e322907d1f3c..d9fc02a71baa 100644
--- a/drivers/pci/probe.c --- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c +++ b/drivers/pci/probe.c
@@ -19,7 +19,6 @@ @@ -20,7 +20,6 @@
#include <linux/irqdomain.h> #include <linux/irqdomain.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/bitfield.h> #include <linux/bitfield.h>
@ -30,7 +30,7 @@ index f6046a16dac1..275204646c68 100644
#include "pci.h" #include "pci.h"
#define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */
@@ -875,31 +874,14 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus) @@ -881,31 +880,14 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
dev_set_msi_domain(&bus->dev, d); dev_set_msi_domain(&bus->dev, d);
} }
@ -65,7 +65,7 @@ index f6046a16dac1..275204646c68 100644
char addr[64], *fmt; char addr[64], *fmt;
const char *name; const char *name;
int err; int err;
@@ -979,35 +961,11 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) @@ -988,35 +970,11 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE) if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE)
dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n"); dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n");
@ -92,13 +92,14 @@ index f6046a16dac1..275204646c68 100644
- -
/* Add initial resources to the bus */ /* Add initial resources to the bus */
resource_list_for_each_entry_safe(window, n, &resources) { resource_list_for_each_entry_safe(window, n, &resources) {
+ list_move_tail(&window->node, &bridge->windows); - offset = window->offset;
offset = window->offset; - res = window->res;
res = window->res;
- if (!res->end) - if (!res->end)
- continue; - continue;
- -
- list_move_tail(&window->node, &bridge->windows); list_move_tail(&window->node, &bridge->windows);
+ offset = window->offset;
+ res = window->res;
if (res->flags & IORESOURCE_BUS) if (res->flags & IORESOURCE_BUS)
pci_bus_insert_busn_res(bus, bus->number, res->end); pci_bus_insert_busn_res(bus, bus->number, res->end);

20
patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch
View File

@ -50,15 +50,16 @@ Cc: Guenter Roeck <linux@roeck-us.net>
Suggested-by: Bjorn Helgaas <bhelgaas@google.com> Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
drivers/pci/probe.c | 31 +++++++++++++++++++++++++++---- drivers/pci/probe.c | 33 ++++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 4 deletions(-) 1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 275204646c68..944c35d87258 100644 index d9fc02a71baa..3459f460dbd8 100644
--- a/drivers/pci/probe.c --- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c +++ b/drivers/pci/probe.c
@@ -877,11 +877,11 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus) @@ -883,11 +883,11 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
static int pci_register_host_bridge(struct pci_host_bridge *bridge) static int pci_register_host_bridge(struct pci_host_bridge *bridge)
{ {
struct device *parent = bridge->dev.parent; struct device *parent = bridge->dev.parent;
@ -73,7 +74,7 @@ index 275204646c68..944c35d87258 100644
char addr[64], *fmt; char addr[64], *fmt;
const char *name; const char *name;
int err; int err;
@@ -961,11 +961,34 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge) @@ -970,11 +970,34 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE) if (nr_node_ids > 1 && pcibus_to_node(bus) == NUMA_NO_NODE)
dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n"); dev_warn(&bus->dev, "Unknown NUMA node; performance will be reduced\n");
@ -99,13 +100,14 @@ index 275204646c68..944c35d87258 100644
+ +
/* Add initial resources to the bus */ /* Add initial resources to the bus */
resource_list_for_each_entry_safe(window, n, &resources) { resource_list_for_each_entry_safe(window, n, &resources) {
- list_move_tail(&window->node, &bridge->windows); + offset = window->offset;
offset = window->offset; + res = window->res;
res = window->res;
+ if (!res->end) + if (!res->end)
+ continue; + continue;
+ +
+ list_move_tail(&window->node, &bridge->windows); list_move_tail(&window->node, &bridge->windows);
- offset = window->offset;
- res = window->res;
if (res->flags & IORESOURCE_BUS) if (res->flags & IORESOURCE_BUS)
pci_bus_insert_busn_res(bus, bus->number, res->end); pci_bus_insert_busn_res(bus, bus->number, res->end);

8
patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch
View File

@ -14,11 +14,11 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
block/bdev.c | 6 ++++++ block/bdev.c | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/fs/block_dev.c b/fs/block_dev.c diff --git a/block/bdev.c b/block/bdev.c
index e4a80bd4ddf1..4a14d28dd923 100644 index 485a258b0ab3..f93165f05987 100644
--- a/block/bdev.c --- a/block/bdev.c
+++ b/block/bdev.c +++ b/block/bdev.c
@@ -1436,6 +1436,10 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder) @@ -800,6 +800,10 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder)
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
@ -29,7 +29,7 @@ index e4a80bd4ddf1..4a14d28dd923 100644
bdev = blkdev_get_no_open(dev); bdev = blkdev_get_no_open(dev);
if (!bdev) if (!bdev)
return ERR_PTR(-ENXIO); return ERR_PTR(-ENXIO);
@@ -1482,6 +1486,8 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder) @@ -852,6 +856,8 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder)
disk_unblock_events(disk); disk_unblock_events(disk);
put_blkdev: put_blkdev:
blkdev_put_no_open(bdev); blkdev_put_no_open(bdev);

2
submodules/ubuntu-jammy

@ -1 +1 @@
Subproject commit d5d03485a8a6a91f4406f08c8c0375dbdc84de7e Subproject commit 401befb9c1c6116168fe6fdf36ec9c9d28771c57