rebase patches on top of Ubuntu-4.15.0-73.82

(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

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 7674085537d1f346c5366615ee696b057e2bf919..59173b7dddc2a1ac3c4ae6eef638bf2af02a69cd 100644 (file)
--- 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 <t.lamprecht@proxmox.com>
  2 files changed, 110 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 144c46d28f88..3597591d4c0a 100644
+index 0c517aab6b2f..58ec5cfc71ce 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3163,6 +3163,15 @@
+@@ -3165,6 +3165,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).

diff --git a/patches/kernel/0005-ocfs2-make-metadata-estimation-accurate-and-clear.patch b/patches/kernel/0005-ocfs2-make-metadata-estimation-accurate-and-clear.patch
index 4a6a1c348fccbb34921c128943ce8cca2f747d45..27881a9d57b6af1bcdf8e1336cd1dbe21364565a 100644 (file)
--- a/patches/kernel/0005-ocfs2-make-metadata-estimation-accurate-and-clear.patch
+++ b/patches/kernel/0005-ocfs2-make-metadata-estimation-accurate-and-clear.patch
@@ -29,7 +29,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
-index 99550f4bd159..ef8f00a30d62 100644
+index 7de0c9562b70..209cec7efef4 100644
 --- a/fs/ocfs2/aops.c
 +++ b/fs/ocfs2/aops.c
 @@ -797,6 +797,7 @@ struct ocfs2_write_ctxt {
@@ -48,7 +48,7 @@ index 99550f4bd159..ef8f00a30d62 100644
        new = NULL;
  unlock:
        spin_unlock(&oi->ip_lock);
-@@ -2256,7 +2258,7 @@ static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock,
+@@ -2277,7 +2279,7 @@ static int ocfs2_dio_wr_get_block(struct inode *inode, sector_t iblock,
                ue->ue_phys = desc->c_phys;
  
                list_splice_tail_init(&wc->w_unwritten_list, &dwc->dw_zero_list);

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 443dc737502e1448b031e026195b2320e05a5ae6..0a7a0f33c3100a504d7b39de5a2259737e54fb70 100644 (file)
--- 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
@@ -350,10 +350,10 @@ index 27b75cf32cfa..250bcacdf9e9 100644
  
  /*
 diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
-index ef8f00a30d62..cab26aa30f63 100644
+index 209cec7efef4..1cf7ac84b70b 100644
 --- a/fs/ocfs2/aops.c
 +++ b/fs/ocfs2/aops.c
-@@ -2332,6 +2332,12 @@ static int ocfs2_dio_end_io_write(struct inode *inode,
+@@ -2353,6 +2353,12 @@ static int ocfs2_dio_end_io_write(struct inode *inode,
  
        ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);
  

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 dc49149b1baf64835357fab5228967d56d2640fc..4c0d63f0b9e92cc7d5b71810c298a4caecb1b91e 100644 (file)
--- 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 <t.lamprecht@proxmox.com>
  4 files changed, 15 insertions(+), 28 deletions(-)
 
 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index fdd8d2451a6d..69c8ea5dd428 100644
+index fbaae82d3025..521f8d0632fb 100644
 --- a/arch/x86/kvm/vmx.c
 +++ b/arch/x86/kvm/vmx.c
-@@ -10001,10 +10001,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
+@@ -10015,10 +10015,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 fdd8d2451a6d..69c8ea5dd428 100644
         free_nested(vmx);
         vcpu_put(vcpu);
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 81eddf386cd3..92dd28e8550e 100644
+index 012bfad459ed..e42319badda3 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -8038,17 +8038,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
+@@ -8037,17 +8037,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 81eddf386cd3..92dd28e8550e 100644
  }
  
  void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
-@@ -8058,13 +8054,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
+@@ -8057,13 +8053,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
  
        kvm_hv_vcpu_postcreate(vcpu);
  
@@ -89,7 +89,7 @@ index 81eddf386cd3..92dd28e8550e 100644
  
        if (!kvmclock_periodic_sync)
                return;
-@@ -8075,11 +8073,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
+@@ -8074,11 +8072,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
  
  void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
  {
@@ -102,7 +102,7 @@ index 81eddf386cd3..92dd28e8550e 100644
        kvm_mmu_unload(vcpu);
        vcpu_put(vcpu);
  
-@@ -8459,9 +8455,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm)
+@@ -8458,9 +8454,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm)
  
  static void kvm_unload_vcpu_mmu(struct kvm_vcpu *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 7d6e64b7994490a204854b00206c59e985239b8f..0f80906bc2673a1b7f5abc216f407198bc7a65d0 100644 (file)
--- 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 <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 92dd28e8550e..157e28dbd0ed 100644
+index e42319badda3..4292026a10aa 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -8039,6 +8039,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
+@@ -8038,6 +8038,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 92dd28e8550e..157e28dbd0ed 100644
        kvm_vcpu_mtrr_init(vcpu);
        vcpu_load(vcpu);
        kvm_vcpu_reset(vcpu, false);
-@@ -8140,7 +8141,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
+@@ -8139,7 +8140,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
                kvm_pmu_reset(vcpu);
                vcpu->arch.smbase = 0x30000;
  

diff --git a/patches/kernel/0011-Revert-KVM-x86-Manually-calculate-reserved-bits-when.patch b/patches/kernel/0011-Revert-KVM-x86-Manually-calculate-reserved-bits-when.patch
deleted file mode 100644 (file)
index 006bc63..0000000
--- a/patches/kernel/0011-Revert-KVM-x86-Manually-calculate-reserved-bits-when.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Mon, 11 Nov 2019 15:22:38 +0100
-Subject: [PATCH] Revert "KVM: x86: Manually calculate reserved bits when
- loading PDPTRS"
-
-breaks Linux guest if the host uses very old Intel CPUs
-
-This reverts commit c5d574d63996442c80e886c60278a790230f4d2b.
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- arch/x86/kvm/x86.c | 11 +++--------
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 157e28dbd0ed..f7cd415fe37e 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -567,14 +567,8 @@ static int kvm_read_nested_guest_page(struct kvm_vcpu *vcpu, gfn_t gfn,
-                                      data, offset, len, access);
- }
- 
--static inline u64 pdptr_rsvd_bits(struct kvm_vcpu *vcpu)
--{
--      return rsvd_bits(cpuid_maxphyaddr(vcpu), 63) | rsvd_bits(5, 8) |
--             rsvd_bits(1, 2);
--}
--
- /*
-- * Load the pae pdptrs.  Return 1 if they are all valid, 0 otherwise.
-+ * Load the pae pdptrs.  Return true is they are all valid.
-  */
- int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3)
- {
-@@ -593,7 +587,8 @@ int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3)
-       }
-       for (i = 0; i < ARRAY_SIZE(pdpte); ++i) {
-               if ((pdpte[i] & PT_PRESENT_MASK) &&
--                  (pdpte[i] & pdptr_rsvd_bits(vcpu))) {
-+                  (pdpte[i] &
-+                   vcpu->arch.mmu.guest_rsvd_check.rsvd_bits_mask[0][2])) {
-                       ret = 0;
-                       goto out;
-               }