public inbox for [email protected]
 help / color / mirror / Atom feed
From: Stefan Roesch <[email protected]>
To: <[email protected]>, <[email protected]>,
	<[email protected]>
Cc: <[email protected]>, <[email protected]>, Jens Axboe <[email protected]>
Subject: [PATCH v4 03/12] io_uring: change ring size calculation for CQE32
Date: Tue, 26 Apr 2022 11:21:25 -0700	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

This changes the function rings_size to take large CQE's into account.

Co-developed-by: Jens Axboe <[email protected]>
Signed-off-by: Stefan Roesch <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
Reviewed-by: Kanchan Joshi <[email protected]>
---
 fs/io_uring.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index bf2b02518332..9712483d3a17 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -9693,8 +9693,8 @@ static void *io_mem_alloc(size_t size)
 	return (void *) __get_free_pages(gfp, get_order(size));
 }
 
-static unsigned long rings_size(unsigned sq_entries, unsigned cq_entries,
-				size_t *sq_offset)
+static unsigned long rings_size(struct io_ring_ctx *ctx, unsigned int sq_entries,
+				unsigned int cq_entries, size_t *sq_offset)
 {
 	struct io_rings *rings;
 	size_t off, sq_array_size;
@@ -9702,6 +9702,10 @@ static unsigned long rings_size(unsigned sq_entries, unsigned cq_entries,
 	off = struct_size(rings, cqes, cq_entries);
 	if (off == SIZE_MAX)
 		return SIZE_MAX;
+	if (ctx->flags & IORING_SETUP_CQE32) {
+		if (check_shl_overflow(off, 1, &off))
+			return SIZE_MAX;
+	}
 
 #ifdef CONFIG_SMP
 	off = ALIGN(off, SMP_CACHE_BYTES);
@@ -11365,7 +11369,7 @@ static __cold int io_allocate_scq_urings(struct io_ring_ctx *ctx,
 	ctx->sq_entries = p->sq_entries;
 	ctx->cq_entries = p->cq_entries;
 
-	size = rings_size(p->sq_entries, p->cq_entries, &sq_array_offset);
+	size = rings_size(ctx, p->sq_entries, p->cq_entries, &sq_array_offset);
 	if (size == SIZE_MAX)
 		return -EOVERFLOW;
 
-- 
2.30.2


  parent reply	other threads:[~2022-04-26 18:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-26 18:21 [PATCH v4 00/12] add large CQE support for io-uring Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 01/12] io_uring: support CQE32 in io_uring_cqe Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 02/12] io_uring: store add. return values for CQE32 Stefan Roesch
2022-04-26 18:21 ` Stefan Roesch [this message]
2022-04-26 18:21 ` [PATCH v4 04/12] io_uring: add CQE32 setup processing Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 05/12] io_uring: add CQE32 completion processing Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 06/12] io_uring: modify io_get_cqe for CQE32 Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 07/12] io_uring: flush completions " Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 08/12] io_uring: overflow processing " Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 09/12] io_uring: add tracing for additional CQE32 fields Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 10/12] io_uring: support CQE32 in /proc info Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 11/12] io_uring: enable CQE32 Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 12/12] io_uring: support CQE32 for nop operation Stefan Roesch
2022-04-26 22:58 ` [PATCH v4 00/12] add large CQE support for io-uring 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 \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /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