[PATCH openEuler-1.0-LTS 684/769] io_uring: provide generic io_req_complete() helper

15 Apr 2021

From: Jens Axboe axboe@kernel.dk
mainline inclusion
from mainline-5.9-rc1
commit e1e16097e265daac918ce355bf1a0d1677adf0c7
category: feature
bugzilla: https://bugzilla.openeuler.org/show_bug.cgi?id=27
CVE: NA
---------------------------
We have lots of callers of:
io_cqring_add_event(req, result);
io_put_req(req);
Provide a helper that does this for us. It helps clean up the code, and
also provides a more convenient location for us to change the completion
handling.
Signed-off-by: Jens Axboe axboe@kernel.dk
Conflicts:
    fs/io_uring.c
Signed-off-by: yangerkun yangerkun@huawei.com
Reviewed-by: zhangyi (F) yi.zhang@huawei.com
Signed-off-by: Cheng Jian cj.chengjian@huawei.com
---
 fs/io_uring.c | 103 ++++++++++++++++++++------------------------------
 1 file changed, 42 insertions(+), 61 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 5e6b601ed398..0bde05e735a2 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1338,7 +1338,7 @@ static void io_cqring_fill_event(struct io_kiocb *req, long res)
    __io_cqring_fill_event(req, res, 0);
 }
-static void __io_cqring_add_event(struct io_kiocb *req, long res, long cflags)
+static void io_cqring_add_event(struct io_kiocb *req, long res, long cflags)
 {
    struct io_ring_ctx *ctx = req->ctx;
    unsigned long flags;
@@ -1351,9 +1351,15 @@ static void __io_cqring_add_event(struct io_kiocb *req, long res, long cflags)
    io_cqring_ev_posted(ctx);
 }
-static void io_cqring_add_event(struct io_kiocb *req, long res)
+static void __io_req_complete(struct io_kiocb *req, long res, unsigned cflags)
 {
-	__io_cqring_add_event(req, res, 0);
+	io_cqring_add_event(req, res, cflags);
+	io_put_req(req);
+}
+
+static void io_req_complete(struct io_kiocb *req, long res)
+{
+	__io_req_complete(req, res, 0);
 }
static inline bool io_is_fallback_req(struct io_kiocb *req)
@@ -2006,7 +2012,7 @@ static void io_complete_rw_common(struct kiocb *kiocb, long res)
    	req_set_fail_links(req);
    if (req->flags & REQ_F_BUFFER_SELECTED)
    	cflags = io_put_kbuf(req);
-	__io_cqring_add_event(req, res, cflags);
+	io_cqring_add_event(req, res, cflags);
 }
static void io_complete_rw(struct kiocb *kiocb, long res, long res2)
@@ -2900,10 +2906,9 @@ static int io_tee(struct io_kiocb *req, bool force_nonblock)
    io_put_file(req, in, (sp->flags & SPLICE_F_FD_IN_FIXED));
    req->flags &= ~REQ_F_NEED_CLEANUP;
-	io_cqring_add_event(req, ret);
    if (ret != sp->len)
    	req_set_fail_links(req);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -2937,10 +2942,9 @@ static int io_splice(struct io_kiocb *req, bool force_nonblock)
    io_put_file(req, in, (sp->flags & SPLICE_F_FD_IN_FIXED));
    req->flags &= ~REQ_F_NEED_CLEANUP;
-	io_cqring_add_event(req, ret);
    if (ret != sp->len)
    	req_set_fail_links(req);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -2954,8 +2958,7 @@ static int io_nop(struct io_kiocb *req)
    if (unlikely(ctx->flags & IORING_SETUP_IOPOLL))
    	return -EINVAL;
-	io_cqring_add_event(req, 0);
-	io_put_req(req);
+	io_req_complete(req, 0);
    return 0;
 }
@@ -2994,8 +2997,7 @@ static int io_fsync(struct io_kiocb *req, bool force_nonblock)
    			req->sync.flags & IORING_FSYNC_DATASYNC);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3028,8 +3030,7 @@ static int io_fallocate(struct io_kiocb *req, bool force_nonblock)
    current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3096,8 +3097,7 @@ static int io_openat(struct io_kiocb *req, bool force_nonblock)
    req->flags &= ~REQ_F_NEED_CLEANUP;
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3165,8 +3165,7 @@ static int io_remove_buffers(struct io_kiocb *req, bool force_nonblock)
    io_ring_submit_lock(ctx, !force_nonblock);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3255,8 +3254,7 @@ static int io_provide_buffers(struct io_kiocb *req, bool force_nonblock)
    io_ring_submit_unlock(ctx, !force_nonblock);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3299,8 +3297,7 @@ static int io_epoll_ctl(struct io_kiocb *req, bool force_nonblock)
if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 #else
    return -EOPNOTSUPP;
@@ -3336,8 +3333,7 @@ static int io_madvise(struct io_kiocb *req, bool force_nonblock)
    ret = do_madvise(ma->addr, ma->len, ma->advice);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 #else
    return -EOPNOTSUPP;
@@ -3376,8 +3372,7 @@ static int io_fadvise(struct io_kiocb *req, bool force_nonblock)
    ret = vfs_fadvise(req->file, fa->offset, fa->len, fa->advice);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3416,8 +3411,7 @@ static int io_statx(struct io_kiocb *req, bool force_nonblock)
