lkml.org 
[lkml]   [2021]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC v2 13/19] io_uring: add an option to flush zc notifications
Date
Add IORING_SENDZC_FLUSH flag. If specified, a send zc operation on
success should also flush a corresponding ubuf_info.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
fs/io_uring.c | 26 +++++++++++++++++++-------
include/uapi/linux/io_uring.h | 4 ++++
2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 9452b4ec32b6..ec1f6c60a14c 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -608,6 +608,7 @@ struct io_sendzc {
int msg_flags;
int addr_len;
void __user *addr;
+ unsigned int zc_flags;
};

struct io_open {
@@ -1992,6 +1993,12 @@ static void io_uring_tx_zerocopy_callback(struct sk_buff *skb,
}
}

+static void io_tx_kill_notification(struct io_tx_ctx *tx_ctx)
+{
+ io_uring_tx_zerocopy_callback(NULL, &tx_ctx->notifier->uarg, true);
+ tx_ctx->notifier = NULL;
+}
+
static struct io_tx_notifier *io_alloc_tx_notifier(struct io_ring_ctx *ctx,
struct io_tx_ctx *tx_ctx)
{
@@ -5041,6 +5048,8 @@ static int io_send(struct io_kiocb *req, unsigned int issue_flags)
return 0;
}

+#define IO_SENDZC_VALID_FLAGS IORING_SENDZC_FLUSH
+
static int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
struct io_ring_ctx *ctx = req->ctx;
@@ -5049,8 +5058,6 @@ static int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL;
- if (READ_ONCE(sqe->ioprio))
- return -EINVAL;

sr->buf = u64_to_user_ptr(READ_ONCE(sqe->addr));
sr->len = READ_ONCE(sqe->len);
@@ -5067,6 +5074,10 @@ static int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
sr->addr = u64_to_user_ptr(READ_ONCE(sqe->addr2));
sr->addr_len = READ_ONCE(sqe->__pad2[0]);

+ req->msgzc.zc_flags = READ_ONCE(sqe->ioprio);
+ if (req->msgzc.zc_flags & ~IO_SENDZC_VALID_FLAGS)
+ return -EINVAL;
+
#ifdef CONFIG_COMPAT
if (req->ctx->compat)
sr->msg_flags |= MSG_CMSG_COMPAT;
@@ -5089,6 +5100,7 @@ static int io_sendzc(struct io_kiocb *req, unsigned int issue_flags)
sock = sock_from_file(req->file);
if (unlikely(!sock))
return -ENOTSOCK;
+
ret = import_single_range(WRITE, sr->buf, sr->len, &iov, &msg.msg_iter);
if (unlikely(ret))
return ret;
@@ -5128,6 +5140,8 @@ static int io_sendzc(struct io_kiocb *req, unsigned int issue_flags)
if (ret == -ERESTARTSYS)
ret = -EINTR;
req_set_fail(req);
+ } else if (req->msgzc.zc_flags & IORING_SENDZC_FLUSH) {
+ io_tx_kill_notification(req->msgzc.tx_ctx);
}
io_ring_submit_unlock(ctx, issue_flags & IO_URING_F_UNLOCKED);
__io_req_complete(req, issue_flags, ret, 0);
@@ -9417,11 +9431,9 @@ static void io_sqe_tx_ctx_kill_ubufs(struct io_ring_ctx *ctx)

for (i = 0; i < ctx->nr_tx_ctxs; i++) {
tx_ctx = &ctx->tx_ctxs[i];
- if (!tx_ctx->notifier)
- continue;
- io_uring_tx_zerocopy_callback(NULL, &tx_ctx->notifier->uarg,
- true);
- tx_ctx->notifier = NULL;
+
+ if (tx_ctx->notifier)
+ io_tx_kill_notification(tx_ctx);
}
}

diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index bbc78fe8ca77..ac18e8e6f86f 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -187,6 +187,10 @@ enum {
#define IORING_POLL_UPDATE_EVENTS (1U << 1)
#define IORING_POLL_UPDATE_USER_DATA (1U << 2)

+enum {
+ IORING_SENDZC_FLUSH = (1U << 0),
+};
+
/*
* IO completion data structure (Completion Queue Entry)
*/
--
2.34.1
\
 
 \ /
  Last update: 2021-12-21 16:37    [W:0.136 / U:0.936 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site