From acb232e81643bd097278ebdc17038e6f280e7212 Mon Sep 17 00:00:00 2001 From: Hao Xu Date: Fri, 6 May 2022 15:01:01 +0800 Subject: [PATCH] io_uring: add a helper for poll clean Add a helper for poll clean, it will be used in the multishot accept in the later patches. Signed-off-by: Hao Xu --- fs/io_uring.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index d33777575faf24..0a83ecc457d1c2 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5711,6 +5711,23 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) return 0; } +static inline void __io_poll_clean(struct io_kiocb *req) +{ + struct io_ring_ctx *ctx = req->ctx; + + io_poll_remove_entries(req); + spin_lock(&ctx->completion_lock); + hash_del(&req->hash_node); + spin_unlock(&ctx->completion_lock); +} + +#define REQ_F_APOLL_MULTI_POLLED (REQ_F_APOLL_MULTISHOT | REQ_F_POLLED) +static inline void io_poll_clean(struct io_kiocb *req) +{ + if ((req->flags & REQ_F_APOLL_MULTI_POLLED) == REQ_F_APOLL_MULTI_POLLED) + __io_poll_clean(req); +} + static int io_accept(struct io_kiocb *req, unsigned int issue_flags) { struct io_accept *accept = &req->accept; @@ -6041,17 +6058,13 @@ static void io_poll_task_func(struct io_kiocb *req, bool *locked) static void io_apoll_task_func(struct io_kiocb *req, bool *locked) { - struct io_ring_ctx *ctx = req->ctx; int ret; ret = io_poll_check_events(req, locked); if (ret > 0) return; - io_poll_remove_entries(req); - spin_lock(&ctx->completion_lock); - hash_del(&req->hash_node); - spin_unlock(&ctx->completion_lock); + __io_poll_clean(req); if (!ret) io_req_task_submit(req, locked);