From: Pavel Begunkov <[email protected]>
To: Dmitry Kadashev <[email protected]>,
Jens Axboe <[email protected]>,
Alexander Viro <[email protected]>,
Christian Brauner <[email protected]>
Cc: [email protected], [email protected]
Subject: Re: [PATCH v5 02/10] io_uring: add support for IORING_OP_MKDIRAT
Date: Tue, 22 Jun 2021 18:41:23 +0100 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
On 6/3/21 6:18 AM, Dmitry Kadashev wrote:
> IORING_OP_MKDIRAT behaves like mkdirat(2) and takes the same flags
> and arguments.
Jens, a fold-in er discussed, and it will get you
a conflict at 8/10
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 4b215e0f8dd8..c0e469ebd22d 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3589,7 +3589,7 @@ static int io_mkdirat(struct io_kiocb *req, int issue_flags)
req->flags &= ~REQ_F_NEED_CLEANUP;
if (ret < 0)
- req_set_fail_links(req);
+ req_set_fail(req);
io_req_complete(req, ret);
return 0;
}
> Signed-off-by: Dmitry Kadashev <[email protected]>
> ---
> fs/io_uring.c | 55 +++++++++++++++++++++++++++++++++++
> include/uapi/linux/io_uring.h | 1 +
> 2 files changed, 56 insertions(+)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index a1ca6badff36..8ab4eb559520 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -665,6 +665,13 @@ struct io_unlink {
> struct filename *filename;
> };
>
> +struct io_mkdir {
> + struct file *file;
> + int dfd;
> + umode_t mode;
> + struct filename *filename;
> +};
> +
> struct io_completion {
> struct file *file;
> struct list_head list;
> @@ -809,6 +816,7 @@ struct io_kiocb {
> struct io_shutdown shutdown;
> struct io_rename rename;
> struct io_unlink unlink;
> + struct io_mkdir mkdir;
> /* use only after cleaning per-op data, see io_clean_op() */
> struct io_completion compl;
> };
> @@ -1021,6 +1029,7 @@ static const struct io_op_def io_op_defs[] = {
> },
> [IORING_OP_RENAMEAT] = {},
> [IORING_OP_UNLINKAT] = {},
> + [IORING_OP_MKDIRAT] = {},
> };
>
> static bool io_disarm_next(struct io_kiocb *req);
> @@ -3530,6 +3539,44 @@ static int io_unlinkat(struct io_kiocb *req, unsigned int issue_flags)
> return 0;
> }
>
> +static int io_mkdirat_prep(struct io_kiocb *req,
> + const struct io_uring_sqe *sqe)
> +{
> + struct io_mkdir *mkd = &req->mkdir;
> + const char __user *fname;
> +
> + if (unlikely(req->flags & REQ_F_FIXED_FILE))
> + return -EBADF;
> +
> + mkd->dfd = READ_ONCE(sqe->fd);
> + mkd->mode = READ_ONCE(sqe->len);
> +
> + fname = u64_to_user_ptr(READ_ONCE(sqe->addr));
> + mkd->filename = getname(fname);
> + if (IS_ERR(mkd->filename))
> + return PTR_ERR(mkd->filename);
> +
> + req->flags |= REQ_F_NEED_CLEANUP;
> + return 0;
> +}
> +
> +static int io_mkdirat(struct io_kiocb *req, int issue_flags)
> +{
> + struct io_mkdir *mkd = &req->mkdir;
> + int ret;
> +
> + if (issue_flags & IO_URING_F_NONBLOCK)
> + return -EAGAIN;
> +
> + ret = do_mkdirat(mkd->dfd, mkd->filename, mkd->mode);
> +
> + req->flags &= ~REQ_F_NEED_CLEANUP;
> + if (ret < 0)
> + req_set_fail_links(req);
> + io_req_complete(req, ret);
> + return 0;
> +}
> +
> static int io_shutdown_prep(struct io_kiocb *req,
> const struct io_uring_sqe *sqe)
> {
> @@ -5936,6 +5983,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_MKDIRAT:
> + return io_mkdirat_prep(req, sqe);
> }
>
> printk_once(KERN_WARNING "io_uring: unhandled opcode %d\n",
> @@ -6077,6 +6126,9 @@ static void io_clean_op(struct io_kiocb *req)
> case IORING_OP_UNLINKAT:
> putname(req->unlink.filename);
> break;
> + case IORING_OP_MKDIRAT:
> + putname(req->mkdir.filename);
> + break;
> }
> req->flags &= ~REQ_F_NEED_CLEANUP;
> }
> @@ -6203,6 +6255,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_MKDIRAT:
> + ret = io_mkdirat(req, issue_flags);
> + break;
> default:
> ret = -EINVAL;
> break;
> diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
> index e1ae46683301..bf9d720d371f 100644
> --- a/include/uapi/linux/io_uring.h
> +++ b/include/uapi/linux/io_uring.h
> @@ -137,6 +137,7 @@ enum {
> IORING_OP_SHUTDOWN,
> IORING_OP_RENAMEAT,
> IORING_OP_UNLINKAT,
> + IORING_OP_MKDIRAT,
>
> /* this goes last, obviously */
> IORING_OP_LAST,
>
--
Pavel Begunkov
next prev parent reply other threads:[~2021-06-22 17:41 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 5:18 [PATCH v5 00/10] io_uring: add mkdir, [sym]linkat and mknodat support Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 01/10] fs: make do_mkdirat() take struct filename Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 02/10] io_uring: add support for IORING_OP_MKDIRAT Dmitry Kadashev
2021-06-22 11:41 ` Pavel Begunkov
2021-06-22 11:50 ` Pavel Begunkov
2021-06-23 6:41 ` Dmitry Kadashev
2021-06-23 11:53 ` Pavel Begunkov
2021-06-24 11:11 ` Dmitry Kadashev
2021-06-24 12:21 ` Pavel Begunkov
2021-06-28 8:17 ` Dmitry Kadashev
2021-07-07 14:06 ` Pavel Begunkov
2021-07-12 12:44 ` Dmitry Kadashev
2021-07-12 13:14 ` Pavel Begunkov
2021-06-22 17:41 ` Pavel Begunkov [this message]
2021-06-23 0:41 ` Jens Axboe
2021-06-23 5:50 ` Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 03/10] fs: make do_mknodat() take struct filename Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 04/10] fs: make do_symlinkat() " Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 05/10] namei: add getname_uflags() Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 06/10] fs: make do_linkat() take struct filename Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 07/10] fs: update do_*() helpers to return ints Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 08/10] io_uring: add support for IORING_OP_SYMLINKAT Dmitry Kadashev
2021-06-22 11:36 ` Pavel Begunkov
2021-06-23 5:45 ` Dmitry Kadashev
2021-06-03 5:18 ` [PATCH v5 09/10] io_uring: add support for IORING_OP_LINKAT Dmitry Kadashev
2021-06-22 11:48 ` Pavel Begunkov
2021-06-23 6:09 ` Dmitry Kadashev
2021-06-23 13:13 ` Pavel Begunkov
2021-06-03 5:18 ` [PATCH v5 10/10] io_uring: add support for IORING_OP_MKNODAT Dmitry Kadashev
2021-06-22 11:52 ` Pavel Begunkov
2021-06-23 6:26 ` Dmitry Kadashev
2021-06-23 11:58 ` Pavel Begunkov
2021-06-24 2:36 ` Jens Axboe
2021-06-18 6:24 ` [PATCH v5 00/10] io_uring: add mkdir, [sym]linkat and mknodat support Dmitry Kadashev
2021-06-18 16:10 ` Jens Axboe
2021-06-21 15:21 ` Jens Axboe
2021-06-22 8:12 ` Christian Brauner
2021-06-22 8:34 ` Dmitry Kadashev
2021-06-29 13:06 ` Christian Brauner
2021-06-22 17:26 ` Jens Axboe
2021-06-22 8:26 ` Dmitry Kadashev
2021-06-21 15:57 ` Jens Axboe
2021-06-21 15:59 ` Jens Axboe
2021-06-22 11:56 ` Pavel Begunkov
2021-06-22 17:26 ` Jens Axboe
2021-06-22 17:28 ` Pavel Begunkov
2021-06-22 17:32 ` Jens Axboe
2021-06-23 5:37 ` Dmitry Kadashev
2021-06-23 5:49 ` Dmitry Kadashev
2021-06-24 2:37 ` Jens Axboe
2021-06-24 10:55 ` Dmitry Kadashev
2021-06-23 5:35 ` Dmitry Kadashev
2021-06-24 2:37 ` 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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[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