if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3472,10 +3466,9 @@ static int io_close(struct io_kiocb *req, bool force_nonblock)
    ret = filp_close(close->put_file, req->work.files);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
    fput(close->put_file);
    close->put_file = NULL;
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3509,8 +3502,7 @@ static int io_sync_file_range(struct io_kiocb *req, bool force_nonblock)
    			req->sync.flags);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3610,10 +3602,9 @@ static int io_sendmsg(struct io_kiocb *req, bool force_nonblock)
    if (kmsg && kmsg->iov != kmsg->fast_iov)
    	kfree(kmsg->iov);
    req->flags &= ~REQ_F_NEED_CLEANUP;
-	io_cqring_add_event(req, ret);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3653,10 +3644,9 @@ static int io_send(struct io_kiocb *req, bool force_nonblock)
    		ret = -EINTR;
    }
-	io_cqring_add_event(req, ret);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -3861,10 +3851,9 @@ static int io_recvmsg(struct io_kiocb *req, bool force_nonblock)
    if (kmsg && kmsg->iov != kmsg->fast_iov)
    	kfree(kmsg->iov);
    req->flags &= ~REQ_F_NEED_CLEANUP;
-	__io_cqring_add_event(req, ret, cflags);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req(req);
+	__io_req_complete(req, ret, cflags);
    return 0;
 }
@@ -3918,10 +3907,9 @@ static int io_recv(struct io_kiocb *req, bool force_nonblock)
kfree(kbuf);
    req->flags &= ~REQ_F_NEED_CLEANUP;
-	__io_cqring_add_event(req, ret, cflags);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req(req);
+	__io_req_complete(req, ret, cflags);
    return 0;
 }
@@ -3960,8 +3948,7 @@ static int io_accept(struct io_kiocb *req, bool force_nonblock)
    		ret = -EINTR;
    	req_set_fail_links(req);
    }
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -4021,8 +4008,7 @@ static int io_connect(struct io_kiocb *req, bool force_nonblock)
 out:
    if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
 #else /* !CONFIG_NET */
@@ -4460,7 +4446,7 @@ static void io_async_task_func(struct callback_head *cb)
    if (!canceled) {
    	__set_current_state(TASK_RUNNING);
    	if (__io_sq_thread_acquire_mm(ctx)) {
-			io_cqring_add_event(req, -EFAULT);
+			io_cqring_add_event(req, -EFAULT, 0);
    		goto end_req;
    	}
    	__io_sq_thread_acquire_files(ctx);
@@ -4709,10 +4695,9 @@ static int io_poll_remove(struct io_kiocb *req)
    ret = io_poll_cancel(ctx, addr);
    spin_unlock_irq(&ctx->completion_lock);
-	io_cqring_add_event(req, ret);
    if (ret < 0)
    	req_set_fail_links(req);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -5078,8 +5063,7 @@ static int io_files_update(struct io_kiocb *req, bool force_nonblock)
if (ret < 0)
    	req_set_fail_links(req);
-	io_cqring_add_event(req, ret);
-	io_put_req(req);
+	io_req_complete(req, ret);
    return 0;
 }
@@ -5558,8 +5542,7 @@ static struct io_wq_work *io_wq_submit_work(struct io_wq_work *work)
if (ret) {
    	req_set_fail_links(req);
-		io_cqring_add_event(req, ret);
-		io_put_req(req);
+		io_req_complete(req, ret);
    }
return io_steal_work(req);
@@ -5670,8 +5653,7 @@ static enum hrtimer_restart io_link_timeout_fn(struct hrtimer *timer)
    	io_async_find_and_cancel(ctx, req, prev->user_data, -ETIME);
    	io_put_req(prev);
    } else {
-		io_cqring_add_event(req, -ETIME);
-		io_put_req(req);
+		io_req_complete(req, -ETIME);
    }
    return HRTIMER_NORESTART;
 }
@@ -5781,9 +5763,8 @@ static void __io_queue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe)
/* and drop final reference, if we failed */
    if (ret) {
-		io_cqring_add_event(req, ret);
    	req_set_fail_links(req);
-		io_put_req(req);
+		io_req_complete(req, ret);
    }
    if (nxt) {
    	req = nxt;
@@ -5805,9 +5786,9 @@ static void io_queue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe)
    if (ret) {
    	if (ret != -EIOCBQUEUED) {
 fail_req:
-			io_cqring_add_event(req, ret);
    		req_set_fail_links(req);
-			io_double_put_req(req);
+			io_put_req(req);
+			io_req_complete(req, ret);
    	}
    } else if (req->flags & REQ_F_FORCE_ASYNC) {
    	if (!req->io) {
@@ -5834,8 +5815,8 @@ static void io_queue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 static inline void io_queue_link_head(struct io_kiocb *req)
 {
    if (unlikely(req->flags & REQ_F_FAIL_LINK)) {
-		io_cqring_add_event(req, -ECANCELED);
-		io_double_put_req(req);
+		io_put_req(req);
+		io_req_complete(req, -ECANCELED);
    } else
    	io_queue_sqe(req, NULL);
 }
@@ -6092,8 +6073,8 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr,
if (unlikely(err)) {
 fail_req:
-			io_cqring_add_event(req, err);
-			io_double_put_req(req);
+			io_put_req(req);
+			io_req_complete(req, err);
    		break;
    	}
-- 
2.25.1

    

2024

2023

2022

2021

2020

2019

[PATCH openEuler-1.0-LTS 684/769] io_uring: provide generic io_req_complete() helper