From a71094c33b31dc7a2bc3d5dfd55fc0160082ca44 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 11 May 2022 08:40:21 +0200 Subject: [PATCH] sys-kernel/coreos-sources: remove Xen-PCI-revert patch There was a kernel regression on Xen HVM with regard to MSI interrupts that affected certain AWS instances (m4 and similar). We reverted the patch that broke networking, but in the meantime upstream found the actual cause and provided a proper fix which is part of 5.15.38. Remove the obsolete patch. Link: https://lore.kernel.org/all/20220504153056.686401990@linuxfoundation.org/ --- .../coreos-sources-5.15.38.ebuild | 3 +- ...Propagate-VMbus-coherence-to-each-V.patch} | 0 ...I-Mask-MSI-X-vectors-only-on-success.patch | 49 ------------------- 3 files changed, 1 insertion(+), 51 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/{z0006-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch => z0005-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch} (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.38.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.38.ebuild index 421b7fb651..dc919028a5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.38.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.15.38.ebuild @@ -39,6 +39,5 @@ UNIPATCH_LIST=" ${PATCH_DIR}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch \ ${PATCH_DIR}/z0003-PCI-hv-Make-the-code-arch-neutral-by-adding-arch-spe.patch \ ${PATCH_DIR}/z0004-PCI-hv-Add-arm64-Hyper-V-vPCI-support.patch \ - ${PATCH_DIR}/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch \ - ${PATCH_DIR}/z0006-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch \ + ${PATCH_DIR}/z0005-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch \ " diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0006-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Drivers-hv-vmbus-Propagate-VMbus-coherence-to-each-V.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch deleted file mode 100644 index fb67680df8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.15/z0005-Revert-PCI-MSI-Mask-MSI-X-vectors-only-on-success.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e437ea6e5261a12423e55b30bff89df972a47317 Mon Sep 17 00:00:00 2001 -From: Jeremi Piotrowski -Date: Tue, 15 Mar 2022 10:46:47 +0000 -Subject: [PATCH] Revert "PCI/MSI: Mask MSI-X vectors only on success" - -With the original commit m4 instances on AWS, which use Intel 82559 VFs for -networking, are not able to perform any networking (not even DHCP). - -More context: https://lore.kernel.org/lkml/c4a65b9a-d1e2-bf0d-2519-aac7185931d5@redhat.com/ - -This reverts commit d8888cdabedf353ab9b5a6af75f70bf341a3e7df. ---- - 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 cc4c2b8a5efd..96132d68be1e 100644 ---- a/drivers/pci/msi.c -+++ b/drivers/pci/msi.c -@@ -721,6 +721,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; -@@ -747,16 +750,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); --- -2.32.0 -