Commit 0d584727 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: split out fs related sync/fallocate functions 



This splits out sync_file_range, fsync, and fallocate.

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

io_uring/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ 
#

# Makefile for io_uring



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

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

					sync.o

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

io_uring/io_uring.c

+1 −96
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
#include "nop.h"

#include "fs.h"

#include "splice.h"

#include "sync.h"



#define IORING_MAX_ENTRIES	32768

#define IORING_MAX_CQ_ENTRIES	(2 * IORING_MAX_ENTRIES)
@@ -336,14 +337,6 @@ struct io_socket { 
	unsigned long			nofile;

};



struct io_sync {

	struct file			*file;

	loff_t				len;

	loff_t				off;

	int				flags;

	int				mode;

};



struct io_cancel {

	struct file			*file;

	u64				addr;
@@ -3941,67 +3934,6 @@ static int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags) 
	return IOU_OK;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);



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

		return -EINVAL;



	sync->flags = READ_ONCE(sqe->fsync_flags);

	if (unlikely(sync->flags & ~IORING_FSYNC_DATASYNC))

		return -EINVAL;



	sync->off = READ_ONCE(sqe->off);

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

	return 0;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);

	loff_t end = sync->off + sync->len;

	int ret;



	/* fsync always requires a blocking context */

	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;



	ret = vfs_fsync_range(req->file, sync->off, end > 0 ? end : LLONG_MAX,

				sync->flags & IORING_FSYNC_DATASYNC);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

}



static int io_fallocate_prep(struct io_kiocb *req,

			     const struct io_uring_sqe *sqe)

{

	struct io_sync *sync = io_kiocb_to_cmd(req);



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

		return -EINVAL;



	sync->off = READ_ONCE(sqe->off);

	sync->len = READ_ONCE(sqe->addr);

	sync->mode = READ_ONCE(sqe->len);

	return 0;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);

	int ret;



	/* fallocate always requiring blocking context */

	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;

	ret = vfs_fallocate(req->file, sync->mode, sync->off, sync->len);

	if (ret >= 0)

		fsnotify_modify(req->file);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

}



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

{

	struct io_open *open = io_kiocb_to_cmd(req);
@@ -4681,33 +4613,6 @@ static int io_close(struct io_kiocb *req, unsigned int issue_flags) 
	return IOU_OK;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);



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

		return -EINVAL;



	sync->off = READ_ONCE(sqe->off);

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

	sync->flags = READ_ONCE(sqe->sync_range_flags);

	return 0;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);

	int ret;



	/* sync_file_range always requires a blocking context */

	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;



	ret = sync_file_range(req->file, sync->off, sync->len, sync->flags);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

}



#if defined(CONFIG_NET)

static int io_shutdown_prep(struct io_kiocb *req,

			    const struct io_uring_sqe *sqe)

io_uring/sync.c

0 → 100644
+111 −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 <linux/fsnotify.h>



#include <uapi/linux/io_uring.h>



#include "io_uring_types.h"

#include "io_uring.h"

#include "sync.h"



struct io_sync {

	struct file			*file;

	loff_t				len;

	loff_t				off;

	int				flags;

	int				mode;

};



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);



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

		return -EINVAL;



	sync->off = READ_ONCE(sqe->off);

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

	sync->flags = READ_ONCE(sqe->sync_range_flags);

	return 0;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);

	int ret;



	/* sync_file_range always requires a blocking context */

	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;



	ret = sync_file_range(req->file, sync->off, sync->len, sync->flags);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);



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

		return -EINVAL;



	sync->flags = READ_ONCE(sqe->fsync_flags);

	if (unlikely(sync->flags & ~IORING_FSYNC_DATASYNC))

		return -EINVAL;



	sync->off = READ_ONCE(sqe->off);

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

	return 0;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);

	loff_t end = sync->off + sync->len;

	int ret;



	/* fsync always requires a blocking context */

	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;



	ret = vfs_fsync_range(req->file, sync->off, end > 0 ? end : LLONG_MAX,

				sync->flags & IORING_FSYNC_DATASYNC);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);



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

		return -EINVAL;



	sync->off = READ_ONCE(sqe->off);

	sync->len = READ_ONCE(sqe->addr);

	sync->mode = READ_ONCE(sqe->len);

	return 0;

}



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

{

	struct io_sync *sync = io_kiocb_to_cmd(req);

	int ret;



	/* fallocate always requiring blocking context */

	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;

	ret = vfs_fallocate(req->file, sync->mode, sync->off, sync->len);

	if (ret >= 0)

		fsnotify_modify(req->file);

	io_req_set_res(req, ret, 0);

	return IOU_OK;

}

io_uring/sync.h

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



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

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



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

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



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

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