Skip to content

Commit

Permalink
io_uring: move xattr related opcodes to its own file
Browse files Browse the repository at this point in the history 
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
@axboe
axboe committed Jul 25, 2022
1 parent 97b388d commit 5e2a18d
Show file tree
Hide file tree
Showing 4 changed files with 277 additions and 247 deletions.
2 changes: 1 addition & 1 deletion io_uring/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
#
# Makefile for io_uring

obj-$(CONFIG_IO_URING) += io_uring.o
obj-$(CONFIG_IO_URING) += io_uring.o xattr.o
obj-$(CONFIG_IO_WQ) += io-wq.o
248 changes: 2 additions & 246 deletions io_uring/io_uring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
#include <linux/io_uring.h>
#include <linux/audit.h>
#include <linux/security.h>
#include <linux/xattr.h>

#define CREATE_TRACE_POINTS
#include <trace/events/io_uring.h>
Expand All @@ -93,6 +92,8 @@
#include "io_uring_types.h"
#include "io_uring.h"

#include "xattr.h"

#define IORING_MAX_ENTRIES 32768
#define IORING_MAX_CQ_ENTRIES (2 * IORING_MAX_ENTRIES)
#define IORING_SQPOLL_CAP_ENTRIES_VALUE 8
Expand Down Expand Up @@ -529,12 +530,6 @@ struct io_async_rw {
struct wait_page_queue wpq;
};

struct io_xattr {
struct file *file;
struct xattr_ctx ctx;
struct filename *filename;
};

struct async_poll {
struct io_poll poll;
struct io_poll *double_poll;
Expand Down Expand Up @@ -3904,245 +3899,6 @@ static void io_renameat_cleanup(struct io_kiocb *req)
putname(ren->newpath);
}

static inline void io_xattr_cleanup(struct io_kiocb *req)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);

if (ix->filename)
putname(ix->filename);

kfree(ix->ctx.kname);
kvfree(ix->ctx.kvalue);
}

static void io_xattr_finish(struct io_kiocb *req, int ret)
{
req->flags &= ~REQ_F_NEED_CLEANUP;

io_xattr_cleanup(req);
io_req_set_res(req, ret, 0);
}

static int __io_getxattr_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);
const char __user *name;
int ret;

if (unlikely(req->flags & REQ_F_FIXED_FILE))
return -EBADF;

ix->filename = NULL;
ix->ctx.kvalue = NULL;
name = u64_to_user_ptr(READ_ONCE(sqe->addr));
ix->ctx.cvalue = u64_to_user_ptr(READ_ONCE(sqe->addr2));
ix->ctx.size = READ_ONCE(sqe->len);
ix->ctx.flags = READ_ONCE(sqe->xattr_flags);

if (ix->ctx.flags)
return -EINVAL;

ix->ctx.kname = kmalloc(sizeof(*ix->ctx.kname), GFP_KERNEL);
if (!ix->ctx.kname)
return -ENOMEM;

ret = strncpy_from_user(ix->ctx.kname->name, name,
sizeof(ix->ctx.kname->name));
if (!ret || ret == sizeof(ix->ctx.kname->name))
ret = -ERANGE;
if (ret < 0) {
kfree(ix->ctx.kname);
return ret;
}

req->flags |= REQ_F_NEED_CLEANUP;
return 0;
}

static int io_fgetxattr_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe)
{
return __io_getxattr_prep(req, sqe);
}

static int io_getxattr_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);
const char __user *path;
int ret;

ret = __io_getxattr_prep(req, sqe);
if (ret)
return ret;

path = u64_to_user_ptr(READ_ONCE(sqe->addr3));

ix->filename = getname_flags(path, LOOKUP_FOLLOW, NULL);
if (IS_ERR(ix->filename)) {
ret = PTR_ERR(ix->filename);
ix->filename = NULL;
}

return ret;
}

static int io_fgetxattr(struct io_kiocb *req, unsigned int issue_flags)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);
int ret;

if (issue_flags & IO_URING_F_NONBLOCK)
return -EAGAIN;

