Commit f4c163dd authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: split out fadvise/madvise operations 



Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0d584727

io_uring/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ 
# Makefile for io_uring



obj-$(CONFIG_IO_URING)		+= io_uring.o xattr.o nop.o fs.o splice.o \

					sync.o

					sync.o advise.o

obj-$(CONFIG_IO_WQ)		+= io-wq.o

io_uring/advise.c

0 → 100644
+100 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/kernel.h>

#include <linux/errno.h>

#include <linux/fs.h>

#include <linux/file.h>

#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/namei.h>

#include <linux/io_uring.h>



#include <uapi/linux/fadvise.h>

#include <uapi/linux/io_uring.h>



#include "io_uring_types.h"

#include "io_uring.h"

#include "advise.h"



struct io_fadvise {

	struct file			*file;

	u64				offset;

	u32				len;

	u32				advice;

};



struct io_madvise {

	struct file			*file;

	u64				addr;

	u32				len;

	u32				advice;

};



int io_madvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

#if defined(CONFIG_ADVISE_SYSCALLS) && defined(CONFIG_MMU)

	struct io_madvise *ma = io_kiocb_to_cmd(req);



	if (sqe->buf_index || sqe->off || sqe->splice_fd_in)

		return -EINVAL;



	ma->addr = READ_ONCE(sqe->addr);

	ma->len = READ_ONCE(sqe->len);

	ma->advice = READ_ONCE(sqe->fadvise_advice);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



int io_madvise(struct io_kiocb *req, unsigned int issue_flags)

{

#if defined(CONFIG_ADVISE_SYSCALLS) && defined(CONFIG_MMU)

	struct io_madvise *ma = io_kiocb_to_cmd(req);

	int ret;



	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;



	ret = do_madvise(current->mm, ma->addr, ma->len, ma->advice);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

#else

	return -EOPNOTSUPP;

#endif

}



int io_fadvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_fadvise *fa = io_kiocb_to_cmd(req);



	if (sqe->buf_index || sqe->addr || sqe->splice_fd_in)

		return -EINVAL;



	fa->offset = READ_ONCE(sqe->off);

	fa->len = READ_ONCE(sqe->len);

	fa->advice = READ_ONCE(sqe->fadvise_advice);

	return 0;

}



int io_fadvise(struct io_kiocb *req, unsigned int issue_flags)

{

	struct io_fadvise *fa = io_kiocb_to_cmd(req);

	int ret;



	if (issue_flags & IO_URING_F_NONBLOCK) {

		switch (fa->advice) {

		case POSIX_FADV_NORMAL:

		case POSIX_FADV_RANDOM:

		case POSIX_FADV_SEQUENTIAL:

			break;

		default:

			return -EAGAIN;

		}

	}



	ret = vfs_fadvise(req->file, fa->offset, fa->len, fa->advice);

	if (ret < 0)

		req_set_fail(req);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

}

io_uring/advise.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



int io_madvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);

int io_madvise(struct io_kiocb *req, unsigned int issue_flags);



int io_fadvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);

int io_fadvise(struct io_kiocb *req, unsigned int issue_flags);

io_uring/io_uring.c

+1 −84
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#include "fs.h"

#include "splice.h"

#include "sync.h"

#include "advise.h"



#define IORING_MAX_ENTRIES	32768

#define IORING_MAX_CQ_ENTRIES	(2 * IORING_MAX_ENTRIES)
@@ -408,20 +409,6 @@ struct io_rsrc_update { 
	u32				offset;

};



struct io_fadvise {

	struct file			*file;

	u64				offset;

	u32				len;

	u32				advice;

};



struct io_madvise {

	struct file			*file;

	u64				addr;

	u32				len;

	u32				advice;

};



struct io_epoll {

	struct file			*file;

	int				epfd;
@@ -4428,76 +4415,6 @@ static int io_epoll_ctl(struct io_kiocb *req, unsigned int issue_flags) 
#endif

}



static int io_madvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

#if defined(CONFIG_ADVISE_SYSCALLS) && defined(CONFIG_MMU)

	struct io_madvise *ma = io_kiocb_to_cmd(req);



	if (sqe->buf_index || sqe->off || sqe->splice_fd_in)

		return -EINVAL;



	ma->addr = READ_ONCE(sqe->addr);

	ma->len = READ_ONCE(sqe->len);

	ma->advice = READ_ONCE(sqe->fadvise_advice);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



static int io_madvise(struct io_kiocb *req, unsigned int issue_flags)

{

#if defined(CONFIG_ADVISE_SYSCALLS) && defined(CONFIG_MMU)

	struct io_madvise *ma = io_kiocb_to_cmd(req);

	int ret;



	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;



	ret = do_madvise(current->mm, ma->addr, ma->len, ma->advice);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

#else

	return -EOPNOTSUPP;

#endif

}



static int io_fadvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_fadvise *fa = io_kiocb_to_cmd(req);



	if (sqe->buf_index || sqe->addr || sqe->splice_fd_in)

		return -EINVAL;



	fa->offset = READ_ONCE(sqe->off);

	fa->len = READ_ONCE(sqe->len);

	fa->advice = READ_ONCE(sqe->fadvise_advice);

	return 0;

}



static int io_fadvise(struct io_kiocb *req, unsigned int issue_flags)

{

	struct io_fadvise *fa = io_kiocb_to_cmd(req);

	int ret;



	if (issue_flags & IO_URING_F_NONBLOCK) {

		switch (fa->advice) {

		case POSIX_FADV_NORMAL:

		case POSIX_FADV_RANDOM:

		case POSIX_FADV_SEQUENTIAL:

			break;

		default:

			return -EAGAIN;

		}

	}



	ret = vfs_fadvise(req->file, fa->offset, fa->len, fa->advice);

	if (ret < 0)

		req_set_fail(req);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

}



static int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	struct io_statx *sx = io_kiocb_to_cmd(req);