From: Christoffer Dall <christoffer.dall@linaro.org>
Date: Mon, 4 Dec 2017 21:35:32 +0100
Subject: KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_translate
Patch-mainline: v4.16-rc1
Git-commit: 1da5b61dac98360a7e50b1565f6d499c6fc8123a
References: jsc#SLE-4084
Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_translate().
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Liang Yan <lyan@suse.com>
---
arch/powerpc/kvm/booke.c | 2 ++
arch/x86/kvm/x86.c | 3 +++
virt/kvm/kvm_main.c | 2 --
3 files changed, 5 insertions(+), 2 deletions(-)
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -1792,7 +1792,9 @@ int kvm_arch_vcpu_ioctl_translate(struct
{
int r;
+ vcpu_load(vcpu);
r = kvmppc_core_vcpu_translate(vcpu, tr);
+ vcpu_put(vcpu);
return r;
}
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7713,6 +7713,8 @@ int kvm_arch_vcpu_ioctl_translate(struct
gpa_t gpa;
int idx;
+ vcpu_load(vcpu);
+
idx = srcu_read_lock(&vcpu->kvm->srcu);
gpa = kvm_mmu_gva_to_gpa_system(vcpu, vaddr, NULL);
srcu_read_unlock(&vcpu->kvm->srcu, idx);
@@ -7721,6 +7723,7 @@ int kvm_arch_vcpu_ioctl_translate(struct
tr->writeable = 1;
tr->usermode = 0;
+ vcpu_put(vcpu);
return 0;
}
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2700,9 +2700,7 @@ out_free1:
r = -EFAULT;
if (copy_from_user(&tr, argp, sizeof(tr)))
goto out;
- vcpu_load(vcpu);
r = kvm_arch_vcpu_ioctl_translate(vcpu, &tr);
- vcpu_put(vcpu);
if (r)
goto out;
r = -EFAULT;