ret = do_getxattr(mnt_user_ns(req->file->f_path.mnt),
req->file->f_path.dentry,
&ix->ctx);

io_xattr_finish(req, ret);
return IOU_OK;
}

static int io_getxattr(struct io_kiocb *req, unsigned int issue_flags)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);
unsigned int lookup_flags = LOOKUP_FOLLOW;
struct path path;
int ret;

if (issue_flags & IO_URING_F_NONBLOCK)
return -EAGAIN;

retry:
ret = filename_lookup(AT_FDCWD, ix->filename, lookup_flags, &path, NULL);
if (!ret) {
ret = do_getxattr(mnt_user_ns(path.mnt),
path.dentry,
&ix->ctx);

path_put(&path);
if (retry_estale(ret, lookup_flags)) {
lookup_flags |= LOOKUP_REVAL;
goto retry;
}
}

io_xattr_finish(req, ret);
return IOU_OK;
}

static int __io_setxattr_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);
const char __user *name;
int ret;

if (unlikely(req->flags & REQ_F_FIXED_FILE))
return -EBADF;

ix->filename = NULL;
name = u64_to_user_ptr(READ_ONCE(sqe->addr));
ix->ctx.cvalue = u64_to_user_ptr(READ_ONCE(sqe->addr2));
ix->ctx.kvalue = NULL;
ix->ctx.size = READ_ONCE(sqe->len);
ix->ctx.flags = READ_ONCE(sqe->xattr_flags);

ix->ctx.kname = kmalloc(sizeof(*ix->ctx.kname), GFP_KERNEL);
if (!ix->ctx.kname)
return -ENOMEM;

ret = setxattr_copy(name, &ix->ctx);
if (ret) {
kfree(ix->ctx.kname);
return ret;
}

req->flags |= REQ_F_NEED_CLEANUP;
return 0;
}

static int io_setxattr_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);
const char __user *path;
int ret;

ret = __io_setxattr_prep(req, sqe);
if (ret)
return ret;

path = u64_to_user_ptr(READ_ONCE(sqe->addr3));

ix->filename = getname_flags(path, LOOKUP_FOLLOW, NULL);
if (IS_ERR(ix->filename)) {
ret = PTR_ERR(ix->filename);
ix->filename = NULL;
}

return ret;
}

static int io_fsetxattr_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe)
{
return __io_setxattr_prep(req, sqe);
}

static int __io_setxattr(struct io_kiocb *req, unsigned int issue_flags,
struct path *path)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);
int ret;

ret = mnt_want_write(path->mnt);
if (!ret) {
ret = do_setxattr(mnt_user_ns(path->mnt), path->dentry, &ix->ctx);
mnt_drop_write(path->mnt);
}

return ret;
}

static int io_fsetxattr(struct io_kiocb *req, unsigned int issue_flags)
{
int ret;

if (issue_flags & IO_URING_F_NONBLOCK)
return -EAGAIN;

ret = __io_setxattr(req, issue_flags, &req->file->f_path);
io_xattr_finish(req, ret);
return IOU_OK;
}

static int io_setxattr(struct io_kiocb *req, unsigned int issue_flags)
{
struct io_xattr *ix = io_kiocb_to_cmd(req);
unsigned int lookup_flags = LOOKUP_FOLLOW;
struct path path;
int ret;

if (issue_flags & IO_URING_F_NONBLOCK)
return -EAGAIN;

retry:
ret = filename_lookup(AT_FDCWD, ix->filename, lookup_flags, &path, NULL);
if (!ret) {
ret = __io_setxattr(req, issue_flags, &path);
path_put(&path);
if (retry_estale(ret, lookup_flags)) {
lookup_flags |= LOOKUP_REVAL;
goto retry;
}
}

io_xattr_finish(req, ret);
return IOU_OK;
}

static int io_unlinkat_prep(struct io_kiocb *req,
const struct io_uring_sqe *sqe)
{
Expand Down
Loading

0 comments on commit 5e2a18d

Please sign in to comment.