From: Pavel Begunkov <asml.silence@gmail.com>
To: io-uring@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>, Andres Freund <andres@anarazel.de>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Darren Hart <dvhart@infradead.org>,
Davidlohr Bueso <dave@stgolabs.net>,
linux-kernel@vger.kernel.org
Subject: [RFC 2/4] io_uring: frame out futex op
Date: Tue, 1 Jun 2021 15:58:27 +0100 [thread overview]
Message-ID: <e0ccad0912374500dcd8df410ce684ddd10a7e96.1622558659.git.asml.silence@gmail.com> (raw)
In-Reply-To: <cover.1622558659.git.asml.silence@gmail.com>
Add userspace futex request definitions and draft some internal
functions.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
fs/io_uring.c | 23 +++++++++++++++++++++++
include/uapi/linux/io_uring.h | 9 +++++++++
2 files changed, 32 insertions(+)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index fc9325472e8d..2c6b14a3a4f6 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -77,6 +77,7 @@
#include <linux/splice.h>
#include <linux/task_work.h>
#include <linux/pagemap.h>
+#include <linux/futex.h>
#include <linux/io_uring.h>
#define CREATE_TRACE_POINTS
@@ -665,6 +666,10 @@ struct io_unlink {
struct filename *filename;
};
+struct io_futex {
+ struct file *file;
+};
+
struct io_completion {
struct file *file;
struct list_head list;
@@ -809,6 +814,7 @@ struct io_kiocb {
struct io_shutdown shutdown;
struct io_rename rename;
struct io_unlink unlink;
+ struct io_futex futex;
/* use only after cleaning per-op data, see io_clean_op() */
struct io_completion compl;
};
@@ -1021,6 +1027,7 @@ static const struct io_op_def io_op_defs[] = {
},
[IORING_OP_RENAMEAT] = {},
[IORING_OP_UNLINKAT] = {},
+ [IORING_OP_FUTEX] = {},
};
static bool io_disarm_next(struct io_kiocb *req);
@@ -5865,6 +5872,16 @@ static int io_files_update(struct io_kiocb *req, unsigned int issue_flags)
return 0;
}
+static int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
+{
+ return -EINVAL;
+}
+
+static int io_futex(struct io_kiocb *req, unsigned int issue_flags)
+{
+ return -EINVAL;
+}
+
static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
switch (req->opcode) {
@@ -5936,6 +5953,8 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return io_renameat_prep(req, sqe);
case IORING_OP_UNLINKAT:
return io_unlinkat_prep(req, sqe);
+ case IORING_OP_FUTEX:
+ return io_futex_prep(req, sqe);
}
printk_once(KERN_WARNING "io_uring: unhandled opcode %d\n",
@@ -6203,6 +6222,9 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
case IORING_OP_UNLINKAT:
ret = io_unlinkat(req, issue_flags);
break;
+ case IORING_OP_FUTEX:
+ ret = io_futex(req, issue_flags);
+ break;
default:
ret = -EINVAL;
break;
@@ -10158,6 +10180,7 @@ static int __init io_uring_init(void)
BUILD_BUG_SQE_ELEM(28, __u32, statx_flags);
BUILD_BUG_SQE_ELEM(28, __u32, fadvise_advice);
BUILD_BUG_SQE_ELEM(28, __u32, splice_flags);
+ BUILD_BUG_SQE_ELEM(28, __u32, futex_flags);
BUILD_BUG_SQE_ELEM(32, __u64, user_data);
BUILD_BUG_SQE_ELEM(40, __u16, buf_index);
BUILD_BUG_SQE_ELEM(42, __u16, personality);
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index e1ae46683301..6a1af5bb2ddf 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -44,6 +44,7 @@ struct io_uring_sqe {
__u32 splice_flags;
__u32 rename_flags;
__u32 unlink_flags;
+ __u32 futex_flags;
};
__u64 user_data; /* data to be passed back at completion time */
union {
@@ -137,6 +138,7 @@ enum {
IORING_OP_SHUTDOWN,
IORING_OP_RENAMEAT,
IORING_OP_UNLINKAT,
+ IORING_OP_FUTEX,
/* this goes last, obviously */
IORING_OP_LAST,
@@ -174,6 +176,13 @@ enum {
#define IORING_POLL_UPDATE_EVENTS (1U << 1)
#define IORING_POLL_UPDATE_USER_DATA (1U << 2)
+enum {
+ IORING_FUTEX_WAKE_OP = 0,
+
+ IORING_FUTEX_LAST,
+};
+
+
/*
* IO completion data structure (Completion Queue Entry)
*/
--
2.31.1
next prev parent reply other threads:[~2021-06-01 14:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 14:58 [RFC 0/4] futex request support Pavel Begunkov
2021-06-01 14:58 ` [RFC 1/4] futex: add op wake for a single key Pavel Begunkov
2021-06-01 14:58 ` Pavel Begunkov [this message]
2021-06-01 14:58 ` [RFC 3/4] io_uring: support futex wake requests Pavel Begunkov
2021-06-01 14:58 ` [RFC 4/4] io_uring: implement futex wait Pavel Begunkov
2021-06-01 15:45 ` Jens Axboe
2021-06-01 15:58 ` Pavel Begunkov
2021-06-01 16:01 ` Jens Axboe
2021-06-01 16:29 ` Pavel Begunkov
2021-06-01 21:53 ` Thomas Gleixner
2021-06-03 10:31 ` Pavel Begunkov
2021-06-04 9:19 ` Thomas Gleixner
2021-06-04 11:58 ` Pavel Begunkov
2021-06-05 2:09 ` Thomas Gleixner
2021-06-07 12:14 ` Pavel Begunkov
2021-06-03 19:03 ` Andres Freund
2021-06-03 21:10 ` Peter Zijlstra
2021-06-03 21:21 ` Andres Freund
2021-06-05 0:43 ` Thomas Gleixner
2021-06-07 11:31 ` Pavel Begunkov
2021-06-07 11:48 ` Peter Zijlstra
2021-06-03 18:59 ` [RFC 0/4] futex request support Andres Freund
2021-06-04 15:26 ` Pavel Begunkov
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=e0ccad0912374500dcd8df410ce684ddd10a7e96.1622558659.git.asml.silence@gmail.com \
--to=asml.silence@gmail.com \
--cc=andres@anarazel.de \
--cc=axboe@kernel.dk \
--cc=dave@stgolabs.net \
--cc=dvhart@infradead.org \
--cc=io-uring@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.