2022-02-17 23:06:01

by Olivier Langlois

Subject: [PATCH] io_uring: Remove unneeded test in io_run_task_work_sig()

Avoid testing TIF_NOTIFY_SIGNAL twice by calling task_sigpending()
directly from io_run_task_work_sig()

Signed-off-by: Olivier Langlois <[email protected]>
---
fs/io_uring.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 77b9c7e4793b..9b320b5f158c 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7683,11 +7683,11 @@ static int io_run_task_work_sig(void)
{
if (io_run_task_work())
return 1;
- if (!signal_pending(current))
- return 0;
if (test_thread_flag(TIF_NOTIFY_SIGNAL))
return -ERESTARTSYS;
- return -EINTR;
+ if (task_sigpending(current))
+ return -EINTR;
+ return 0;
}

/* when returns >0, the caller should retry */
--
2.35.1

2022-02-18 00:21:25

by Jens Axboe

Subject: Re: [PATCH] io_uring: Remove unneeded test in io_run_task_work_sig()

On Wed, 16 Feb 2022 14:53:42 -0500, Olivier Langlois wrote:
> Avoid testing TIF_NOTIFY_SIGNAL twice by calling task_sigpending()
> directly from io_run_task_work_sig()
>
>

Applied, thanks!

[1/1] io_uring: Remove unneeded test in io_run_task_work_sig()
commit: 9e9d83faa9f59266aa772148e32c265c8ad194d3

Best regards,
--
Jens Axboe