From: Bijan Mottahedeh <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: [RFC 1/2] io_uring: disallow overlapping ranges for buffer registration
Date: Thu, 11 Jun 2020 19:23:36 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Buffer registration is expensive in terms of cpu/mem overhead and there
seems no good reason to allow overlapping ranges.
Signed-off-by: Bijan Mottahedeh <[email protected]>
---
fs/io_uring.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 9158130..4248726 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7211,6 +7211,12 @@ static int io_copy_iov(struct io_ring_ctx *ctx, struct iovec *dst,
return 0;
}
+static inline int iov_overlap(struct iovec *v1, struct iovec *v2)
+{
+ return (v1->iov_base <= (v2->iov_base + v2->iov_len - 1) &&
+ v2->iov_base <= (v1->iov_base + v1->iov_len - 1));
+}
+
static int io_sqe_buffer_register(struct io_ring_ctx *ctx, void __user *arg,
unsigned nr_args)
{
@@ -7233,7 +7239,7 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, void __user *arg,
struct io_mapped_ubuf *imu = &ctx->user_bufs[i];
unsigned long off, start, end, ubuf;
int pret, nr_pages;
- struct iovec iov;
+ struct iovec iov, prv_iov;
size_t size;
ret = io_copy_iov(ctx, &iov, arg, i);
@@ -7258,6 +7264,12 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, void __user *arg,
start = ubuf >> PAGE_SHIFT;
nr_pages = end - start;
+ /* disallow overlapping buffers */
+ if (i > 0 && iov_overlap(&prv_iov, &iov))
+ goto err;
+
+ prv_iov = iov;
+
if (ctx->account_mem) {
ret = io_account_mem(ctx->user, nr_pages);
if (ret)
--
1.8.3.1
next prev parent reply other threads:[~2020-06-12 2:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-12 2:23 [RFC 0/2] io_uring: disallow overlapping ranges for buffer registration Bijan Mottahedeh
2020-06-12 2:23 ` Bijan Mottahedeh [this message]
2020-06-12 15:16 ` [RFC 1/2] " Jens Axboe
2020-06-12 18:22 ` Bijan Mottahedeh
2020-06-14 15:56 ` Jens Axboe
2020-06-12 2:23 ` [RFC 2/2] io_uring: report pinned memory usage Bijan Mottahedeh
2020-06-12 15:16 ` Jens Axboe
2020-06-12 15:19 ` Jens Axboe
2020-06-12 15:50 ` Jens Axboe
2020-06-13 4:43 ` Bijan Mottahedeh
2020-06-14 15:57 ` 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=1591928617-19924-2-git-send-email-bijan.mottahedeh@oracle.com \
[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