* [PATCH 2/2] io_uring: add support for ftruncate
2024-01-22 19:37 [PATCH 1/2] io_uring: add support for truncate Tony Solomonik
@ 2024-01-22 19:37 ` Tony Solomonik
2024-01-22 20:12 ` Jens Axboe
2024-01-22 19:56 ` [PATCH 1/2] io_uring: add support for truncate Breno Leitao
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Tony Solomonik @ 2024-01-22 19:37 UTC (permalink / raw)
To: axboe, asml.silence, io-uring; +Cc: Tony Solomonik
Like truncate, ftruncate should also be supported in io_uring.
---
include/uapi/linux/io_uring.h | 1 +
io_uring/opdef.c | 7 +++++++
io_uring/truncate.c | 37 +++++++++++++++++++++++++++++++++++
io_uring/truncate.h | 3 +++
4 files changed, 48 insertions(+)
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 513f31ee8ce9..8ebaf667c07d 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -254,6 +254,7 @@ enum io_uring_op {
IORING_OP_FUTEX_WAKE,
IORING_OP_FUTEX_WAITV,
IORING_OP_TRUNCATE,
+ IORING_OP_FTRUNCATE,
/* this goes last, obviously */
IORING_OP_LAST,
diff --git a/io_uring/opdef.c b/io_uring/opdef.c
index 60827099e244..88054f3df83c 100644
--- a/io_uring/opdef.c
+++ b/io_uring/opdef.c
@@ -474,6 +474,10 @@ const struct io_issue_def io_issue_defs[] = {
.prep = io_truncate_prep,
.issue = io_truncate,
},
+ [IORING_OP_FTRUNCATE] = {
+ .prep = io_ftruncate_prep,
+ .issue = io_ftruncate,
+ },
};
const struct io_cold_def io_cold_defs[] = {
@@ -712,6 +716,9 @@ const struct io_cold_def io_cold_defs[] = {
[IORING_OP_TRUNCATE] = {
.name = "TRUNCATE",
},
+ [IORING_OP_FTRUNCATE] = {
+ .name = "FTRUNCATE",
+ },
};
const char *io_uring_get_opcode(u8 opcode)
diff --git a/io_uring/truncate.c b/io_uring/truncate.c
index 82648b2fbc7e..e31d28a478d2 100644
--- a/io_uring/truncate.c
+++ b/io_uring/truncate.c
@@ -21,6 +21,12 @@ struct io_trunc {
loff_t len;
};
+struct io_ftrunc {
+ struct file *file;
+ int dfd;
+ loff_t len;
+};
+
int io_truncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
struct io_trunc *tr = io_kiocb_to_cmd(req, struct io_trunc);
@@ -51,3 +57,34 @@ int io_truncate(struct io_kiocb *req, unsigned int issue_flags)
io_req_set_res(req, ret, 0);
return IOU_OK;
}
+
+int io_ftruncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
+{
+ struct io_ftrunc *ft = io_kiocb_to_cmd(req, struct io_ftrunc);
+
+ if (sqe->off || sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)
+ return -EINVAL;
+ if (unlikely(req->flags & REQ_F_FIXED_FILE))
+ return -EBADF;
+
+ ft->dfd = READ_ONCE(sqe->fd);
+ ft->len = READ_ONCE(sqe->len);
+
+ req->flags |= REQ_F_NEED_CLEANUP;
+ req->flags |= REQ_F_FORCE_ASYNC;
+ return 0;
+}
+
+int io_ftruncate(struct io_kiocb *req, unsigned int issue_flags)
+{
+ struct io_ftrunc *ft = io_kiocb_to_cmd(req, struct io_ftrunc);
+ int ret;
+
+ WARN_ON_ONCE(issue_flags & IO_URING_F_NONBLOCK);
+
+ ret = do_sys_ftruncate(ft->dfd, ft->len, 1);
+
+ req->flags &= ~REQ_F_NEED_CLEANUP;
+ io_req_set_res(req, ret, 0);
+ return IOU_OK;
+}
diff --git a/io_uring/truncate.h b/io_uring/truncate.h
index ab17cb9acc90..a9fc20b5f926 100644
--- a/io_uring/truncate.h
+++ b/io_uring/truncate.h
@@ -2,3 +2,6 @@
int io_truncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
int io_truncate(struct io_kiocb *req, unsigned int issue_flags);
+
+int io_ftruncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
+int io_ftruncate(struct io_kiocb *req, unsigned int issue_flags);
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 2/2] io_uring: add support for ftruncate
2024-01-22 19:37 ` [PATCH 2/2] io_uring: add support for ftruncate Tony Solomonik
@ 2024-01-22 20:12 ` Jens Axboe
0 siblings, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2024-01-22 20:12 UTC (permalink / raw)
To: Tony Solomonik, asml.silence, io-uring
> +int io_ftruncate(struct io_kiocb *req, unsigned int issue_flags)
> +{
> + struct io_ftrunc *ft = io_kiocb_to_cmd(req, struct io_ftrunc);
> + int ret;
> +
> + WARN_ON_ONCE(issue_flags & IO_URING_F_NONBLOCK);
> +
> + ret = do_sys_ftruncate(ft->dfd, ft->len, 1);
This needs a __do_ftruncate() or something helper that takes a struct
file, that should be done as a prep patch. Then do_sys_ftruncate() can
call that helper as well, once it's done the fget.
With that, you also then remove the restriction you currently have that
it can't work on fixed files, there's no reason for that restriction to
be there.
Same comments on len vs offset, and the CLEANUP part. Both need to get
done here as well.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] io_uring: add support for truncate
2024-01-22 19:37 [PATCH 1/2] io_uring: add support for truncate Tony Solomonik
2024-01-22 19:37 ` [PATCH 2/2] io_uring: add support for ftruncate Tony Solomonik
@ 2024-01-22 19:56 ` Breno Leitao
2024-01-22 20:10 ` Jens Axboe
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Breno Leitao @ 2024-01-22 19:56 UTC (permalink / raw)
To: Tony Solomonik; +Cc: axboe, asml.silence, io-uring
Hello Tony,
On Mon, Jan 22, 2024 at 09:37:31PM +0200, Tony Solomonik wrote:
> +int io_truncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
> +{
> + struct io_trunc *tr = io_kiocb_to_cmd(req, struct io_trunc);
> +
> + if (sqe->off || sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)
> + return -EINVAL;
> + if (unlikely(req->flags & REQ_F_FIXED_FILE))
> + return -EBADF;
> +
> + tr->pathname = u64_to_user_ptr(READ_ONCE(sqe->addr));
> + tr->len = READ_ONCE(sqe->len);
sqe->len is 32 bits. I _think_ loff_t is or could be 64-bits. Isn't it
possible to use a u64 here? Maybe sqe->off or sqe->addr?
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] io_uring: add support for truncate
2024-01-22 19:37 [PATCH 1/2] io_uring: add support for truncate Tony Solomonik
2024-01-22 19:37 ` [PATCH 2/2] io_uring: add support for ftruncate Tony Solomonik
2024-01-22 19:56 ` [PATCH 1/2] io_uring: add support for truncate Breno Leitao
@ 2024-01-22 20:10 ` Jens Axboe
2024-01-22 20:12 ` Gabriel Krisman Bertazi
2024-01-22 20:21 ` Jens Axboe
4 siblings, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2024-01-22 20:10 UTC (permalink / raw)
To: Tony Solomonik, asml.silence, io-uring
On 1/22/24 12:37 PM, Tony Solomonik wrote:
> Libraries that are built on io_uring currently need to maintain a
> separate thread pool implementation when they want to truncate a file.
In general, I think we should just make this one opcode, and then
require fd to be -1 for the truncate case (with path in addr, like you
have, or have a valid fd and NULL addr for the fruncate case. Then at
least we don't waste two opcodes on essentially the same functionality.
One minor code comment, which applies to both patches:
> +int io_truncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
> +{
> + struct io_trunc *tr = io_kiocb_to_cmd(req, struct io_trunc);
> +
> + if (sqe->off || sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)
> + return -EINVAL;
> + if (unlikely(req->flags & REQ_F_FIXED_FILE))
> + return -EBADF;
> +
> + tr->pathname = u64_to_user_ptr(READ_ONCE(sqe->addr));
> + tr->len = READ_ONCE(sqe->len);
This should use offset rather than len, as Breno pointed out.
> + req->flags |= REQ_F_NEED_CLEANUP;
Why is this being set? There's nothing to clean up post completion, so
this just slows req completion down for no particularly reason. And the
you can kill the same flag force clear in io_truncate as well.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] io_uring: add support for truncate
2024-01-22 19:37 [PATCH 1/2] io_uring: add support for truncate Tony Solomonik
` (2 preceding siblings ...)
2024-01-22 20:10 ` Jens Axboe
@ 2024-01-22 20:12 ` Gabriel Krisman Bertazi
2024-01-22 20:22 ` Jens Axboe
2024-01-22 20:21 ` Jens Axboe
4 siblings, 1 reply; 8+ messages in thread
From: Gabriel Krisman Bertazi @ 2024-01-22 20:12 UTC (permalink / raw)
To: Tony Solomonik; +Cc: axboe, asml.silence, io-uring
Tony Solomonik <[email protected]> writes:
> Libraries that are built on io_uring currently need to maintain a
> separate thread pool implementation when they want to truncate a file.
I don't think it makes sense to have both ftruncate and truncate in
io_uring. One can just as easily link an open+ftruncate to have the
same semantics in one go.
> ---
> include/uapi/linux/io_uring.h | 1 +
> io_uring/Makefile | 2 +-
> io_uring/opdef.c | 8 ++++++
> io_uring/truncate.c | 53 +++++++++++++++++++++++++++++++++++
> io_uring/truncate.h | 4 +++
> 5 files changed, 67 insertions(+), 1 deletion(-)
> create mode 100644 io_uring/truncate.c
> create mode 100644 io_uring/truncate.h
>
> diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
> index f1c16f817742..513f31ee8ce9 100644
> --- a/include/uapi/linux/io_uring.h
> +++ b/include/uapi/linux/io_uring.h
> @@ -253,6 +253,7 @@ enum io_uring_op {
> IORING_OP_FUTEX_WAIT,
> IORING_OP_FUTEX_WAKE,
> IORING_OP_FUTEX_WAITV,
> + IORING_OP_TRUNCATE,
>
> /* this goes last, obviously */
> IORING_OP_LAST,
> diff --git a/io_uring/Makefile b/io_uring/Makefile
> index e5be47e4fc3b..4f8ed6530a29 100644
> --- a/io_uring/Makefile
> +++ b/io_uring/Makefile
> @@ -8,6 +8,6 @@ obj-$(CONFIG_IO_URING) += io_uring.o xattr.o nop.o fs.o splice.o \
> statx.o net.o msg_ring.o timeout.o \
> sqpoll.o fdinfo.o tctx.o poll.o \
> cancel.o kbuf.o rsrc.o rw.o opdef.o \
> - notif.o waitid.o
> + notif.o waitid.o truncate.o
> obj-$(CONFIG_IO_WQ) += io-wq.o
> obj-$(CONFIG_FUTEX) += futex.o
> diff --git a/io_uring/opdef.c b/io_uring/opdef.c
> index 799db44283c7..60827099e244 100644
> --- a/io_uring/opdef.c
> +++ b/io_uring/opdef.c
> @@ -35,6 +35,7 @@
> #include "rw.h"
> #include "waitid.h"
> #include "futex.h"
> +#include "truncate.h"
>
> static int io_no_issue(struct io_kiocb *req, unsigned int issue_flags)
> {
> @@ -469,6 +470,10 @@ const struct io_issue_def io_issue_defs[] = {
> .prep = io_eopnotsupp_prep,
> #endif
> },
> + [IORING_OP_TRUNCATE] = {
> + .prep = io_truncate_prep,
> + .issue = io_truncate,
> + },
> };
>
> const struct io_cold_def io_cold_defs[] = {
> @@ -704,6 +709,9 @@ const struct io_cold_def io_cold_defs[] = {
> [IORING_OP_FUTEX_WAITV] = {
> .name = "FUTEX_WAITV",
> },
> + [IORING_OP_TRUNCATE] = {
> + .name = "TRUNCATE",
> + },
> };
>
> const char *io_uring_get_opcode(u8 opcode)
> diff --git a/io_uring/truncate.c b/io_uring/truncate.c
> new file mode 100644
> index 000000000000..82648b2fbc7e
> --- /dev/null
> +++ b/io_uring/truncate.c
> @@ -0,0 +1,53 @@
> +// 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/syscalls.h>
> +#include <linux/io_uring.h>
> +
> +#include <uapi/linux/io_uring.h>
> +
> +#include "../fs/internal.h"
> +
> +#include "io_uring.h"
> +#include "truncate.h"
> +
> +struct io_trunc {
> + struct files *file;
> + char __user *pathname;
> + loff_t len;
> +};
> +
> +int io_truncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
> +{
> + struct io_trunc *tr = io_kiocb_to_cmd(req, struct io_trunc);
> +
> + if (sqe->off || sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)
> + return -EINVAL;
> + if (unlikely(req->flags & REQ_F_FIXED_FILE))
> + return -EBADF;
> +
> + tr->pathname = u64_to_user_ptr(READ_ONCE(sqe->addr));
> + tr->len = READ_ONCE(sqe->len);
> +
> + req->flags |= REQ_F_NEED_CLEANUP;
> + req->flags |= REQ_F_FORCE_ASYNC;
> + return 0;
> +}
> +
> +int io_truncate(struct io_kiocb *req, unsigned int issue_flags)
> +{
> + struct io_trunc *tr = io_kiocb_to_cmd(req, struct io_trunc);
> + int ret;
> +
> + WARN_ON_ONCE(issue_flags & IO_URING_F_NONBLOCK);
> +
> + ret = do_sys_truncate(tr->pathname, tr->len);
> +
> + req->flags &= ~REQ_F_NEED_CLEANUP;
> + io_req_set_res(req, ret, 0);
> + return IOU_OK;
> +}
> diff --git a/io_uring/truncate.h b/io_uring/truncate.h
> new file mode 100644
> index 000000000000..ab17cb9acc90
> --- /dev/null
> +++ b/io_uring/truncate.h
> @@ -0,0 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +int io_truncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
> +int io_truncate(struct io_kiocb *req, unsigned int issue_flags);
--
Gabriel Krisman Bertazi
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] io_uring: add support for truncate
2024-01-22 20:12 ` Gabriel Krisman Bertazi
@ 2024-01-22 20:22 ` Jens Axboe
0 siblings, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2024-01-22 20:22 UTC (permalink / raw)
To: Gabriel Krisman Bertazi, Tony Solomonik; +Cc: asml.silence, io-uring
On 1/22/24 1:12 PM, Gabriel Krisman Bertazi wrote:
> Tony Solomonik <[email protected]> writes:
>
>> Libraries that are built on io_uring currently need to maintain a
>> separate thread pool implementation when they want to truncate a file.
>
> I don't think it makes sense to have both ftruncate and truncate in
> io_uring. One can just as easily link an open+ftruncate to have the
> same semantics in one go.
Yeah, see comment on the life time issue with this one as well, which
is avoided with the fd variant. So if just having the ftruncate variant
is good enough, that's solve that headache too. And if done like I
suggested where fd must be valid and we -EINVAL on sqe->addr being
set, you could always add truncate by path functionality later on top
without requiring a new opcode just for that.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] io_uring: add support for truncate
2024-01-22 19:37 [PATCH 1/2] io_uring: add support for truncate Tony Solomonik
` (3 preceding siblings ...)
2024-01-22 20:12 ` Gabriel Krisman Bertazi
@ 2024-01-22 20:21 ` Jens Axboe
4 siblings, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2024-01-22 20:21 UTC (permalink / raw)
To: Tony Solomonik, asml.silence, io-uring
One more thing on this one...
> +int io_truncate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
> +{
> + struct io_trunc *tr = io_kiocb_to_cmd(req, struct io_trunc);
> +
> + if (sqe->off || sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)
> + return -EINVAL;
> + if (unlikely(req->flags & REQ_F_FIXED_FILE))
> + return -EBADF;
> +
> + tr->pathname = u64_to_user_ptr(READ_ONCE(sqe->addr));
io_uring generally guarantees that any data passed in is stable past
submit returns, but that's not the case here. Imagine you had code ala:
prep_truncate(ring, dir, filename)
{
char path[PATH_MAX];
sprintf(path, "%s/%s", dir, filename);
sqe = io_uring_get_seq(ring);
io_uring_prep_truncate(sqe, path, -1, 0);
/* your io_truncate_prep() will be run here */
io_uring_submit(ring);
}
io_loop()
{
...
prep_truncate(ring, dir, filename);
/* path was on stack and now out-of-scope, and there's nothing
preventing io_truncate() from running post that. */
}
which implies you'd want some refactoring done here as well, so you can
pass in a path for do_sys_truncate(). And then you would certainly need
the cleanup flag set, but also provide a ->cleanup() helper. See some of
the other fs handling code, like xattr, for how that should be done.
This problem obviously doesn't exist for the fd ftruncate variant, as
there's no path resolution to do there.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread