c/pve-kernel-lowlatency-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase patches on top of Ubuntu-4.15.0-67.76

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

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-10-23 19:29:18 +02:00
parent 3c1c73bb62
commit 82650658f2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/kernel/0008-KVM-Take-vcpu-mutex-outside-vcpu_load.patch
View File

@ -33,10 +33,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 files changed, 15 insertions(+), 28 deletions(-) 4 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 1d84e07c0370..c6b1c38b5c56 100644 index fc9aa19e86b4..d49b91b00502 100644
--- a/arch/x86/kvm/vmx.c --- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c
@@ -9999,10 +9999,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) @@ -10009,10 +10009,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu) static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu)
{ {
struct vcpu_vmx *vmx = to_vmx(vcpu); struct vcpu_vmx *vmx = to_vmx(vcpu);
@ -49,10 +49,10 @@ index 1d84e07c0370..c6b1c38b5c56 100644
free_nested(vmx); free_nested(vmx);
vcpu_put(vcpu); vcpu_put(vcpu);
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 e2396d841b26..83cd2c951c49 100644 index ddbd7578ae25..14b9870f3530 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
@@ -7981,17 +7981,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, @@ -8002,17 +8002,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
{ {
@ -72,7 +72,7 @@ index e2396d841b26..83cd2c951c49 100644
} }
void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
@@ -8001,13 +7997,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) @@ -8022,13 +8018,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
kvm_hv_vcpu_postcreate(vcpu); kvm_hv_vcpu_postcreate(vcpu);
@ -89,7 +89,7 @@ index e2396d841b26..83cd2c951c49 100644
if (!kvmclock_periodic_sync) if (!kvmclock_periodic_sync)
return; return;
@@ -8018,11 +8016,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) @@ -8039,11 +8037,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
{ {
@ -102,7 +102,7 @@ index e2396d841b26..83cd2c951c49 100644
kvm_mmu_unload(vcpu); kvm_mmu_unload(vcpu);
vcpu_put(vcpu); vcpu_put(vcpu);
@@ -8396,9 +8392,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) @@ -8417,9 +8413,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu) static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
{ {

6
patches/kernel/0009-kvm-x86-Don-t-modify-MSR_PLATFORM_INFO-on-vCPU-reset.patch
View File

@ -19,10 +19,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/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 83cd2c951c49..3118c1ed4642 100644 index 14b9870f3530..cc9ad1aa4790 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
@@ -7982,6 +7982,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, @@ -8003,6 +8003,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
{ {
vcpu->arch.arch_capabilities = kvm_get_arch_capabilities(); vcpu->arch.arch_capabilities = kvm_get_arch_capabilities();
@ -30,7 +30,7 @@ index 83cd2c951c49..3118c1ed4642 100644
kvm_vcpu_mtrr_init(vcpu); kvm_vcpu_mtrr_init(vcpu);
vcpu_load(vcpu); vcpu_load(vcpu);
kvm_vcpu_reset(vcpu, false); kvm_vcpu_reset(vcpu, false);
@@ -8083,7 +8084,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) @@ -8104,7 +8105,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
kvm_pmu_reset(vcpu); kvm_pmu_reset(vcpu);
vcpu->arch.smbase = 0x30000; vcpu->arch.smbase = 0x30000;