inotify: set ret in inotify_read() to -EAGAIN only when O_NONBLOCK is set

[PATCH] inotify: set ret in inotify_read() to -EAGAIN only when O_NONBLOCK is set

Posted by imandevel@gmail.com 1 year, 5 months ago

From: Iman Seyed <ImanDevel@gmail.com>

Avoid setting ret to -EAGAIN unnecessarily. Only set
it when O_NONBLOCK is specified; otherwise, leave ret
unchanged and proceed to set it to -ERESTARTSYS.

Signed-off-by: Iman Seyed <ImanDevel@gmail.com>
---
 fs/notify/inotify/inotify_user.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 4ffc30606e0b..d5d4b306a33d 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -279,9 +279,11 @@ static ssize_t inotify_read(struct file *file, char __user *buf,
 			continue;
 		}
 
-		ret = -EAGAIN;
-		if (file->f_flags & O_NONBLOCK)
+		if (file->f_flags & O_NONBLOCK) {
+			ret = -EAGAIN;
 			break;
+		}
+
 		ret = -ERESTARTSYS;
 		if (signal_pending(current))
 			break;
-- 
2.46.0

Re: [PATCH] inotify: set ret in inotify_read() to -EAGAIN only when O_NONBLOCK is set

Posted by Jan Kara 1 year, 5 months ago

On Sat 31-08-24 23:01:50, imandevel@gmail.com wrote:
> From: Iman Seyed <ImanDevel@gmail.com>
> 
> Avoid setting ret to -EAGAIN unnecessarily. Only set
> it when O_NONBLOCK is specified; otherwise, leave ret
> unchanged and proceed to set it to -ERESTARTSYS.
> 
> Signed-off-by: Iman Seyed <ImanDevel@gmail.com>

Sorry, but this change is a pointless churn. There's no difference to
generated code and wrt source code appearance it is a matter of taste where
there's no strong preference one way or other in the kernel...

								Honza

> ---
>  fs/notify/inotify/inotify_user.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
> index 4ffc30606e0b..d5d4b306a33d 100644
> --- a/fs/notify/inotify/inotify_user.c
> +++ b/fs/notify/inotify/inotify_user.c
> @@ -279,9 +279,11 @@ static ssize_t inotify_read(struct file *file, char __user *buf,
>  			continue;
>  		}
>  
> -		ret = -EAGAIN;
> -		if (file->f_flags & O_NONBLOCK)
> +		if (file->f_flags & O_NONBLOCK) {
> +			ret = -EAGAIN;
>  			break;
> +		}
> +
>  		ret = -ERESTARTSYS;
>  		if (signal_pending(current))
>  			break;
> -- 
> 2.46.0
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

Re: [PATCH] inotify: set ret in inotify_read() to -EAGAIN only when O_NONBLOCK is set

Posted by Kuan-Wei Chiu 1 year, 5 months ago

On Sat, Aug 31, 2024 at 11:01:50PM -0400, imandevel@gmail.com wrote:
> From: Iman Seyed <ImanDevel@gmail.com>
> 
> Avoid setting ret to -EAGAIN unnecessarily. Only set
> it when O_NONBLOCK is specified; otherwise, leave ret
> unchanged and proceed to set it to -ERESTARTSYS.
>

Hi Iman,

Have you checked the code generated by gcc before and after applying
this patch? My intuition suggests that the compiler optimization might
result in the same code being produced.

Regards,
Kuan-Wei

> Signed-off-by: Iman Seyed <ImanDevel@gmail.com>
> ---
>  fs/notify/inotify/inotify_user.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
> index 4ffc30606e0b..d5d4b306a33d 100644
> --- a/fs/notify/inotify/inotify_user.c
> +++ b/fs/notify/inotify/inotify_user.c
> @@ -279,9 +279,11 @@ static ssize_t inotify_read(struct file *file, char __user *buf,
>  			continue;
>  		}
>  
> -		ret = -EAGAIN;
> -		if (file->f_flags & O_NONBLOCK)
> +		if (file->f_flags & O_NONBLOCK) {
> +			ret = -EAGAIN;
>  			break;
> +		}
> +
>  		ret = -ERESTARTSYS;
>  		if (signal_pending(current))
>  			break;
> -- 
> 2.46.0
>

Re: [PATCH] inotify: set ret in inotify_read() to -EAGAIN only when O_NONBLOCK is set

Posted by Iman Seyed 1 year, 5 months ago

Hi Kuan-Wei,

I just looked over the assembly generated by GCC and Clang
with the O2 level of optimization, and you're right. Both
Generate the identical assembly. It seem like my patch
would only affect the appearance of the code.

Kind Regards,
Iman

On 9/1/24 03:00, Kuan-Wei Chiu wrote:
> On Sat, Aug 31, 2024 at 11:01:50PM -0400, imandevel@gmail.com wrote:
>> From: Iman Seyed <ImanDevel@gmail.com>
>>
>> Avoid setting ret to -EAGAIN unnecessarily. Only set
>> it when O_NONBLOCK is specified; otherwise, leave ret
>> unchanged and proceed to set it to -ERESTARTSYS.
>>
> Hi Iman,
>
> Have you checked the code generated by gcc before and after applying
> this patch? My intuition suggests that the compiler optimization might
> result in the same code being produced.
>
> Regards,
> Kuan-Wei
>
>> Signed-off-by: Iman Seyed <ImanDevel@gmail.com>
>> ---
>>   fs/notify/inotify/inotify_user.c | 6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
>> index 4ffc30606e0b..d5d4b306a33d 100644
>> --- a/fs/notify/inotify/inotify_user.c
>> +++ b/fs/notify/inotify/inotify_user.c
>> @@ -279,9 +279,11 @@ static ssize_t inotify_read(struct file *file, char __user *buf,
>>   			continue;
>>   		}
>>   
>> -		ret = -EAGAIN;
>> -		if (file->f_flags & O_NONBLOCK)
>> +		if (file->f_flags & O_NONBLOCK) {
>> +			ret = -EAGAIN;
>>   			break;
>> +		}
>> +
>>   		ret = -ERESTARTSYS;
>>   		if (signal_pending(current))
>>   			break;
>> -- 
>> 2.46.0
>>