[PATCH 10/15] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_translate
From: Christoffer Dall <hidden>
Date: 2017-11-25 20:57:13
Also in:
kvm, kvmarm, linux-mips, linux-s390
Subsystem:
kernel virtual machine (kvm), kernel virtual machine for powerpc (kvm/powerpc), kernel virtual machine for x86 (kvm/x86), linux for powerpc (32-bit and 64-bit), the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Paolo Bonzini, Madhavan Srinivasan, Sean Christopherson, Michael Ellerman, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Move vcpu_load() and vcpu_put() into the architecture specific implementations of kvm_arch_vcpu_ioctl_translate(). Signed-off-by: Christoffer Dall <redacted> --- arch/powerpc/kvm/booke.c | 4 ++++ arch/x86/kvm/x86.c | 6 ++++++ virt/kvm/kvm_main.c | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 59d1d0bd6909..8069d93bf654 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c@@ -1804,7 +1804,11 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, { int r; + r = vcpu_load(vcpu); + if (r) + return r; r = kvmppc_core_vcpu_translate(vcpu, tr); + vcpu_put(vcpu); return r; }
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 1a4fa1f2fa46..ae8685155d11 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c@@ -7654,6 +7654,11 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, unsigned long vaddr = tr->linear_address; gpa_t gpa; int idx; + int r; + + r = vcpu_load(vcpu); + if (r) + return r; idx = srcu_read_lock(&vcpu->kvm->srcu); gpa = kvm_mmu_gva_to_gpa_system(vcpu, vaddr, NULL);
@@ -7663,6 +7668,7 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, tr->writeable = 1; tr->usermode = 0; + vcpu_put(vcpu); return 0; }
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index bcfdb4800e44..173f98d9c58d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c@@ -2635,11 +2635,7 @@ static long kvm_vcpu_ioctl(struct file *filp, r = -EFAULT; if (copy_from_user(&tr, argp, sizeof(tr))) goto out; - r = vcpu_load(vcpu); - if (r) - goto out; r = kvm_arch_vcpu_ioctl_translate(vcpu, &tr); - vcpu_put(vcpu); if (r) goto out; r = -EFAULT;
--
2.14.2