Message-ID: <c6b7c933-2d48-1504-7c45-110b0ab317ad@linux.ibm.com>
Date:   Mon, 29 Nov 2021 18:13:39 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.2.0
Subject: Re: [PATCH] kvm/eventfd: fix the misleading comment in
 kvm_irqfd_assign
Content-Language: en-US
To:     "Longpeng(Mike)" <longpeng2@huawei.com>, pbonzini@redhat.com
Cc:     cornelia.huck@de.ibm.com, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org, arei.gonglei@huawei.com
References: <20211129034328.1604-1-longpeng2@huawei.com>
From:   Christian Borntraeger <borntraeger@linux.ibm.com>
In-Reply-To: <20211129034328.1604-1-longpeng2@huawei.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


Am 29.11.21 um 04:43 schrieb Longpeng(Mike):
> From: Longpeng <longpeng2@huawei.com>
> 
> The comment above the invocation of vfs_poll() is misleading, move
> it to the right place.
> 
I think that the current variant is better.
events is only used in that function to check for EPOLLIN, so the
assignment and the if belong together from a "what am I doing here" perspective.

> Fixes: 684a0b719ddb ("KVM: eventfd: Fix lock order inversion")
> Signed-off-by: Longpeng <longpeng2@huawei.com>
> ---
>   virt/kvm/eventfd.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
> index 2ad013b..cd01814 100644
> --- a/virt/kvm/eventfd.c
> +++ b/virt/kvm/eventfd.c
> @@ -406,12 +406,12 @@ bool __attribute__((weak)) kvm_arch_irqfd_route_changed(
> 
>   	spin_unlock_irq(&kvm->irqfds.lock);
> 
> +	events = vfs_poll(f.file, &irqfd->pt);
> +
>   	/*
>   	 * Check if there was an event already pending on the eventfd
>   	 * before we registered, and trigger it as if we didn't miss it.
>   	 */
> -	events = vfs_poll(f.file, &irqfd->pt);
> -
>   	if (events & EPOLLIN)
>   		schedule_work(&irqfd->inject);
>