diff options
| author | Ming Lei <ming.lei@redhat.com> | 2024-05-10 05:50:28 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-05-10 14:09:45 +0200 |
| commit | deb1e496a83557896fe0cca0b8af01c2a97c0dc6 (patch) | |
| tree | 4ba1f6ec7371f33e7198d3b9fa1af94d80f6f996 /io_uring | |
| parent | io_uring: fail NOP if non-zero op flags is passed in (diff) | |
| download | linux-deb1e496a83557896fe0cca0b8af01c2a97c0dc6.tar.xz linux-deb1e496a83557896fe0cca0b8af01c2a97c0dc6.zip | |
io_uring: support to inject result for NOP
Support to inject result for NOP so that we can inject failure from
userspace. It is very helpful for covering failure handling code in
io_uring core change.
With nop flags, it becomes possible to add more test features on NOP in
future.
Suggested-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20240510035031.78874-3-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/nop.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/io_uring/nop.c b/io_uring/nop.c index 1a4e312dfe51..a5bcf3d6984f 100644 --- a/io_uring/nop.c +++ b/io_uring/nop.c @@ -10,18 +10,34 @@ #include "io_uring.h" #include "nop.h" +struct io_nop { + /* NOTE: kiocb has the file as the first member, so don't do it here */ + struct file *file; + int result; +}; + int io_nop_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { - if (READ_ONCE(sqe->rw_flags)) + unsigned int flags; + struct io_nop *nop = io_kiocb_to_cmd(req, struct io_nop); + + flags = READ_ONCE(sqe->nop_flags); + if (flags & ~IORING_NOP_INJECT_RESULT) return -EINVAL; + + if (flags & IORING_NOP_INJECT_RESULT) + nop->result = READ_ONCE(sqe->len); + else + nop->result = 0; return 0; } -/* - * IORING_OP_NOP just posts a completion event, nothing else. - */ int io_nop(struct io_kiocb *req, unsigned int issue_flags) { - io_req_set_res(req, 0, 0); + struct io_nop *nop = io_kiocb_to_cmd(req, struct io_nop); + + if (nop->result < 0) + req_set_fail(req); + io_req_set_res(req, nop->result, 0); return IOU_OK; } |