From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: [email protected], [email protected]
Subject: [RFC 2/7] io_uring: add reg-buffer data directions
Date: Sun, 30 Apr 2023 10:35:24 +0100 [thread overview]
Message-ID: <01cf42c097ca12984b6dbe01407319b05b123824.1682701588.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
There will be buffers that only allow reading from or writing to it, so
add data directions, and check it when importing a buffer.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/rsrc.c | 5 +++++
io_uring/rsrc.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index fef94f8d788d..b6305ae3538c 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -1185,6 +1185,7 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, struct iovec *iov,
imu->ubuf = (unsigned long) iov->iov_base;
imu->ubuf_end = imu->ubuf + iov->iov_len;
imu->nr_bvecs = nr_pages;
+ imu->dir_mask = (1U << ITER_SOURCE) | (1U << ITER_DEST);
*pimu = imu;
ret = 0;
@@ -1274,6 +1275,8 @@ int io_import_fixed(int ddir, struct iov_iter *iter,
u64 buf_end;
size_t offset;
+ BUILD_BUG_ON((1U << ITER_SOURCE) & (1U << ITER_DEST));
+
if (WARN_ON_ONCE(!imu))
return -EFAULT;
if (unlikely(check_add_overflow(buf_addr, (u64)len, &buf_end)))
@@ -1281,6 +1284,8 @@ int io_import_fixed(int ddir, struct iov_iter *iter,
/* not inside the mapped region */
if (unlikely(buf_addr < imu->ubuf || buf_end > imu->ubuf_end))
return -EFAULT;
+ if (unlikely(!((1U << ddir) & imu->dir_mask)))
+ return -EFAULT;
/*
* Might not be a start of buffer, set size appropriately
diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index f34de451a79a..10daa25d9194 100644
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -57,6 +57,7 @@ struct io_mapped_ubuf {
u64 ubuf_end;
unsigned int nr_bvecs;
unsigned int max_bvecs;
+ unsigned int dir_mask;
unsigned long acct_pages;
struct bio_vec bvec[];
};
--
2.40.0
next prev parent reply other threads:[~2023-04-30 9:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-30 9:35 [RFC 0/7] Rethinking splice Pavel Begunkov
2023-04-30 9:35 ` [RFC 1/7] io_uring: add io_mapped_ubuf caches Pavel Begunkov
2023-04-30 9:35 ` Pavel Begunkov [this message]
2023-04-30 9:35 ` [RFC 3/7] io_uring: fail loop_rw_iter with pure bvec bufs Pavel Begunkov
2023-04-30 9:35 ` [RFC 4/7] io_uring/rsrc: introduce struct iou_buf_desc Pavel Begunkov
2023-04-30 9:35 ` [RFC 5/7] io_uring/rsrc: add buffer release callbacks Pavel Begunkov
2023-04-30 9:35 ` [RFC 6/7] io_uring/rsrc: introduce helper installing one buffer Pavel Begunkov
2023-04-30 9:35 ` [RFC 7/7] io_uring,fs: introduce IORING_OP_GET_BUF Pavel Begunkov
2023-05-02 14:57 ` Ming Lei
2023-05-02 15:20 ` Ming Lei
2023-05-03 14:54 ` Pavel Begunkov
2023-05-04 2:06 ` Ming Lei
2023-05-08 2:30 ` Pavel Begunkov
2023-05-17 4:05 ` Ming Lei
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=01cf42c097ca12984b6dbe01407319b05b123824.1682701588.git.asml.silence@gmail.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