LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] kvm: move advertising of KVM_CAP_IRQFD to common code
@ 2015-03-05 10:54 Paolo Bonzini
2015-03-05 11:06 ` Greg Kurz
2015-03-11 0:19 ` Marcelo Tosatti
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2015-03-05 10:54 UTC (permalink / raw)
To: linux-kernel, kvm; +Cc: Greg Kurz, Paul Mackerras, stable
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-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Fixes: 297e21053a52f060944e9f0de4c64fad9bcd72fc
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Marcelo, please apply this for 4.0.
---
arch/s390/kvm/kvm-s390.c | 1 -
arch/x86/kvm/x86.c | 1 -
virt/kvm/kvm_main.c | 1 +
3 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 0c3623927563..17277968e50a 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -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:
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index bd7a70be41b3..32bf19ef3115 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -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:
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index a1093700f3a4..a2214d9609bd 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -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:
--
2.3.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] kvm: move advertising of KVM_CAP_IRQFD to common code
2015-03-05 10:54 [PATCH] kvm: move advertising of KVM_CAP_IRQFD to common code Paolo Bonzini
@ 2015-03-05 11:06 ` Greg Kurz
2015-03-11 0:19 ` Marcelo Tosatti
1 sibling, 0 replies; 3+ messages in thread
From: Greg Kurz @ 2015-03-05 11:06 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: linux-kernel, kvm, Paul Mackerras, stable
On Thu, 5 Mar 2015 11:54:46 +0100
Paolo Bonzini <pbonzini@redhat.com> wrote:
> 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-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
> Cc: stable@vger.kernel.org
> Fixes: 297e21053a52f060944e9f0de4c64fad9bcd72fc
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
Thanks !
Tested-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
> Marcelo, please apply this for 4.0.
> ---
> arch/s390/kvm/kvm-s390.c | 1 -
> arch/x86/kvm/x86.c | 1 -
> virt/kvm/kvm_main.c | 1 +
> 3 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index 0c3623927563..17277968e50a 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -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:
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index bd7a70be41b3..32bf19ef3115 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -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:
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index a1093700f3a4..a2214d9609bd 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -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:
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] kvm: move advertising of KVM_CAP_IRQFD to common code
2015-03-05 10:54 [PATCH] kvm: move advertising of KVM_CAP_IRQFD to common code Paolo Bonzini
2015-03-05 11:06 ` Greg Kurz
@ 2015-03-11 0:19 ` Marcelo Tosatti
1 sibling, 0 replies; 3+ messages in thread
From: Marcelo Tosatti @ 2015-03-11 0:19 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: linux-kernel, kvm, Greg Kurz, Paul Mackerras, stable
On Thu, Mar 05, 2015 at 11:54:46AM +0100, Paolo Bonzini wrote:
> 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-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
> Cc: stable@vger.kernel.org
> Fixes: 297e21053a52f060944e9f0de4c64fad9bcd72fc
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> Marcelo, please apply this for 4.0.
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-11 0:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-05 10:54 [PATCH] kvm: move advertising of KVM_CAP_IRQFD to common code Paolo Bonzini
2015-03-05 11:06 ` Greg Kurz
2015-03-11 0:19 ` Marcelo Tosatti
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).