Re: [PATCH v2 13/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_fpu

2017-11-29 Thread David Hildenbrand 
On 29.11.2017 17:41, Christoffer Dall wrote:
> Move vcpu_load() and vcpu_put() into the architecture specific
> implementations of kvm_arch_vcpu_ioctl_set_fpu().
> 
> Signed-off-by: Christoffer Dall 
> ---
>  arch/s390/kvm/kvm-s390.c | 15 ---
>  arch/x86/kvm/x86.c   |  8 ++--
>  virt/kvm/kvm_main.c  |  2 --
>  3 files changed, 18 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index 88dcb89..43278f3 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -2752,15 +2752,24 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu 
> *vcpu,
>  
>  int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
>  {
> - if (test_fp_ctl(fpu->fpc))
> - return -EINVAL;
> + int ret = 0;
> +
> + vcpu_load(vcpu);
> +
> + if (test_fp_ctl(fpu->fpc)) {
> + ret = -EINVAL;
> + goto out;
> + }
>   vcpu->run->s.regs.fpc = fpu->fpc;
>   if (MACHINE_HAS_VX)
>   convert_fp_to_vx((__vector128 *) vcpu->run->s.regs.vrs,
>(freg_t *) fpu->fprs);
>   else
>   memcpy(vcpu->run->s.regs.fprs, >fprs, sizeof(fpu->fprs));
> - return 0;
> +
> +out:
> + vcpu_put(vcpu);
> + return ret;
>  }
>  
>  int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 8b54567..fd8b92f 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -7699,8 +7699,11 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, 
> struct kvm_fpu *fpu)
>  
>  int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
>  {
> - struct fxregs_state *fxsave =
> - >arch.guest_fpu.state.fxsave;
> + struct fxregs_state *fxsave;
> +
> + vcpu_load(vcpu);
> +
> + fxsave = >arch.guest_fpu.state.fxsave;
>  
>   memcpy(fxsave->st_space, fpu->fpr, 128);
>   fxsave->cwd = fpu->fcw;
> @@ -7711,6 +7714,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, 
> struct kvm_fpu *fpu)
>   fxsave->rdp = fpu->last_dp;
>   memcpy(fxsave->xmm_space, fpu->xmm, sizeof fxsave->xmm_space);
>  
> + vcpu_put(vcpu);
>   return 0;
>  }
>  
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 73ad70a..06751bb 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -2689,9 +2689,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
>   fpu = NULL;
>   goto out;
>   }
> - vcpu_load(vcpu);
>   r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu);
> - vcpu_put(vcpu);
>   break;
>   }
>   default:
> 

Reviewed-by: David Hildenbrand 

-- 

Thanks,

David / dhildenb
___
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

[PATCH v2 13/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_fpu

2017-11-29 Thread Christoffer Dall 
Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_set_fpu().

Signed-off-by: Christoffer Dall 
---
 arch/s390/kvm/kvm-s390.c | 15 ---
 arch/x86/kvm/x86.c   |  8 ++--
 virt/kvm/kvm_main.c  |  2 --
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 88dcb89..43278f3 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -2752,15 +2752,24 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
 
 int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
 {
-   if (test_fp_ctl(fpu->fpc))
-   return -EINVAL;
+   int ret = 0;
+
+   vcpu_load(vcpu);
+
+   if (test_fp_ctl(fpu->fpc)) {
+   ret = -EINVAL;
+   goto out;
+   }
vcpu->run->s.regs.fpc = fpu->fpc;
if (MACHINE_HAS_VX)
convert_fp_to_vx((__vector128 *) vcpu->run->s.regs.vrs,
 (freg_t *) fpu->fprs);
else
memcpy(vcpu->run->s.regs.fprs, >fprs, sizeof(fpu->fprs));
-   return 0;
+
+out:
+   vcpu_put(vcpu);
+   return ret;
 }
 
 int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8b54567..fd8b92f 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7699,8 +7699,11 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, 
struct kvm_fpu *fpu)
 
 int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
 {
-   struct fxregs_state *fxsave =
-   >arch.guest_fpu.state.fxsave;
+   struct fxregs_state *fxsave;
+
+   vcpu_load(vcpu);
+
+   fxsave = >arch.guest_fpu.state.fxsave;
 
memcpy(fxsave->st_space, fpu->fpr, 128);
fxsave->cwd = fpu->fcw;
@@ -7711,6 +7714,7 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, 
struct kvm_fpu *fpu)
fxsave->rdp = fpu->last_dp;
memcpy(fxsave->xmm_space, fpu->xmm, sizeof fxsave->xmm_space);
 
+   vcpu_put(vcpu);
return 0;
 }
 
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 73ad70a..06751bb 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2689,9 +2689,7 @@ static long kvm_vcpu_ioctl(struct file *filp,
fpu = NULL;
goto out;
}
-   vcpu_load(vcpu);
r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu);
-   vcpu_put(vcpu);
break;
}
default:
-- 
2.7.4

___
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm