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 <dkadashev@xxxxxxxxx>
> ---
> 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
