On 25/11/2017 21:57, Christoffer Dall wrote:
> In preparation for moving calls to vcpu_load() and vcpu_put() into the
> architecture specific implementations of the KVM vcpu ioctls, move the
> calls in the main kvm_vcpu_ioctl() dispatcher function to each case
> of the ioctl select statement. This allows us to move the vcpu_load()
> and vcpu_put() calls into architecture specific implementations of vcpu
> ioctls, one by one.
>
> Signed-off-by: Christoffer Dall <christoffer.dall@xxxxxxxxxx>
> ---
> virt/kvm/kvm_main.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 48 insertions(+), 5 deletions(-)
>
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 9deb5a245b83..fafafcc38b5a 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -2528,16 +2528,15 @@ static long kvm_vcpu_ioctl(struct file *filp,
> return kvm_arch_vcpu_ioctl(filp, ioctl, arg);
> #endif
>
> -
> - r = vcpu_load(vcpu);
> - if (r)
> - return r;
> switch (ioctl) {
> case KVM_RUN: {
> struct pid *oldpid;
> r = -EINVAL;
> if (arg)
> goto out;
> + r = vcpu_load(vcpu);
> + if (r)
> + goto out;
> oldpid = rcu_access_pointer(vcpu->pid);
If it is not a problem for ARM, maybe it would actually be best to leave
the locking in kvm_vcpu_ioctl (with the already existing exception of
KVM_INTERRUPT). This would make vcpu_load void, and would also let you
keep the PID adjustment in common code. This would be more similar to
the previous version, but without introducing __vcpu_load/__vcpu_put.
Looks good apart from this doubt! Thanks,
Paolo
--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
