From: Jens Axboe <axboe@kernel.dk>
To: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-aio@kvack.org
Cc: hch@lst.de, jmoyer@redhat.com, clm@fb.com, Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 20/27] aio: batch aio_kiocb allocation
Date: Mon, 10 Dec 2018 17:15:42 -0700 [thread overview]
Message-ID: <20181211001549.30085-21-axboe@kernel.dk> (raw)
In-Reply-To: <20181211001549.30085-1-axboe@kernel.dk>
Similarly to how we use the state->ios_left to know how many references
to get to a file, we can use it to allocate the aio_kiocb's we need in
bulk.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
fs/aio.c | 47 +++++++++++++++++++++++++++++++++++++++--------
1 file changed, 39 insertions(+), 8 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
index e9dbaedda7ae..a385e7c06bfa 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -240,6 +240,8 @@ struct aio_kiocb {
};
};
+#define AIO_IOPOLL_BATCH 8
+
struct aio_submit_state {
struct kioctx *ctx;
@@ -254,6 +256,13 @@ struct aio_submit_state {
struct list_head req_list;
unsigned int req_count;
+ /*
+ * aio_kiocb alloc cache
+ */
+ void *iocbs[AIO_IOPOLL_BATCH];
+ unsigned int free_iocbs;
+ unsigned int cur_iocb;
+
/*
* File reference cache
*/
@@ -1113,15 +1122,35 @@ static void aio_iocb_init(struct kioctx *ctx, struct aio_kiocb *req)
* Allocate a slot for an aio request.
* Returns NULL if no requests are free.
*/
-static inline struct aio_kiocb *aio_get_req(struct kioctx *ctx)
+static struct aio_kiocb *aio_get_req(struct kioctx *ctx,
+ struct aio_submit_state *state)
{
struct aio_kiocb *req;
- req = kmem_cache_alloc(kiocb_cachep, GFP_KERNEL);
- if (unlikely(!req))
- return NULL;
+ if (!state)
+ req = kmem_cache_alloc(kiocb_cachep, GFP_KERNEL);
+ else if (!state->free_iocbs) {
+ size_t size;
+
+ size = min_t(size_t, state->ios_left, ARRAY_SIZE(state->iocbs));
+ size = kmem_cache_alloc_bulk(kiocb_cachep, GFP_KERNEL, size,
+ state->iocbs);
+ if (size < 0)
+ return ERR_PTR(size);
+ else if (!size)
+ return ERR_PTR(-ENOMEM);
+ state->free_iocbs = size - 1;
+ state->cur_iocb = 1;
+ req = state->iocbs[0];
+ } else {
+ req = state->iocbs[state->cur_iocb];
+ state->free_iocbs--;
+ state->cur_iocb++;
+ }
+
+ if (req)
+ aio_iocb_init(ctx, req);
- aio_iocb_init(ctx, req);
return req;
}
@@ -1359,8 +1388,6 @@ static bool aio_read_events(struct kioctx *ctx, long min_nr, long nr,
return ret < 0 || *i >= min_nr;
}
-#define AIO_IOPOLL_BATCH 8
-
/*
* Process completed iocb iopoll entries, copying the result to userspace.
*/
@@ -2371,7 +2398,7 @@ static int __io_submit_one(struct kioctx *ctx, const struct iocb *iocb,
return -EAGAIN;
ret = -EAGAIN;
- req = aio_get_req(ctx);
+ req = aio_get_req(ctx, state);
if (unlikely(!req))
goto out_put_reqs_available;
@@ -2503,6 +2530,9 @@ static void aio_submit_state_end(struct aio_submit_state *state)
if (!list_empty(&state->req_list))
aio_flush_state_reqs(state->ctx, state);
aio_file_put(state);
+ if (state->free_iocbs)
+ kmem_cache_free_bulk(kiocb_cachep, state->free_iocbs,
+ &state->iocbs[state->cur_iocb]);
}
/*
@@ -2514,6 +2544,7 @@ static void aio_submit_state_start(struct aio_submit_state *state,
state->ctx = ctx;
INIT_LIST_HEAD(&state->req_list);
state->req_count = 0;
+ state->free_iocbs = 0;
state->file = NULL;
state->ios_left = max_ios;
#ifdef CONFIG_BLOCK
--
2.17.1
next prev parent reply other threads:[~2018-12-11 0:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 0:15 [PATCHSET v7] Support for polled and buffed aio (and more) Jens Axboe
2018-12-11 0:15 ` [PATCH 01/27] fs: add an iopoll method to struct file_operations Jens Axboe
2018-12-11 0:15 ` [PATCH 02/27] block: add REQ_HIPRI_ASYNC Jens Axboe
2018-12-11 0:15 ` [PATCH 03/27] block: wire up block device iopoll method Jens Axboe
2018-12-11 0:15 ` [PATCH 04/27] block: use REQ_HIPRI_ASYNC for non-sync polled IO Jens Axboe
2018-12-11 0:15 ` [PATCH 05/27] iomap: wire up the iopoll method Jens Axboe
2018-12-11 0:15 ` [PATCH 06/27] aio: use assigned completion handler Jens Axboe
2018-12-11 0:15 ` [PATCH 07/27] aio: separate out ring reservation from req allocation Jens Axboe
2018-12-11 0:15 ` [PATCH 08/27] aio: don't zero entire aio_kiocb aio_get_req() Jens Axboe
2018-12-11 0:15 ` [PATCH 09/27] aio: only use blk plugs for > 2 depth submissions Jens Axboe
2018-12-11 0:15 ` [PATCH 10/27] aio: use iocb_put() instead of open coding it Jens Axboe
2018-12-11 0:15 ` [PATCH 11/27] aio: split out iocb copy from io_submit_one() Jens Axboe
2018-12-11 0:15 ` [PATCH 12/27] aio: abstract out io_event filler helper Jens Axboe
2018-12-11 0:15 ` [PATCH 13/27] aio: add io_setup2() system call Jens Axboe
2018-12-11 0:15 ` [PATCH 14/27] aio: add support for having user mapped iocbs Jens Axboe
2018-12-11 0:15 ` [PATCH 15/27] aio: support for IO polling Jens Axboe
2018-12-11 0:15 ` [PATCH 16/27] aio: add submission side request cache Jens Axboe
2018-12-11 0:15 ` [PATCH 17/27] fs: add fget_many() and fput_many() Jens Axboe
2018-12-11 0:15 ` [PATCH 18/27] aio: use fget/fput_many() for file references Jens Axboe
2018-12-11 0:15 ` [PATCH 19/27] aio: split iocb init from allocation Jens Axboe
2018-12-11 0:15 ` Jens Axboe [this message]
2018-12-11 0:15 ` [PATCH 21/27] block: add BIO_HOLD_PAGES flag Jens Axboe
2018-12-11 0:15 ` [PATCH 22/27] block: implement bio helper to add iter bvec pages to bio Jens Axboe
2018-12-11 0:15 ` [PATCH 23/27] fs: add support for mapping an ITER_BVEC for O_DIRECT Jens Axboe
2018-12-11 0:15 ` [PATCH 24/27] aio: add support for pre-mapped user IO buffers Jens Axboe
2018-12-11 0:15 ` [PATCH 25/27] aio: split old ring complete out from aio_complete() Jens Axboe
2018-12-11 0:15 ` [PATCH 26/27] aio: add support for submission/completion rings Jens Axboe
2018-12-11 0:15 ` [PATCH 27/27] aio: support kernel side submission for aio with SCQRING Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181211001549.30085-21-axboe@kernel.dk \
--to=axboe@kernel.dk \
--cc=clm@fb.com \
--cc=hch@lst.de \
--cc=jmoyer@redhat.com \
--cc=linux-aio@kvack.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).