> +long kvm_arch_vcpu_ioctl(struct file *filp,
> + unsigned int ioctl, unsigned long arg)
spaces instead of tabs
> +{
> + struct kvm_vcpu *vcpu = filp->private_data;
> + void __user *argp = (void __user *)arg;
> + long r;
>
> vcpu_load(vcpu);
>
> diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
> index 9a4594e0a1ff..a3dbd459cce9 100644
> --- a/arch/s390/kvm/Kconfig
> +++ b/arch/s390/kvm/Kconfig
[...
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index 09de0ff3d677..23a680b4c932 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -1260,4 +1260,15 @@ static inline bool vcpu_valid_wakeup(struct kvm_vcpu *vcpu)
> }
> #endif /* CONFIG_HAVE_KVM_INVALID_WAKEUPS */
>
> +#ifdef CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL
> +long kvm_arch_vcpu_async_ioctl(struct file *filp,
> + unsigned int ioctl, unsigned long arg);
> +#else
> +static inline long kvm_arch_vcpu_async_ioctl(struct file *filp,
> + unsigned int ioctl, unsigned long arg)
spaces and tabs mixed
> +{
> + return -ENOIOCTLCMD;
> +}
> +#endif /* CONFIG_HAVE_KVM_VCPU_ASYNC_IOCTL */
> +
> #endif
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 19c184fa1839..b4414842b023 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -2544,15 +2544,13 @@ static long kvm_vcpu_ioctl(struct file *filp,
> if (unlikely(_IOC_TYPE(ioctl) != KVMIO))
> return -EINVAL;
>
> -#if defined(CONFIG_S390) || defined(CONFIG_PPC) || defined(CONFIG_MIPS)
> /*
> - * Special cases: vcpu ioctls that are asynchronous to vcpu execution,
> - * so vcpu_load() would break it.
> + * Some architectures have vcpu ioctls that are asynchronous to vcpu
> + * execution; mutex_lock() would break them.
> */
> - if (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_S390_IRQ || ioctl == KVM_INTERRUPT)
> - return kvm_arch_vcpu_ioctl(filp, ioctl, arg);
> -#endif
> -
> + r = kvm_arch_vcpu_async_ioctl(filp, ioctl, arg);
> + if (r != -ENOIOCTLCMD)
> + return r;
>
> if (mutex_lock_killable(&vcpu->mutex))
> return -EINTR;
>
Reviewed-by: David Hildenbrand <david@xxxxxxxxxx>
--
Thanks,
David / dhildenb
