From c52b38d4c12af3da0a79d4313a60884de99a3c4c Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 18 May 2020 14:04:32 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-4.15.0-102.103 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...ides-for-missing-ACS-capabilities-4..patch | 6 ++--- ...-default-dynamic-halt-polling-growth.patch | 2 +- ...se-extent-block-in-dealloc-without-m.patch | 2 +- ...VM-Take-vcpu-mutex-outside-vcpu_load.patch | 22 +++++++++---------- ...dify-MSR_PLATFORM_INFO-on-vCPU-reset.patch | 6 ++--- 5 files changed, 19 insertions(+), 19 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 df3d564..c8efc74 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 @@ -75,10 +75,10 @@ index 325a5dd7813d..a95cc0b61b29 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 3eaf701858d5..73b2f18ec7e6 100644 +index e5d1a00c481d..7ecd84506d8d 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -3703,6 +3703,106 @@ static int __init pci_apply_final_quirks(void) +@@ -3769,6 +3769,106 @@ static int __init pci_apply_final_quirks(void) fs_initcall_sync(pci_apply_final_quirks); @@ -185,7 +185,7 @@ index 3eaf701858d5..73b2f18ec7e6 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 -@@ -4598,6 +4698,7 @@ static const struct pci_dev_acs_enabled { +@@ -4664,6 +4764,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 2533586..1f06f2a 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 4d07488909ed..feea11b227a2 100644 +index 706b13f0c698..c6749d154ebc 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/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch b/patches/kernel/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch index 0a7a0f3..f737707 100644 --- a/patches/kernel/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch +++ b/patches/kernel/0006-ocfs2-try-to-reuse-extent-block-in-dealloc-without-m.patch @@ -73,7 +73,7 @@ Signed-off-by: Thomas Lamprecht 3 files changed, 203 insertions(+), 10 deletions(-) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c -index ab5105f9767e..2f2c76193f54 100644 +index 6b177de324c0..3760888f2e76 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -165,6 +165,13 @@ static int ocfs2_dinode_insert_check(struct ocfs2_extent_tree *et, 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 58e6599..1c327d8 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 @@ -33,10 +33,10 @@ Signed-off-by: Thomas Lamprecht 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index 9f4b2e852be0..cb6bb8893239 100644 +index 6875c8d13052..5dc2144a0991 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c -@@ -10039,10 +10039,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) +@@ -10017,10 +10017,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,10 +49,10 @@ index 9f4b2e852be0..cb6bb8893239 100644 free_nested(vmx); vcpu_put(vcpu); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 76e7c2c70e55..7e8f9f6bd370 100644 +index 960b14ba645e..6b1e434ceaf8 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, +@@ -8061,17 +8061,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) { @@ -72,7 +72,7 @@ index 76e7c2c70e55..7e8f9f6bd370 100644 } void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) -@@ -8078,13 +8074,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) +@@ -8081,13 +8077,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) kvm_hv_vcpu_postcreate(vcpu); @@ -89,7 +89,7 @@ index 76e7c2c70e55..7e8f9f6bd370 100644 if (!kvmclock_periodic_sync) return; -@@ -8471,9 +8469,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm) +@@ -8474,9 +8472,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm) static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu) { @@ -101,10 +101,10 @@ index 76e7c2c70e55..7e8f9f6bd370 100644 vcpu_put(vcpu); } diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h -index 254fcf4afc4d..10f4eca3e18b 100644 +index f182bbfb0ac5..f8b7ac63219d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h -@@ -534,7 +534,7 @@ static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu) +@@ -560,7 +560,7 @@ static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu) int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id); void kvm_vcpu_uninit(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 feea11b227a2..063b84f6cce6 100644 +index c6749d154ebc..66998264619b 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) @@ -145,7 +145,7 @@ index feea11b227a2..063b84f6cce6 100644 } EXPORT_SYMBOL_GPL(vcpu_put); -@@ -2639,9 +2633,9 @@ static long kvm_vcpu_ioctl(struct file *filp, +@@ -2786,9 +2780,9 @@ static long kvm_vcpu_ioctl(struct file *filp, #endif @@ -158,7 +158,7 @@ index feea11b227a2..063b84f6cce6 100644 switch (ioctl) { case KVM_RUN: { struct pid *oldpid; -@@ -2814,6 +2808,7 @@ static long kvm_vcpu_ioctl(struct file *filp, +@@ -2961,6 +2955,7 @@ static long kvm_vcpu_ioctl(struct file *filp, } out: vcpu_put(vcpu); 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 aa43fe2..b1c8c85 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,10 +19,10 @@ 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 7e8f9f6bd370..e5e20658220f 100644 +index 6b1e434ceaf8..93bc3504d39e 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, +@@ -8062,6 +8062,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) { vcpu->arch.arch_capabilities = kvm_get_arch_capabilities(); @@ -30,7 +30,7 @@ index 7e8f9f6bd370..e5e20658220f 100644 kvm_vcpu_mtrr_init(vcpu); vcpu_load(vcpu); kvm_vcpu_reset(vcpu, false); -@@ -8154,7 +8155,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) +@@ -8157,7 +8158,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) kvm_pmu_reset(vcpu); vcpu->arch.smbase = 0x30000;