From 383cc4b935deaaa1fe914926546796a1795813f0 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 8 Apr 2020 19:42:21 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-4.15.0-97.98 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...overrides-for-missing-ACS-capabilities-4..patch | 10 +++++----- ...sable-default-dynamic-halt-polling-growth.patch | 2 +- ...008-KVM-Take-vcpu-mutex-outside-vcpu_load.patch | 14 +++++++------- ...-t-modify-MSR_PLATFORM_INFO-on-vCPU-reset.patch | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) 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 907eca3..df3d564 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,10 +55,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 110 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index d824cfb1a1a5..d0489ece2203 100644 +index 325a5dd7813d..a95cc0b61b29 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3177,6 +3177,15 @@ +@@ -3181,6 +3181,15 @@ Also, it enforces the PCI Local Bus spec rule that those bits should be 0 in system reset events (useful for kexec/kdump cases). @@ -75,10 +75,10 @@ index d824cfb1a1a5..d0489ece2203 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 4a03b7832fe3..93038d76bf14 100644 +index 3eaf701858d5..73b2f18ec7e6 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -3724,6 +3724,106 @@ static int __init pci_apply_final_quirks(void) +@@ -3703,6 +3703,106 @@ static int __init pci_apply_final_quirks(void) fs_initcall_sync(pci_apply_final_quirks); @@ -185,7 +185,7 @@ index 4a03b7832fe3..93038d76bf14 100644 /* * Following are device-specific reset methods which can be used to * reset a single function if other methods (e.g. FLR, PM D0->D3) are -@@ -4619,6 +4719,7 @@ static const struct pci_dev_acs_enabled { +@@ -4598,6 +4698,7 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs }, /* APM X-Gene */ { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, diff --git a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch index 69f48c6..2533586 100644 --- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/patches/kernel/0004-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 3c54b2e1b59c..5e2dbd2500fa 100644 +index 4d07488909ed..feea11b227a2 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/patches/kernel/0008-KVM-Take-vcpu-mutex-outside-vcpu_load.patch b/patches/kernel/0008-KVM-Take-vcpu-mutex-outside-vcpu_load.patch index afd18d8..58e6599 100644 --- a/patches/kernel/0008-KVM-Take-vcpu-mutex-outside-vcpu_load.patch +++ b/patches/kernel/0008-KVM-Take-vcpu-mutex-outside-vcpu_load.patch @@ -27,16 +27,16 @@ Signed-off-by: Paolo Bonzini Signed-off-by: Thomas Lamprecht --- arch/x86/kvm/vmx.c | 4 +--- - arch/x86/kvm/x86.c | 20 +++++++------------- + arch/x86/kvm/x86.c | 16 ++++++---------- include/linux/kvm_host.h | 2 +- virt/kvm/kvm_main.c | 17 ++++++----------- - 4 files changed, 15 insertions(+), 28 deletions(-) + 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index 7bc1430c6cee..748e90c9b5c6 100644 +index 9f4b2e852be0..cb6bb8893239 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c -@@ -10031,10 +10031,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) +@@ -10039,10 +10039,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx = to_vmx(vcpu); @@ -49,7 +49,7 @@ index 7bc1430c6cee..748e90c9b5c6 100644 free_nested(vmx); vcpu_put(vcpu); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 63edcfe5b5a4..971443af5b95 100644 +index 76e7c2c70e55..7e8f9f6bd370 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8058,17 +8058,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, @@ -89,7 +89,7 @@ index 63edcfe5b5a4..971443af5b95 100644 if (!kvmclock_periodic_sync) return; -@@ -8479,9 +8475,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm) +@@ -8471,9 +8469,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm) static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu) { @@ -114,7 +114,7 @@ index 254fcf4afc4d..10f4eca3e18b 100644 #ifdef __KVM_HAVE_IOAPIC diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 5e2dbd2500fa..ffac15e6dfe0 100644 +index feea11b227a2..063b84f6cce6 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -172,17 +172,12 @@ bool kvm_is_reserved_pfn(kvm_pfn_t pfn) diff --git a/patches/kernel/0009-kvm-x86-Don-t-modify-MSR_PLATFORM_INFO-on-vCPU-reset.patch b/patches/kernel/0009-kvm-x86-Don-t-modify-MSR_PLATFORM_INFO-on-vCPU-reset.patch index 9ab2e8f..aa43fe2 100644 --- a/patches/kernel/0009-kvm-x86-Don-t-modify-MSR_PLATFORM_INFO-on-vCPU-reset.patch +++ b/patches/kernel/0009-kvm-x86-Don-t-modify-MSR_PLATFORM_INFO-on-vCPU-reset.patch @@ -19,7 +19,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 971443af5b95..8083fa803a72 100644 +index 7e8f9f6bd370..e5e20658220f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8059,6 +8059,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, @@ -30,7 +30,7 @@ index 971443af5b95..8083fa803a72 100644 kvm_vcpu_mtrr_init(vcpu); vcpu_load(vcpu); kvm_vcpu_reset(vcpu, false); -@@ -8160,7 +8161,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) +@@ -8154,7 +8155,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) kvm_pmu_reset(vcpu); vcpu->arch.smbase = 0x30000;