In the current, ->needs_lock not only determines whether a lock is
needed, but also determines whether the process is in an async context.
using in_async to make it more clearly and avoid confusion.
Signed-off-by: Jackie Liu <liuyu...@kylinos.cn>
---
fs/io_uring.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 0fbb486..3745fd7 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -288,7 +288,7 @@ struct sqe_submit {
const struct io_uring_sqe *sqe;
unsigned short index;
bool has_user;
- bool needs_lock;
+ bool in_async;
bool needs_fixed_file;
};
@@ -1115,11 +1115,7 @@ static int io_read(struct io_kiocb *req, const struct
sqe_submit *s,
if (!force_nonblock || ret2 != -EAGAIN) {
io_rw_done(kiocb, ret2);
} else {
- /*
- * If ->needs_lock is true, we're already in async
- * context.
- */
- if (!s->needs_lock)
+ if (!s->in_async)
io_async_list_note(READ, req, iov_count);
ret = -EAGAIN;
}
@@ -1156,8 +1152,7 @@ static int io_write(struct io_kiocb *req, const struct
sqe_submit *s,
ret = -EAGAIN;
if (force_nonblock && !(kiocb->ki_flags & IOCB_DIRECT)) {
- /* If ->needs_lock is true, we're already in async context. */
- if (!s->needs_lock)
+ if (!s->in_async)
io_async_list_note(WRITE, req, iov_count);
goto out_free;
}
@@ -1185,11 +1180,7 @@ static int io_write(struct io_kiocb *req, const struct
sqe_submit *s,
if (!force_nonblock || ret2 != -EAGAIN) {
io_rw_done(kiocb, ret2);
} else {
- /*
- * If ->needs_lock is true, we're already in async
- * context.
- */
- if (!s->needs_lock)
+ if (!s->in_async)
io_async_list_note(WRITE, req, iov_count);
ret = -EAGAIN;
}
@@ -1601,10 +1592,10 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx,
struct io_kiocb *req,
return -EAGAIN;
/* workqueue context doesn't hold uring_lock, grab it now */
- if (s->needs_lock)
+ if (s->in_async)
mutex_lock(&ctx->uring_lock);
io_iopoll_req_issued(req);
- if (s->needs_lock)
+ if (s->in_async)
mutex_unlock(&ctx->uring_lock);
}
@@ -1667,7 +1658,7 @@ static void io_sq_wq_submit_work(struct work_struct *work)
if (!ret) {
s->has_user = cur_mm != NULL;
- s->needs_lock = true;
+ s->in_async = true;
do {
ret = __io_submit_sqe(ctx, req, s, false);
/*
@@ -1982,7 +1973,7 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, struct
sqe_submit *sqes,
ret = -EFAULT;
} else {
sqes[i].has_user = has_user;
- sqes[i].needs_lock = true;
+ sqes[i].in_async = true;
sqes[i].needs_fixed_file = true;
ret = io_submit_sqe(ctx, &sqes[i], statep);
}
@@ -2149,7 +2140,7 @@ static int io_ring_submit(struct io_ring_ctx *ctx,
unsigned int to_submit)
break;
s.has_user = true;
- s.needs_lock = false;
+ s.in_async = false;
s.needs_fixed_file = false;
submit++;
--
2.7.4
