From af0b394907445c0ef1d3b1f1801b37057d1ffd2c Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 14 Mar 2023 18:07:40 +0100 Subject: [PATCH] update to Ubuntu-6.2.0-17.17 Signed-off-by: Thomas Lamprecht --- ...ides-for-missing-ACS-capabilities-4..patch | 4 +- ...-default-dynamic-halt-polling-growth.patch | 2 +- ...de-unregister_netdevice-refcount-lea.patch | 4 +- ...w-multiple-bios-for-IOCB_NOWAIT-issu.patch | 70 ------------------- submodules/ubuntu-kernel | 2 +- 5 files changed, 6 insertions(+), 76 deletions(-) delete mode 100644 patches/kernel/0009-block-don-t-allow-multiple-bios-for-IOCB_NOWAIT-issu.patch diff --git a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 09702da..87cd3f1 100644 --- a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -75,7 +75,7 @@ index 2e77ecc12692..eae6fdc4c683 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index db9ec6b90839..8cd5aaddc7fd 100644 +index 267e6002e29f..fac76ca1d16a 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void) @@ -185,7 +185,7 @@ index db9ec6b90839..8cd5aaddc7fd 100644 /* * 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 -@@ -4939,6 +5039,8 @@ static const struct pci_dev_acs_enabled { +@@ -4959,6 +5059,8 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs }, /* APM X-Gene */ { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, diff --git a/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch index e464fae..24f7586 100644 --- a/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/patches/kernel/0005-kvm-disable-default-dynamic-halt-polling-growth.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 9c60384b5ae0..725d08bf89de 100644 +index 07aae60288f9..949b7204cf52 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -79,7 +79,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch index 898503f..fe6f40a 100644 --- a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -14,10 +14,10 @@ Signed-off-by: Fabian Grünbichler 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index f23e287602b7..73566e165640 100644 +index fce980d531bd..5079a3851798 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10255,7 +10255,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) +@@ -10257,7 +10257,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) if (time_after(jiffies, warning_time + READ_ONCE(netdev_unregister_timeout_secs) * HZ)) { list_for_each_entry(dev, list, todo_list) { diff --git a/patches/kernel/0009-block-don-t-allow-multiple-bios-for-IOCB_NOWAIT-issu.patch b/patches/kernel/0009-block-don-t-allow-multiple-bios-for-IOCB_NOWAIT-issu.patch deleted file mode 100644 index 6c67fb9..0000000 --- a/patches/kernel/0009-block-don-t-allow-multiple-bios-for-IOCB_NOWAIT-issu.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Mon, 16 Jan 2023 08:55:53 -0700 -Subject: [PATCH] block: don't allow multiple bios for IOCB_NOWAIT issue - -If we're doing a large IO request which needs to be split into multiple -bios for issue, then we can run into the same situation as the below -marked commit fixes - parts will complete just fine, one or more parts -will fail to allocate a request. This will result in a partially -completed read or write request, where the caller gets EAGAIN even though -parts of the IO completed just fine. - -Do the same for large bios as we do for splits - fail a NOWAIT request -with EAGAIN. This isn't technically fixing an issue in the below marked -patch, but for stable purposes, we should have either none of them or -both. - -This depends on: 613b14884b85 ("block: handle bio_split_to_limits() NULL return") - -Cc: stable@vger.kernel.org # 5.15+ -Fixes: 9cea62b2cbab ("block: don't allow splitting of a REQ_NOWAIT bio") -Link: https://github.com/axboe/liburing/issues/766 -Reported-and-tested-by: Michael Kelley -Signed-off-by: Jens Axboe -(commit 67d59247d4b52c917e373f05a807027756ab216f upstream) -Signed-off-by: Fiona Ebner -Signed-off-by: Thomas Lamprecht ---- - block/fops.c | 21 ++++++++++++++++++--- - 1 file changed, 18 insertions(+), 3 deletions(-) - -diff --git a/block/fops.c b/block/fops.c -index 50d245e8c913..d2e6be4e3d1c 100644 ---- a/block/fops.c -+++ b/block/fops.c -@@ -221,6 +221,24 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, - bio_endio(bio); - break; - } -+ if (iocb->ki_flags & IOCB_NOWAIT) { -+ /* -+ * This is nonblocking IO, and we need to allocate -+ * another bio if we have data left to map. As we -+ * cannot guarantee that one of the sub bios will not -+ * fail getting issued FOR NOWAIT and as error results -+ * are coalesced across all of them, be safe and ask for -+ * a retry of this from blocking context. -+ */ -+ if (unlikely(iov_iter_count(iter))) { -+ bio_release_pages(bio, false); -+ bio_clear_flag(bio, BIO_REFFED); -+ bio_put(bio); -+ blk_finish_plug(&plug); -+ return -EAGAIN; -+ } -+ bio->bi_opf |= REQ_NOWAIT; -+ } - - if (is_read) { - if (dio->flags & DIO_SHOULD_DIRTY) -@@ -228,9 +246,6 @@ static ssize_t __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, - } else { - task_io_account_write(bio->bi_iter.bi_size); - } -- if (iocb->ki_flags & IOCB_NOWAIT) -- bio->bi_opf |= REQ_NOWAIT; -- - dio->size += bio->bi_iter.bi_size; - pos += bio->bi_iter.bi_size; - diff --git a/submodules/ubuntu-kernel b/submodules/ubuntu-kernel index 50a7046..e3be6fa 160000 --- a/submodules/ubuntu-kernel +++ b/submodules/ubuntu-kernel @@ -1 +1 @@ -Subproject commit 50a70463593be2729ee123334548ada1000ed7d2 +Subproject commit e3be6fa29eb28c17aa143a81ecf5ae00b7b3e610