* [PATCH v1] nitro_enclaves: Fixup type of the poll result assigned value
@ 2020-10-14 9:05 Andra Paraschiv
2020-11-02 16:16 ` Alexander Graf
0 siblings, 1 reply; 3+ messages in thread
From: Andra Paraschiv @ 2020-10-14 9:05 UTC (permalink / raw)
To: linux-kernel
Cc: Anthony Liguori, Benjamin Herrenschmidt, Colm MacCarthaigh,
David Duncan, Bjoern Doebel, David Woodhouse,
Frank van der Linden, Alexander Graf, Greg Kroah-Hartman,
Karen Noel, Martin Pohlack, Matt Wilson, Paolo Bonzini,
Stefano Garzarella, Stefan Hajnoczi, Stewart Smith,
Uwe Dannowski, Vitaly Kuznetsov, kvm, ne-devel-upstream,
Andra Paraschiv
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;
return mask;
}
--
2.20.1 (Apple Git-117)
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.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1] nitro_enclaves: Fixup type of the poll result assigned value
2020-10-14 9:05 [PATCH v1] nitro_enclaves: Fixup type of the poll result assigned value Andra Paraschiv
@ 2020-11-02 16:16 ` Alexander Graf
2020-11-02 17:42 ` Paraschiv, Andra-Irina
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Graf @ 2020-11-02 16:16 UTC (permalink / raw)
To: Andra Paraschiv, linux-kernel
Cc: Anthony Liguori, Benjamin Herrenschmidt, Colm MacCarthaigh,
David Duncan, Bjoern Doebel, David Woodhouse,
Frank van der Linden, Greg Kroah-Hartman, Karen Noel,
Martin Pohlack, Matt Wilson, Paolo Bonzini, Stefano Garzarella,
Stefan Hajnoczi, Stewart Smith, Uwe Dannowski, Vitaly Kuznetsov,
kvm, ne-devel-upstream
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;
}
Alex
Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v1] nitro_enclaves: Fixup type of the poll result assigned value
2020-11-02 16:16 ` Alexander Graf
@ 2020-11-02 17:42 ` Paraschiv, Andra-Irina
0 siblings, 0 replies; 3+ messages in thread
From: Paraschiv, Andra-Irina @ 2020-11-02 17:42 UTC (permalink / raw)
To: Alexander Graf, linux-kernel
Cc: Anthony Liguori, Benjamin Herrenschmidt, Colm MacCarthaigh,
David Duncan, Bjoern Doebel, David Woodhouse,
Frank van der Linden, Greg Kroah-Hartman, Karen Noel,
Martin Pohlack, Matt Wilson, Paolo Bonzini, Stefano Garzarella,
Stefan Hajnoczi, Stewart Smith, Uwe Dannowski, Vitaly Kuznetsov,
kvm, ne-devel-upstream
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-02 17:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-14 9:05 [PATCH v1] nitro_enclaves: Fixup type of the poll result assigned value Andra Paraschiv
2020-11-02 16:16 ` Alexander Graf
2020-11-02 17:42 ` Paraschiv, Andra-Irina
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).