io_uring/poll: Allocate apoll with generic alloc_cache helper

This abstracts away the cache details to simplify the code.

Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>
Link: https://lore.kernel.org/r/20241216204615.759089-5-krisman@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/poll.c b/io_uring/poll.c
index bced9edd52335ac42a3390524d42e486e6784f70..cc01c40b43d31b8be8aca048bb689c6a1c0d25e2 100644 (file)
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -648,15 +648,12 @@ static struct async_poll *io_req_alloc_apoll(struct io_kiocb *req,
        if (req->flags & REQ_F_POLLED) {
                apoll = req->apoll;
                kfree(apoll->double_poll);
-       } else if (!(issue_flags & IO_URING_F_UNLOCKED)) {
-               apoll = io_alloc_cache_get(&ctx->apoll_cache);
-               if (!apoll)
-                       goto alloc_apoll;
-               apoll->poll.retries = APOLL_MAX_RETRY;
        } else {
-alloc_apoll:
-               apoll = kmalloc(sizeof(*apoll), GFP_ATOMIC);
-               if (unlikely(!apoll))
+               if (!(issue_flags & IO_URING_F_UNLOCKED))
+                       apoll = io_cache_alloc(&ctx->apoll_cache, GFP_ATOMIC, NULL);
+               else
+                       apoll = kmalloc(sizeof(*apoll), GFP_ATOMIC);
+               if (!apoll)
                        return NULL;
                apoll->poll.retries = APOLL_MAX_RETRY;
        }