2020-11-02 17:40:35

by Paraschiv, Andra-Irina

Subject: [PATCH v2] nitro_enclaves: Fixup type and simplify logic of the poll mask setup

Update the assigned value of the poll result to be EPOLLHUP instead of
POLLHUP to match the __poll_t type.

While at it, simplify the logic of setting the mask result of the poll
function.

Changelog

v1 -> v2

* Simplify the mask setting logic from the poll function.

Signed-off-by: Andra Paraschiv <[email protected]>
Reported-by: kernel test robot <[email protected]>
---
drivers/virt/nitro_enclaves/ne_misc_dev.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index f06622b48d695..f1964ea4b8269 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 |= 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.

2020-11-02 18:04:25

by Alexander Graf

Subject: Re: [PATCH v2] nitro_enclaves: Fixup type and simplify logic of the poll mask setup

On 02.11.20 18:36, Andra Paraschiv wrote:
> Update the assigned value of the poll result to be EPOLLHUP instead of
> POLLHUP to match the __poll_t type.
>
> While at it, simplify the logic of setting the mask result of the poll
> function.
>
> Changelog
>
> v1 -> v2
>
> * Simplify the mask setting logic from the poll function.
>
> Signed-off-by: Andra Paraschiv <[email protected]>
> Reported-by: kernel test robot <[email protected]>

Reviewed-by: Alexander Graf <[email protected]>


Alex

> ---
> drivers/virt/nitro_enclaves/ne_misc_dev.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
> index f06622b48d695..f1964ea4b8269 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 |= EPOLLHUP;
>
> return mask;
> }
>



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

2020-11-02 18:48:57

by Paraschiv, Andra-Irina

Subject: Re: [PATCH v2] nitro_enclaves: Fixup type and simplify logic of the poll mask setup

On 02/11/2020 19:50, Alexander Graf wrote:
>
>
> On 02.11.20 18:36, Andra Paraschiv wrote:
>> Update the assigned value of the poll result to be EPOLLHUP instead of
>> POLLHUP to match the __poll_t type.
>>
>> While at it, simplify the logic of setting the mask result of the poll
>> function.
>>
>> Changelog
>>
>> v1 -> v2
>>
>> * Simplify the mask setting logic from the poll function.
>>
>> Signed-off-by: Andra Paraschiv <[email protected]>
>> Reported-by: kernel test robot <[email protected]>
>
> Reviewed-by: Alexander Graf <[email protected]>
>
>

Greg, let me know if there is anything remaining to be done for this
patch. Otherwise, can you please add the patch to the char-misc tree.

Thanks,
Andra

>
>> ---
>> ? drivers/virt/nitro_enclaves/ne_misc_dev.c | 6 ++----
>> ? 1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c
>> b/drivers/virt/nitro_enclaves/ne_misc_dev.c
>> index f06622b48d695..f1964ea4b8269 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 |= EPOLLHUP;
>> ? ????? return mask;
>> ? }
>>




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.