Re: [PATCH v1] nitro_enclaves: Fixup type of the poll result assigned value - Paraschiv, Andra-Irina

From: "Paraschiv, Andra-Irina" <andraprs@amazon.com>
To: Alexander Graf <graf@amazon.de>,
	linux-kernel <linux-kernel@vger.kernel.org>
Cc: Anthony Liguori <aliguori@amazon.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Colm MacCarthaigh <colmmacc@amazon.com>,
	"David Duncan" <davdunc@amazon.com>,
	Bjoern Doebel <doebel@amazon.de>,
	"David Woodhouse" <dwmw@amazon.co.uk>,
	Frank van der Linden <fllinden@amazon.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Karen Noel <knoel@redhat.com>,
	Martin Pohlack <mpohlack@amazon.de>, Matt Wilson <msw@amazon.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Stefano Garzarella <sgarzare@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Stewart Smith <trawets@amazon.com>,
	Uwe Dannowski <uwed@amazon.de>,
	Vitaly Kuznetsov <vkuznets@redhat.com>, kvm <kvm@vger.kernel.org>,
	ne-devel-upstream <ne-devel-upstream@amazon.com>
Subject: Re: [PATCH v1] nitro_enclaves: Fixup type of the poll result assigned value
Date: Mon, 2 Nov 2020 19:42:09 +0200	[thread overview]
Message-ID: <1ca4cd54-5ffd-621d-acb1-925bccb06066@amazon.com> (raw)
In-Reply-To: <e4a34429-1b25-00d5-9bf1-045ca49acb8d@amazon.de>

On 02/11/2020 18:16, Alexander Graf wrote:
>
>
> On 14.10.20 11:05, Andra Paraschiv wrote:
>> Update the assigned value of the poll result to be EPOLLHUP instead of
>> POLLHUP to match the __poll_t type.
>>
>> Signed-off-by: Andra Paraschiv <andraprs@amazon.com>
>> Reported-by: kernel test robot <lkp@intel.com>
>> ---
>>   drivers/virt/nitro_enclaves/ne_misc_dev.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c 
>> b/drivers/virt/nitro_enclaves/ne_misc_dev.c
>> index f06622b48d69..9148566455e8 100644
>> --- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
>> +++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
>> @@ -1508,7 +1508,7 @@ static __poll_t ne_enclave_poll(struct file 
>> *file, poll_table *wait)
>>       if (!ne_enclave->has_event)
>>           return mask;
>>   -    mask = POLLHUP;
>> +    mask = EPOLLHUP;
>
> That whole function looks a bit ... convoluted? How about this? I 
> guess you could trim it down even further, but this looks quite 
> readable to me:
>
> diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c 
> b/drivers/virt/nitro_enclaves/ne_misc_dev.c
> index f06622b48d69..5b7f45e2eb4c 100644
> --- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
> +++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
> @@ -1505,10 +1505,8 @@ static __poll_t ne_enclave_poll(struct file 
> *file, poll_table *wait)
>
>      poll_wait(file, &ne_enclave->eventq, wait);
>
> -    if (!ne_enclave->has_event)
> -        return mask;
> -
> -    mask = POLLHUP;
> +    if (ne_enclave->has_event)
> +        mask |= POLLHUP;
>
>      return mask;
>  }
>

Good point, I updated the logic and sent the v2 of the patch.

https://lore.kernel.org/lkml/20201102173622.32169-1-andraprs@amazon.com/

Thank you.

Andra

Amazon Development Center (Romania) S.R.L. registered office: 27A Sf. Lazar Street, UBC5, floor 2, Iasi, Iasi County, 700045, Romania. Registered in Romania. Registration number J22/2621/2005.