rebase patches on top of Ubuntu-5.0.0-35.38
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
7b833ea615
commit
b9b2d45ed0
@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||||||
2 files changed, 111 insertions(+)
|
2 files changed, 111 insertions(+)
|
||||||
|
|
||||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
||||||
index 3dda6833f586..241de26a2f17 100644
|
index 988d3f3ad29d..cd1a1bddb997 100644
|
||||||
--- a/Documentation/admin-guide/kernel-parameters.txt
|
--- a/Documentation/admin-guide/kernel-parameters.txt
|
||||||
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
||||||
@@ -3287,6 +3287,15 @@
|
@@ -3312,6 +3312,15 @@
|
||||||
Also, it enforces the PCI Local Bus spec
|
Also, it enforces the PCI Local Bus spec
|
||||||
rule that those bits should be 0 in system reset
|
rule that those bits should be 0 in system reset
|
||||||
events (useful for kexec/kdump cases).
|
events (useful for kexec/kdump cases).
|
||||||
|
@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
||||||
index f48f911d4663..5d906fc47e98 100644
|
index 6f50cf5b9ef5..a3d541f23204 100644
|
||||||
--- a/virt/kvm/kvm_main.c
|
--- a/virt/kvm/kvm_main.c
|
||||||
+++ b/virt/kvm/kvm_main.c
|
+++ b/virt/kvm/kvm_main.c
|
||||||
@@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644);
|
@@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644);
|
||||||
EXPORT_SYMBOL_GPL(halt_poll_ns);
|
EXPORT_SYMBOL_GPL(halt_poll_ns);
|
||||||
|
|
||||||
/* Default doubles per-vcpu halt_poll_ns. */
|
/* Default doubles per-vcpu halt_poll_ns. */
|
||||||
|
@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
||||||
index 87e476f7ef15..d27b75c41982 100644
|
index 2bb8fa904b9f..835edf9b2954 100644
|
||||||
--- a/arch/x86/kvm/vmx/vmx.c
|
--- a/arch/x86/kvm/vmx/vmx.c
|
||||||
+++ b/arch/x86/kvm/vmx/vmx.c
|
+++ b/arch/x86/kvm/vmx/vmx.c
|
||||||
@@ -106,7 +106,7 @@ module_param(enable_apicv, bool, S_IRUGO);
|
@@ -106,7 +106,7 @@ module_param(enable_apicv, bool, S_IRUGO);
|
||||||
|
@ -33,10 +33,10 @@ index d7c52e748966..7bb5801b5e11 100644
|
|||||||
*entry_failure_code = ENTRY_FAIL_PDPTE;
|
*entry_failure_code = ENTRY_FAIL_PDPTE;
|
||||||
return 1;
|
return 1;
|
||||||
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
||||||
index d27b75c41982..923d0f1b7a05 100644
|
index 835edf9b2954..86c5ab3728ac 100644
|
||||||
--- a/arch/x86/kvm/vmx/vmx.c
|
--- a/arch/x86/kvm/vmx/vmx.c
|
||||||
+++ b/arch/x86/kvm/vmx/vmx.c
|
+++ b/arch/x86/kvm/vmx/vmx.c
|
||||||
@@ -2737,7 +2737,7 @@ static void ept_load_pdptrs(struct kvm_vcpu *vcpu)
|
@@ -2729,7 +2729,7 @@ static void ept_load_pdptrs(struct kvm_vcpu *vcpu)
|
||||||
(unsigned long *)&vcpu->arch.regs_dirty))
|
(unsigned long *)&vcpu->arch.regs_dirty))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ index d27b75c41982..923d0f1b7a05 100644
|
|||||||
vmcs_write64(GUEST_PDPTR0, mmu->pdptrs[0]);
|
vmcs_write64(GUEST_PDPTR0, mmu->pdptrs[0]);
|
||||||
vmcs_write64(GUEST_PDPTR1, mmu->pdptrs[1]);
|
vmcs_write64(GUEST_PDPTR1, mmu->pdptrs[1]);
|
||||||
vmcs_write64(GUEST_PDPTR2, mmu->pdptrs[2]);
|
vmcs_write64(GUEST_PDPTR2, mmu->pdptrs[2]);
|
||||||
@@ -2749,7 +2749,7 @@ void ept_save_pdptrs(struct kvm_vcpu *vcpu)
|
@@ -2741,7 +2741,7 @@ void ept_save_pdptrs(struct kvm_vcpu *vcpu)
|
||||||
{
|
{
|
||||||
struct kvm_mmu *mmu = vcpu->arch.walk_mmu;
|
struct kvm_mmu *mmu = vcpu->arch.walk_mmu;
|
||||||
|
|
||||||
@ -55,10 +55,10 @@ index d27b75c41982..923d0f1b7a05 100644
|
|||||||
mmu->pdptrs[1] = vmcs_read64(GUEST_PDPTR1);
|
mmu->pdptrs[1] = vmcs_read64(GUEST_PDPTR1);
|
||||||
mmu->pdptrs[2] = vmcs_read64(GUEST_PDPTR2);
|
mmu->pdptrs[2] = vmcs_read64(GUEST_PDPTR2);
|
||||||
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
||||||
index f832fa5011cd..5d2a2ca5b60d 100644
|
index eed14def2a6b..c69f12af5c01 100644
|
||||||
--- a/arch/x86/kvm/x86.c
|
--- a/arch/x86/kvm/x86.c
|
||||||
+++ b/arch/x86/kvm/x86.c
|
+++ b/arch/x86/kvm/x86.c
|
||||||
@@ -724,7 +724,7 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu)
|
@@ -725,7 +725,7 @@ bool pdptrs_changed(struct kvm_vcpu *vcpu)
|
||||||
gfn_t gfn;
|
gfn_t gfn;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ index f832fa5011cd..5d2a2ca5b60d 100644
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (!test_bit(VCPU_EXREG_PDPTR,
|
if (!test_bit(VCPU_EXREG_PDPTR,
|
||||||
@@ -967,8 +967,8 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
|
@@ -968,8 +968,8 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
|
||||||
if (is_long_mode(vcpu) &&
|
if (is_long_mode(vcpu) &&
|
||||||
(cr3 & rsvd_bits(cpuid_maxphyaddr(vcpu), 63)))
|
(cr3 & rsvd_bits(cpuid_maxphyaddr(vcpu), 63)))
|
||||||
return 1;
|
return 1;
|
||||||
@ -78,7 +78,7 @@ index f832fa5011cd..5d2a2ca5b60d 100644
|
|||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
kvm_mmu_new_cr3(vcpu, cr3, skip_tlb_flush);
|
kvm_mmu_new_cr3(vcpu, cr3, skip_tlb_flush);
|
||||||
@@ -8554,7 +8554,7 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
|
@@ -8590,7 +8590,7 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
|
||||||
kvm_update_cpuid(vcpu);
|
kvm_update_cpuid(vcpu);
|
||||||
|
|
||||||
idx = srcu_read_lock(&vcpu->kvm->srcu);
|
idx = srcu_read_lock(&vcpu->kvm->srcu);
|
||||||
|
Loading…
Reference in New Issue
Block a user