Re: [mainline][bisected 36ae3c0] Build fail at virt/kvm/eventfd.c:568

[Jan H. SchÃnherr]

On 09/16/2017 06:24 PM, Abdul Haleem wrote:
> Hi,
> 
> Today's mainline kernel failed to build on powerpc with below error
> 
> arch/powerpc/kvm/../../../virt/kvm/eventfd.c: In function âkvm_irqfdâ: 
> arch/powerpc/kvm/../../../virt/kvm/eventfd.c:568:19: error:
> âKVM_MAX_IRQ_ROUTESâ undeclared (first use in this function)
>   if (args->gsi >= KVM_MAX_IRQ_ROUTES)

Hmm... the header file for that constant is included...
... but it's only defined when CONFIG_HAVE_KVM_IRQ_ROUTING, which is not the case here.

We can either make that "if" conditional on that, or we revert the commit.

The commit was meant the give user space an early indication that something is wrong.
I was only aware of the IRQ routing use case. This indicates that there are other
use cases. To err on the side of caution, I'd favor a revert as the patch is not strictly
needed -- unless someone else can provide more insight on valid values for GSI.

Paolo, do you want me to prepare a revert for the commit below?

Regards
Jan


> Possible bad commit is :
> 
> commit 36ae3c0a36b7456432fedce38ae2f7bd3e01a563
> Author: Jan H. SchÃnherr <jschoenh@xxxxxxxxx>
> Date:   Thu Sep 7 19:02:48 2017 +0100
> 
>     KVM: Don't accept obviously wrong gsi values via KVM_IRQFD
>     
>     We cannot add routes for gsi values >= KVM_MAX_IRQ_ROUTES -- see
>     kvm_set_irq_routing(). Hence, there is no sense in accepting them
>     via KVM_IRQFD. Prevent them from entering the system in the first
>     place.
>     
>     Signed-off-by: Jan H. SchÃnherr <jschoenh@xxxxxxxxx>
>     Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> 
> diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
> index f2ac53a..c608ab4 100644
> --- a/virt/kvm/eventfd.c
> +++ b/virt/kvm/eventfd.c
> @@ -565,6 +565,8 @@ kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)
>  {
>         if (args->flags & ~(KVM_IRQFD_FLAG_DEASSIGN |
> KVM_IRQFD_FLAG_RESAMPLE))
>                 return -EINVAL;
> +       if (args->gsi >= KVM_MAX_IRQ_ROUTES)
> +               return -EINVAL;
>  
>         if (args->flags & KVM_IRQFD_FLAG_DEASSIGN)
>                 return kvm_irqfd_deassign(kvm, args);
> 
>