kvm: move advertising of KVM_CAP_IRQFD to common code (dc9be0fa) · Commits · 戴 / test

POWER supports irqfds but forgot to advertise them. Some userspace does not check for the capability, but others check it---thus they work on x86 and s390 but not POWER. To avoid that other architectures in the future make the same mistake, let common code handle KVM_CAP_IRQFD the same way as KVM_CAP_IRQFD_RESAMPLE. Reported-and-tested-by:

Greg Kurz <gkurz@linux.vnet.ibm.com> Cc: stable@vger.kernel.org Fixes: Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com> Signed-off-by:

Marcelo Tosatti <mtosatti@redhat.com>

arch/s390/kvm/kvm-s390.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
		case KVM_CAP_ONE_REG:
		case KVM_CAP_ENABLE_CAP:
		case KVM_CAP_S390_CSS_SUPPORT:
		case KVM_CAP_IRQFD:
		case KVM_CAP_IOEVENTFD:
		case KVM_CAP_DEVICE_CTRL:
		case KVM_CAP_ENABLE_CAP_VM:

arch/x86/kvm/x86.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -2744,7 +2744,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
		case KVM_CAP_USER_NMI:
		case KVM_CAP_REINJECT_CONTROL:
		case KVM_CAP_IRQ_INJECT_STATUS:
		case KVM_CAP_IRQFD:
		case KVM_CAP_IOEVENTFD:
		case KVM_CAP_IOEVENTFD_NO_LENGTH:
		case KVM_CAP_PIT2:

virt/kvm/kvm_main.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2492,6 +2492,7 @@ static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
		case KVM_CAP_SIGNAL_MSI:
		#endif
		#ifdef CONFIG_HAVE_KVM_IRQFD
		case KVM_CAP_IRQFD:
		case KVM_CAP_IRQFD_RESAMPLE:
		#endif
		case KVM_CAP_CHECK_EXTENSION_VM:

Admin message