diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index e45c347..c7c9d6c 100644 --- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -55,7 +55,7 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 111 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 9e8737ef004e..e4705f335673 100644 +index 550f341daf99..478530b48cf1 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3814,6 +3814,15 @@ diff --git a/patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch b/patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch index 004af44..738be8f 100644 --- a/patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch +++ b/patches/kernel/0006-Revert-PCI-Coalesce-host-bridge-contiguous-apertures.patch @@ -15,8 +15,8 @@ Link: https://lore.kernel.org/r/20210709231529.GA3270116@roeck-us.net Signed-off-by: Fabian Grünbichler Signed-off-by: Thomas Lamprecht --- - drivers/pci/probe.c | 50 ++++----------------------------------------- - 1 file changed, 4 insertions(+), 46 deletions(-) + drivers/pci/probe.c | 52 +++++---------------------------------------- + 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 59ef93f1d953..b38a345c5df6 100644 @@ -92,13 +92,14 @@ index 59ef93f1d953..b38a345c5df6 100644 - /* Add initial resources to the bus */ resource_list_for_each_entry_safe(window, n, &resources) { -+ list_move_tail(&window->node, &bridge->windows); - offset = window->offset; - res = window->res; +- offset = window->offset; +- res = window->res; - if (!res->end) - 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) pci_bus_insert_busn_res(bus, bus->number, res->end); diff --git a/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch b/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch index b062b5a..198ab32 100644 --- a/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch +++ b/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch @@ -52,8 +52,8 @@ Signed-off-by: Kai-Heng Feng Signed-off-by: Fabian Grünbichler Signed-off-by: Thomas Lamprecht --- - drivers/pci/probe.c | 31 +++++++++++++++++++++++++++---- - 1 file changed, 27 insertions(+), 4 deletions(-) + drivers/pci/probe.c | 33 ++++++++++++++++++++++++++++----- + 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index b38a345c5df6..485167ca62a1 100644 @@ -100,13 +100,14 @@ index b38a345c5df6..485167ca62a1 100644 + /* Add initial resources to the bus */ resource_list_for_each_entry_safe(window, n, &resources) { -- list_move_tail(&window->node, &bridge->windows); - offset = window->offset; - res = window->res; ++ offset = window->offset; ++ res = window->res; + if (!res->end) + 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) pci_bus_insert_busn_res(bus, bus->number, res->end); diff --git a/patches/kernel/0008-io-wq-split-bounded-and-unbounded-work-into-separate.patch b/patches/kernel/0008-io-wq-split-bounded-and-unbounded-work-into-separate.patch index 2980c2a..2671f62 100644 --- a/patches/kernel/0008-io-wq-split-bounded-and-unbounded-work-into-separate.patch +++ b/patches/kernel/0008-io-wq-split-bounded-and-unbounded-work-into-separate.patch @@ -19,8 +19,8 @@ Signed-off-by: Jens Axboe Signed-off-by: Fabian Ebner Signed-off-by: Thomas Lamprecht --- - fs/io-wq.c | 158 +++++++++++++++++++++++------------------------------ - 1 file changed, 69 insertions(+), 89 deletions(-) + fs/io-wq.c | 160 +++++++++++++++++++++++------------------------------ + 1 file changed, 70 insertions(+), 90 deletions(-) diff --git a/fs/io-wq.c b/fs/io-wq.c index ba7aaf2b95d0..6710da3d4445 100644 @@ -35,7 +35,7 @@ index ba7aaf2b95d0..6710da3d4445 100644 }; /* -@@ -73,25 +73,24 @@ struct io_wqe_acct { +@@ -73,26 +73,25 @@ struct io_wqe_acct { unsigned max_workers; int index; atomic_t nr_running; @@ -58,14 +58,16 @@ index ba7aaf2b95d0..6710da3d4445 100644 - struct io_wq_work_list work_list; - unsigned flags; - } ____cacheline_aligned_in_smp; +- +- int node; + raw_spinlock_t lock; -+ struct io_wqe_acct acct[2]; - - int node; -- struct io_wqe_acct acct[2]; + struct io_wqe_acct acct[2]; ++ int node; ++ struct hlist_nulls_head free_list; struct list_head all_list; + @@ -196,11 +195,10 @@ static void io_worker_exit(struct io_worker *worker) do_exit(0); } diff --git a/patches/kernel/0012-KVM-VMX-prepare-sync_pir_to_irr-for-running-with-API.patch b/patches/kernel/0010-KVM-VMX-prepare-sync_pir_to_irr-for-running-with-API.patch similarity index 100% rename from patches/kernel/0012-KVM-VMX-prepare-sync_pir_to_irr-for-running-with-API.patch rename to patches/kernel/0010-KVM-VMX-prepare-sync_pir_to_irr-for-running-with-API.patch diff --git a/patches/kernel/0010-lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch b/patches/kernel/0010-lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch deleted file mode 100644 index 4c1755a..0000000 --- a/patches/kernel/0010-lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Mon, 21 Feb 2022 11:03:13 +0100 -Subject: [PATCH] lib/iov_iter: initialize "flags" in new pipe_buffer - -commit 9d2231c5d74e13b2a0546fee6737ee4446017903 upstream. - -The functions copy_page_to_iter_pipe() and push_pipe() can both -allocate a new pipe_buffer, but the "flags" member initializer is -missing. - -Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed") -To: Alexander Viro -To: linux-fsdevel@vger.kernel.org -To: linux-kernel@vger.kernel.org -Cc: stable@vger.kernel.org -Signed-off-by: Max Kellermann -Signed-off-by: Al Viro -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Thomas Lamprecht ---- - lib/iov_iter.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/iov_iter.c b/lib/iov_iter.c -index 9ffa7dc197be..fa5827e2e9a3 100644 ---- a/lib/iov_iter.c -+++ b/lib/iov_iter.c -@@ -449,6 +449,7 @@ static size_t copy_page_to_iter_pipe(struct page *page, size_t offset, size_t by - return 0; - - buf->ops = &page_cache_pipe_buf_ops; -+ buf->flags = 0; - get_page(page); - buf->page = page; - buf->offset = offset; -@@ -564,6 +565,7 @@ static size_t push_pipe(struct iov_iter *i, size_t size, - break; - - buf->ops = &default_pipe_buf_ops; -+ buf->flags = 0; - buf->page = page; - buf->offset = 0; - buf->len = min_t(ssize_t, left, PAGE_SIZE); diff --git a/patches/kernel/0011-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch b/patches/kernel/0011-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch deleted file mode 100644 index f16fa59..0000000 --- a/patches/kernel/0011-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht -Date: Mon, 7 Mar 2022 16:51:37 +0100 -Subject: [PATCH] Revert "PCI/MSI: Mask MSI-X vectors only on success" - -see https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1961968 - -This reverts commit a7265641d09de8a5eb3ae0ce25a7d14cc6a44da1. - -Signed-off-by: Thomas Lamprecht ---- - drivers/pci/msi.c | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c -index 155bd207b2e6..6166415faf2f 100644 ---- a/drivers/pci/msi.c -+++ b/drivers/pci/msi.c -@@ -821,6 +821,9 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries, - goto out_disable; - } - -+ /* Ensure that all table entries are masked. */ -+ msix_mask_all(base, tsize); -+ - ret = msix_setup_entries(dev, base, entries, nvec, affd); - if (ret) - goto out_disable; -@@ -843,16 +846,6 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries, - /* Set MSI-X enabled bits and unmask the function */ - pci_intx_for_msi(dev, 0); - dev->msix_enabled = 1; -- -- /* -- * Ensure that all table entries are masked to prevent -- * stale entries from firing in a crash kernel. -- * -- * Done late to deal with a broken Marvell NVME device -- * which takes the MSI-X mask bits into account even -- * when MSI-X is disabled, which prevents MSI delivery. -- */ -- msix_mask_all(base, tsize); - pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0); - - pcibios_free_irq(dev); diff --git a/submodules/ubuntu-impish b/submodules/ubuntu-impish index 7a8342b..168d123 160000 --- a/submodules/ubuntu-impish +++ b/submodules/ubuntu-impish @@ -1 +1 @@ -Subproject commit 7a8342bdd7f0073b5f334c8579239f496b1fbf0a +Subproject commit 168d1231d9f29e3331fa0bbed876ffdd148143b8