Re: [PATCH v2 5/5] KVM: refactor asynchronous vcpu ioctl dispatch

[Radim KrÄmÃÅ]

2015-08-12 22:03+0200, Christian Borntraeger:
> Am 05.08.2015 um 18:33 schrieb Radim KrÄmÃÅ:
>> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
>> @@ -2252,12 +2252,15 @@ static long kvm_vcpu_ioctl(struct file *filp,
>>  	 * Special cases: vcpu ioctls that are asynchronous to vcpu execution,
>>  	 * so vcpu_load() would break it.
>>  	 */
>> +	switch (ioctl) {
>>  #if defined(CONFIG_S390) || defined(CONFIG_PPC) || defined(CONFIG_MIPS)
>> -	if (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_S390_IRQ || ioctl == KVM_INTERRUPT)
>> -		return kvm_arch_vcpu_ioctl(filp, ioctl, arg);
>> +	case KVM_S390_INTERRUPT:
>> +	case KVM_S390_IRQ:
>> +	case KVM_INTERRUPT:
> 
> When you are it you might want to put the KVM_S390* withing CONFIG_S390 and
> KVM_INTERRUPT within CONFIG_PPC || CONFIG_MIPS

Sure, thanks.

> This might speed up the switch statement for s390/ppc/mips a tiny bit. It will add
> another ifdef, though. Paolo?

For v3, I will name the decision as an inline function, which should
make the #ifing more acceptable (at the cost of not having ioctls #defs
in the body of kvm_vcpu_ioctl).  Something like this,

static inline bool kvm_asynchronous_ioctl(unsigned ioctl)
{
	switch (ioctl) {
#if defined(CONFIG_S390)
	case KVM_S390_INTERRUPT:
	case KVM_S390_IRQ:
#endif
#if defined(CONFIG_MIPS)
	case KVM_INTERRUPT:
#endif
	case KVM_USER_EXIT:
		return true;
	}
	return false;
}

[...]
	if (kvm_asynchronous_ioctl(ioctl))
		return kvm_arch_vcpu_ioctl(filp, ioctl, arg);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/