From: Chenliang Li <cliang01.li@samsung.com>
To: axboe@kernel.dk, asml.silence@gmail.com
Cc: io-uring@vger.kernel.org, peiwei.li@samsung.com,
joshi.k@samsung.com, kundan.kumar@samsung.com,
anuj20.g@samsung.com, gost.dev@samsung.com,
Chenliang Li <cliang01.li@samsung.com>
Subject: [PATCH v4 1/4] io_uring/rsrc: add hugepage buffer coalesce helpers
Date: Tue, 14 May 2024 15:54:41 +0800 [thread overview]
Message-ID: <20240514075444.590910-2-cliang01.li@samsung.com> (raw)
In-Reply-To: <20240514075444.590910-1-cliang01.li@samsung.com>
Introduce helper functions to check whether a buffer can
be coalesced or not, and gather folio data for later use.
The coalescing optimizes time and space consumption caused
by mapping and storing multi-hugepage fixed buffers.
A coalescable multi-hugepage buffer should fully cover its folios
(except potentially the first and last one), and these folios should
have the same size. These requirements are for easier later process,
also we need same size'd chunks in io_import_fixed for fast iov_iter
adjust.
Signed-off-by: Chenliang Li <cliang01.li@samsung.com>
---
io_uring/rsrc.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++
io_uring/rsrc.h | 10 +++++++
2 files changed, 88 insertions(+)
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 65417c9553b1..d08224c0c5b0 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -871,6 +871,84 @@ static int io_buffer_account_pin(struct io_ring_ctx *ctx, struct page **pages,
return ret;
}
+static bool __io_sqe_buffer_try_coalesce(struct page **pages, int nr_pages,
+ struct io_imu_folio_data *data)
+{
+ struct folio *folio = page_folio(pages[0]);
+ unsigned int count = 1;
+ int i;
+
+ data->nr_pages_mid = folio_nr_pages(folio);
+ if (data->nr_pages_mid == 1)
+ return false;
+
+ data->folio_shift = folio_shift(folio);
+ data->folio_size = folio_size(folio);
+ data->nr_folios = 1;
+ /*
+ * Check if pages are contiguous inside a folio, and all folios have
+ * the same page count except for the head and tail.
+ */
+ for (i = 1; i < nr_pages; i++) {
+ if (page_folio(pages[i]) == folio &&
+ pages[i] == pages[i-1] + 1) {
+ count++;
+ continue;
+ }
+
+ if (data->nr_folios == 1)
+ data->nr_pages_head = count;
+ else if (count != data->nr_pages_mid)
+ return false;
+
+ folio = page_folio(pages[i]);
+ if (folio_size(folio) != data->folio_size)
+ return false;
+
+ count = 1;
+ data->nr_folios++;
+ }
+ if (data->nr_folios == 1)
+ data->nr_pages_head = count;
+
+ return true;
+}
+
+static bool io_sqe_buffer_try_coalesce(struct page **pages, int nr_pages,
+ struct io_imu_folio_data *data)
+{
+ int i, j;
+
+ if (nr_pages <= 1 ||
+ !__io_sqe_buffer_try_coalesce(pages, nr_pages, data))
+ return false;
+
+ /*
+ * The pages are bound to the folio, it doesn't
+ * actually unpin them but drops all but one reference,
+ * which is usually put down by io_buffer_unmap().
+ * Note, needs a better helper.
+ */
+ if (data->nr_pages_head > 1)
+ unpin_user_pages(&pages[1], data->nr_pages_head - 1);
+
+ j = data->nr_pages_head;
+ nr_pages -= data->nr_pages_head;
+ for (i = 1; i < data->nr_folios; i++) {
+ unsigned int nr_unpin;
+
+ nr_unpin = min_t(unsigned int, nr_pages - 1,
+ data->nr_pages_mid - 1);
+ if (nr_unpin == 0)
+ break;
+ unpin_user_pages(&pages[j+1], nr_unpin);
+ j += data->nr_pages_mid;
+ nr_pages -= data->nr_pages_mid;
+ }
+
+ return true;
+}
+
static int io_sqe_buffer_register(struct io_ring_ctx *ctx, struct iovec *iov,
struct io_mapped_ubuf **pimu,
struct page **last_hpage)
diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index c032ca3436ca..b2a9d66b76dd 100644
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -50,6 +50,16 @@ struct io_mapped_ubuf {
struct bio_vec bvec[] __counted_by(nr_bvecs);
};
+struct io_imu_folio_data {
+ /* Head folio can be partially included in the fixed buf */
+ unsigned int nr_pages_head;
+ /* For non-head/tail folios, has to be fully included */
+ unsigned int nr_pages_mid;
+ unsigned int nr_folios;
+ unsigned int folio_shift;
+ size_t folio_size;
+};
+
void io_rsrc_node_ref_zero(struct io_rsrc_node *node);
void io_rsrc_node_destroy(struct io_ring_ctx *ctx, struct io_rsrc_node *ref_node);
struct io_rsrc_node *io_rsrc_node_alloc(struct io_ring_ctx *ctx);
--
2.34.1
next prev parent reply other threads:[~2024-05-14 7:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20240514075453epcas5p17974fb62d65a88b1a1b55b97942ee2be@epcas5p1.samsung.com>
2024-05-14 7:54 ` [PATCH v4 0/4] io_uring/rsrc: coalescing multi-hugepage registered buffers Chenliang Li
[not found] ` <CGME20240514075457epcas5p10f02f1746f957df91353724ec859664f@epcas5p1.samsung.com>
2024-05-14 7:54 ` Chenliang Li [this message]
2024-05-16 14:07 ` [PATCH v4 1/4] io_uring/rsrc: add hugepage buffer coalesce helpers Anuj gupta
[not found] ` <CGME20240514075459epcas5p2275b4c26f16bcfcea200e97fc75c2a14@epcas5p2.samsung.com>
2024-05-14 7:54 ` [PATCH v4 2/4] io_uring/rsrc: store folio shift and mask into imu Chenliang Li
2024-05-16 14:08 ` Anuj gupta
[not found] ` <CGME20240514075500epcas5p1e638b1ae84727b3669ff6b780cd1cb23@epcas5p1.samsung.com>
2024-05-14 7:54 ` [PATCH v4 3/4] io_uring/rsrc: add init and account functions for coalesced imus Chenliang Li
[not found] ` <CGME20240514075502epcas5p10be6bef71d284a110277575d6008563d@epcas5p1.samsung.com>
2024-05-14 7:54 ` [PATCH v4 4/4] io_uring/rsrc: enable multi-hugepage buffer coalescing Chenliang Li
2024-05-16 14:09 ` Anuj gupta
2024-05-16 14:01 ` [PATCH v4 0/4] io_uring/rsrc: coalescing multi-hugepage registered buffers Anuj gupta
2024-05-16 14:58 ` 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=20240514075444.590910-2-cliang01.li@samsung.com \
--to=cliang01.li@samsung.com \
--cc=anuj20.g@samsung.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=gost.dev@samsung.com \
--cc=io-uring@vger.kernel.org \
--cc=joshi.k@samsung.com \
--cc=kundan.kumar@samsung.com \
--cc=peiwei.li@samsung.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).