diff mbox series

[1/1] io_uring: Remove extra io_commit_sqring()

Message ID ca020164c33381c602d3188d95e0d650a5c625ac.1573058949.git.asml.silence@gmail.com (mailing list archive)
State New, archived
Headers show
Series [1/1] io_uring: Remove extra io_commit_sqring() | expand

Commit Message

Pavel Begunkov Nov. 6, 2019, 6:12 p.m. UTC
io_submit_sqes() calls io_commit_sqring() at the end, so there is no
need for sq_thread to repeat it.

Fixes: 09c0eb1f1b93b9cf ("io_uring: Merge io_submit_sqes and
io_ring_submit").

Reported-by: Bob Liu <bob.liu@oracle.com>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 fs/io_uring.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Pavel Begunkov Nov. 6, 2019, 6:17 p.m. UTC | #1
This was noticed by Bob, though I haven't had time to fix and resend
the cleanup patches before they were applied. 

On 06/11/2019 21:12, Pavel Begunkov wrote:
> io_submit_sqes() calls io_commit_sqring() at the end, so there is no
> need for sq_thread to repeat it.
> 
> Fixes: 09c0eb1f1b93b9cf ("io_uring: Merge io_submit_sqes and
> io_ring_submit").
> 
> Reported-by: Bob Liu <bob.liu@oracle.com>
> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
> ---
>  fs/io_uring.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index ba77475c1cec..6524898831e0 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -2868,9 +2868,6 @@ static int io_sq_thread(void *data)
>  		to_submit = min(to_submit, ctx->sq_entries);
>  		inflight += io_submit_sqes(ctx, to_submit, NULL, -1, &cur_mm,
>  					   true);
> -
> -		/* Commit SQ ring head once we've consumed all SQEs */
> -		io_commit_sqring(ctx);
>  	}
>  
>  	set_fs(old_fs);
>
Jens Axboe Nov. 6, 2019, 6:19 p.m. UTC | #2
On 11/6/19 11:12 AM, Pavel Begunkov wrote:
> io_submit_sqes() calls io_commit_sqring() at the end, so there is no
> need for sq_thread to repeat it.
> 
> Fixes: 09c0eb1f1b93b9cf ("io_uring: Merge io_submit_sqes and
> io_ring_submit").

Thanks, I'm going to fold this one in with the offending commit.
diff mbox series

Patch

diff --git a/fs/io_uring.c b/fs/io_uring.c
index ba77475c1cec..6524898831e0 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2868,9 +2868,6 @@  static int io_sq_thread(void *data)
 		to_submit = min(to_submit, ctx->sq_entries);
 		inflight += io_submit_sqes(ctx, to_submit, NULL, -1, &cur_mm,
 					   true);
-
-		/* Commit SQ ring head once we've consumed all SQEs */
-		io_commit_sqring(ctx);
 	}
 
 	set_fs(old_fs);