From: Jens Axboe <axboe@kernel.dk> To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org, linux-arch@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe <axboe@kernel.dk> Subject: [PATCH 06/16] io_uring: add fsync support Date: Mon, 14 Jan 2019 19:55:21 -0700 [thread overview] Message-ID: <20190115025531.13985-7-axboe@kernel.dk> (raw) In-Reply-To: <20190115025531.13985-1-axboe@kernel.dk> From: Christoph Hellwig <hch@lst.de> Add a new fsync opcode, which either syncs a range if one is passed, or the whole file if the offset and length fields are both cleared to zero. A flag is provided to use fdatasync semantics, that is only force out metadata which is required to retrieve the file data, but not others like metadata. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> --- fs/io_uring.c | 33 +++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 8 +++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 148eb3af7dc4..7d74463217a6 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -449,6 +449,36 @@ static int io_nop(struct io_kiocb *req, const struct io_uring_sqe *sqe) return 0; } +static int io_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe, + bool force_nonblock) +{ + struct io_ring_ctx *ctx = req->ctx; + loff_t end = sqe->off + sqe->len; + struct file *file; + int ret; + + /* fsync always requires a blocking context */ + if (force_nonblock) + return -EAGAIN; + + if (unlikely(sqe->addr)) + return -EINVAL; + if (unlikely(sqe->fsync_flags & ~IORING_FSYNC_DATASYNC)) + return -EINVAL; + + file = fget(sqe->fd); + if (unlikely(!file)) + return -EBADF; + + ret = vfs_fsync_range(file, sqe->off, end > 0 ? end : LLONG_MAX, + sqe->fsync_flags & IORING_FSYNC_DATASYNC); + + fput(file); + io_cqring_fill_event(ctx, sqe->user_data, ret, 0); + io_free_req(req); + return 0; +} + static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, struct sqe_submit *s, bool force_nonblock) { @@ -474,6 +504,9 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, case IORING_OP_WRITEV: ret = io_write(req, sqe, force_nonblock); break; + case IORING_OP_FSYNC: + ret = io_fsync(req, sqe, force_nonblock); + break; default: ret = -EINVAL; break; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index a1ebaa09e1b8..ac49bd179ed9 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -27,7 +27,7 @@ struct io_uring_sqe { __u32 len; /* buffer size or number of iovecs */ union { __kernel_rwf_t rw_flags; - __u32 __resv; + __u32 fsync_flags; }; __u64 user_data; /* data to be passed back at completion time */ __u64 __pad2[3]; @@ -36,6 +36,12 @@ struct io_uring_sqe { #define IORING_OP_NOP 0 #define IORING_OP_READV 1 #define IORING_OP_WRITEV 2 +#define IORING_OP_FSYNC 3 + +/* + * sqe->fsync_flags + */ +#define IORING_FSYNC_DATASYNC (1 << 0) /* * IO completion data structure (Completion Queue Entry) -- 2.17.1 -- To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to majordomo@kvack.org. For more info on Linux AIO, see: http://www.kvack.org/aio/ Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>
WARNING: multiple messages have this Message-ID (diff)
From: Jens Axboe <axboe@kernel.dk> To: linux-fsdevel@vger.kernel.org, linux-aio@kvack.org, linux-block@vger.kernel.org, linux-arch@vger.kernel.org Cc: hch@lst.de, jmoyer@redhat.com, avi@scylladb.com, Jens Axboe <axboe@kernel.dk> Subject: [PATCH 06/16] io_uring: add fsync support Date: Mon, 14 Jan 2019 19:55:21 -0700 [thread overview] Message-ID: <20190115025531.13985-7-axboe@kernel.dk> (raw) Message-ID: <20190115025521.YZXlf1-VADfZSDfYdTzq69gTIPEaub0smGAVo0fTYVs@z> (raw) In-Reply-To: <20190115025531.13985-1-axboe@kernel.dk> From: Christoph Hellwig <hch@lst.de> Add a new fsync opcode, which either syncs a range if one is passed, or the whole file if the offset and length fields are both cleared to zero. A flag is provided to use fdatasync semantics, that is only force out metadata which is required to retrieve the file data, but not others like metadata. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> --- fs/io_uring.c | 33 +++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 8 +++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 148eb3af7dc4..7d74463217a6 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -449,6 +449,36 @@ static int io_nop(struct io_kiocb *req, const struct io_uring_sqe *sqe) return 0; } +static int io_fsync(struct io_kiocb *req, const struct io_uring_sqe *sqe, + bool force_nonblock) +{ + struct io_ring_ctx *ctx = req->ctx; + loff_t end = sqe->off + sqe->len; + struct file *file; + int ret; + + /* fsync always requires a blocking context */ + if (force_nonblock) + return -EAGAIN; + + if (unlikely(sqe->addr)) + return -EINVAL; + if (unlikely(sqe->fsync_flags & ~IORING_FSYNC_DATASYNC)) + return -EINVAL; + + file = fget(sqe->fd); + if (unlikely(!file)) + return -EBADF; + + ret = vfs_fsync_range(file, sqe->off, end > 0 ? end : LLONG_MAX, + sqe->fsync_flags & IORING_FSYNC_DATASYNC); + + fput(file); + io_cqring_fill_event(ctx, sqe->user_data, ret, 0); + io_free_req(req); + return 0; +} + static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, struct sqe_submit *s, bool force_nonblock) { @@ -474,6 +504,9 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, case IORING_OP_WRITEV: ret = io_write(req, sqe, force_nonblock); break; + case IORING_OP_FSYNC: + ret = io_fsync(req, sqe, force_nonblock); + break; default: ret = -EINVAL; break; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index a1ebaa09e1b8..ac49bd179ed9 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -27,7 +27,7 @@ struct io_uring_sqe { __u32 len; /* buffer size or number of iovecs */ union { __kernel_rwf_t rw_flags; - __u32 __resv; + __u32 fsync_flags; }; __u64 user_data; /* data to be passed back at completion time */ __u64 __pad2[3]; @@ -36,6 +36,12 @@ struct io_uring_sqe { #define IORING_OP_NOP 0 #define IORING_OP_READV 1 #define IORING_OP_WRITEV 2 +#define IORING_OP_FSYNC 3 + +/* + * sqe->fsync_flags + */ +#define IORING_FSYNC_DATASYNC (1 << 0) /* * IO completion data structure (Completion Queue Entry) -- 2.17.1
next prev parent reply other threads:[~2019-01-15 2:55 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-15 2:55 (unknown), Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 01/16] fs: add an iopoll method to struct file_operations Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 02/16] block: wire up block device iopoll method Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 03/16] block: add bio_set_polled() helper Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 04/16] iomap: wire up the iopoll method Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 05/16] Add io_uring IO interface Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 16:51 ` Jonathan Corbet 2019-01-15 16:51 ` Jonathan Corbet 2019-01-15 16:55 ` Jens Axboe 2019-01-15 16:55 ` Jens Axboe 2019-01-15 17:26 ` Jens Axboe 2019-01-15 17:26 ` Jens Axboe 2019-01-16 10:41 ` Arnd Bergmann 2019-01-16 10:41 ` Arnd Bergmann 2019-01-16 11:00 ` Arnd Bergmann 2019-01-16 11:00 ` Arnd Bergmann 2019-01-16 15:12 ` Jens Axboe 2019-01-16 15:12 ` Jens Axboe 2019-01-16 15:16 ` Arnd Bergmann 2019-01-16 15:16 ` Arnd Bergmann 2019-01-16 15:25 ` Jens Axboe 2019-01-16 15:25 ` Jens Axboe 2019-01-15 2:55 ` Jens Axboe [this message] 2019-01-15 2:55 ` [PATCH 06/16] io_uring: add fsync support Jens Axboe 2019-01-15 2:55 ` [PATCH 07/16] io_uring: support for IO polling Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 08/16] io_uring: add submission side request cache Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 09/16] fs: add fget_many() and fput_many() Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 10/16] io_uring: use fget/fput_many() for file references Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 11/16] io_uring: batch io_kiocb allocation Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 12/16] block: implement bio helper to add iter bvec pages to bio Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 13/16] io_uring: add support for pre-mapped user IO buffers Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-16 10:53 ` Arnd Bergmann 2019-01-16 15:14 ` Jens Axboe 2019-01-16 15:14 ` Jens Axboe 2019-01-16 15:32 ` Jens Axboe 2019-01-16 15:32 ` Jens Axboe 2019-01-16 15:41 ` Arnd Bergmann 2019-01-16 15:47 ` Jens Axboe 2019-01-16 15:47 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 14/16] io_uring: add submission polling Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 15/16] io_uring: add file registration Jens Axboe 2019-01-15 2:55 ` Jens Axboe 2019-01-16 10:45 ` Arnd Bergmann 2019-01-16 10:45 ` Arnd Bergmann 2019-01-16 15:15 ` Jens Axboe 2019-01-16 15:15 ` Jens Axboe 2019-01-15 2:55 ` [PATCH 16/16] io_uring: add io_uring_event cache hit information Jens Axboe 2019-01-15 2:55 ` Jens Axboe -- strict thread matches above, loose matches on Subject: below -- 2019-01-12 21:29 [PATCHSET v3] io_uring IO interface Jens Axboe 2019-01-12 21:30 ` [PATCH 06/16] io_uring: add fsync support Jens Axboe 2019-01-12 21:30 ` 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 \ --in-reply-to=20190115025531.13985-7-axboe@kernel.dk \ --to=axboe@kernel.dk \ --cc=avi@scylladb.com \ --cc=hch@lst.de \ --cc=jmoyer@redhat.com \ --cc=linux-aio@kvack.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ /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: linkBe 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; as well as URLs for NNTP newsgroup(s).