From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>, io-uring@vger.kernel.org
Cc: Ming Lei <ming.lei@redhat.com>
Subject: [PATCH] io_uring: add IORING_OP_NOP_FAIL
Date: Thu, 9 May 2024 10:34:13 +0800 [thread overview]
Message-ID: <20240509023413.4124075-1-ming.lei@redhat.com> (raw)
Add IORING_OP_NOP_FAIL so that it is easy to inject failure from
userspace.
Like IORING_OP_NOP, the main use case is test, and it is very helpful
for covering failure handling code in io_uring core change.
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
include/uapi/linux/io_uring.h | 2 ++
io_uring/nop.c | 27 +++++++++++++++++++++++++++
io_uring/nop.h | 3 +++
io_uring/opdef.c | 9 +++++++++
4 files changed, 41 insertions(+)
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 922f29b07ccc..18e58477e0f0 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -72,6 +72,7 @@ struct io_uring_sqe {
__u32 waitid_flags;
__u32 futex_flags;
__u32 install_fd_flags;
+ __s32 nop_fail_res;
};
__u64 user_data; /* data to be passed back at completion time */
/* pack this to avoid bogus arm OABI complaints */
@@ -259,6 +260,7 @@ enum io_uring_op {
IORING_OP_FUTEX_WAITV,
IORING_OP_FIXED_FD_INSTALL,
IORING_OP_FTRUNCATE,
+ IORING_OP_NOP_FAIL,
/* this goes last, obviously */
IORING_OP_LAST,
diff --git a/io_uring/nop.c b/io_uring/nop.c
index d956599a3c1b..c30547e53b5c 100644
--- a/io_uring/nop.c
+++ b/io_uring/nop.c
@@ -10,6 +10,12 @@
#include "io_uring.h"
#include "nop.h"
+struct io_nop_fail {
+ /* NOTE: kiocb has the file as the first member, so don't do it here */
+ struct file *file;
+ int res;
+};
+
int io_nop_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
return 0;
@@ -23,3 +29,24 @@ int io_nop(struct io_kiocb *req, unsigned int issue_flags)
io_req_set_res(req, 0, 0);
return IOU_OK;
}
+
+int io_nop_fail_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
+{
+ struct io_nop_fail *nf = io_kiocb_to_cmd(req, struct io_nop_fail);
+
+ nf->res = READ_ONCE(sqe->nop_fail_res);
+ return 0;
+}
+
+/*
+ * IORING_OP_NOP just posts a completion event, nothing else.
+ */
+int io_nop_fail(struct io_kiocb *req, unsigned int issue_flags)
+{
+ struct io_nop_fail *nf = io_kiocb_to_cmd(req, struct io_nop_fail);
+
+ if (nf->res < 0)
+ req_set_fail(req);
+ io_req_set_res(req, nf->res, 0);
+ return IOU_OK;
+}
diff --git a/io_uring/nop.h b/io_uring/nop.h
index 97f1535c9dec..ef40d3b15899 100644
--- a/io_uring/nop.h
+++ b/io_uring/nop.h
@@ -2,3 +2,6 @@
int io_nop_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
int io_nop(struct io_kiocb *req, unsigned int issue_flags);
+
+int io_nop_fail_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
+int io_nop_fail(struct io_kiocb *req, unsigned int issue_flags);
diff --git a/io_uring/opdef.c b/io_uring/opdef.c
index 92b657a063a0..eadc5a12ee06 100644
--- a/io_uring/opdef.c
+++ b/io_uring/opdef.c
@@ -56,6 +56,12 @@ const struct io_issue_def io_issue_defs[] = {
.prep = io_nop_prep,
.issue = io_nop,
},
+ [IORING_OP_NOP_FAIL] = {
+ .audit_skip = 1,
+ .iopoll = 1,
+ .prep = io_nop_fail_prep,
+ .issue = io_nop_fail,
+ },
[IORING_OP_READV] = {
.needs_file = 1,
.unbound_nonreg_file = 1,
@@ -506,6 +512,9 @@ const struct io_cold_def io_cold_defs[] = {
[IORING_OP_NOP] = {
.name = "NOP",
},
+ [IORING_OP_NOP_FAIL] = {
+ .name = "NOP_FAIL",
+ },
[IORING_OP_READV] = {
.name = "READV",
.cleanup = io_readv_writev_cleanup,
--
2.44.0
next reply other threads:[~2024-05-09 2:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 2:34 Ming Lei [this message]
2024-05-09 2:55 ` [PATCH] io_uring: add IORING_OP_NOP_FAIL Jens Axboe
2024-05-09 3:05 ` Ming Lei
2024-05-09 4:03 ` Ming Lei
2024-05-09 14:02 ` 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=20240509023413.4124075-1-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).