vfs: support statx(..., NULL, AT_EMPTY_PATH, ...)
PATCH v2 1/1 vfs: support statx(..., NULL, AT_EMPTY_PATH, ...)
The newly used helper also checks for 0-sized buffers.
NULL paths with any flag value other than AT_EMPTY_PATH go the usual route and end up with -EFAULT to retain compatibility (Rust is abusing calls of the sort to detect availability of statx).
This avoids path lookup code, lockref management, memory allocation and in case of NULL path userspace memory access (which can be quite expensive with SMAP on x86_64).
statx(..., AT_EMPTY_PATH, ...) issued on Sapphire Rapids (ops/s):
stock: 4231237
0-check: 5944063 (+40%)
NULL path: 6601619 (+11%/+56%)
---
Diffed against fs-next and assumes c050122bdbb4 ("fs: new helper vfs_empty_path()") from vfs.empty.path is already applied.
WARNING: io_uring remains untested (modulo compilation). I presume Jens has a handy way of making sure things still work.
While the io_uring part can be added at a later date, but I'm trying to avoid a scenario where someone has code which works with the NULL path and breaks when moving to io_uring. I am not going to argue about it however, worst case changes to io_uring can be trivially dropped and someone(tm) can add their own variant whenever they see fit.
v2:
- support glibc passing AT_NO_AUTOMOUNT | AT_EMPTY_PATH
- tidy up some commentary
- drop the fdget_raw CLASS addition as it is already present in newer trees
fs/internal.h | 2 + fs/stat.c | 106 +++++++++++++++++++++++++++++++++++------------ io_uring/statx.c | 21 ++++++---- 3 files changed, 93 insertions(+), 36 deletions(-)
fs/internal.h +2 -0
@@ -247,6 +247,8 @@ extern const struct dentry_operations ns_dentry_operations;int getname_statx_lookup_flags (int flags);int do_statx (int dfd,struct filename *filename,unsigned int flags,unsigned int mask,struct statx __user *buffer); +int do_statx_fd (int fd,unsigned int flags,unsigned int mask, +struct statx __user *buffer);/* * fs/splice.c:
fs/stat.c +79 -27
145 lines not on this page · raw message
io_uring/statx.c +12 -9
@@ -23,6 +23,7 @@ struct io_statx {int io_statx_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { struct io_statx *sx = io_kiocb_to_cmd(req, struct io_statx); +struct filename *filename;const char __user *path;if (sqe->buf_index || sqe->splice_fd_in)
@@ -36,14 +37,13 @@ int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) sx->buffer =u64_to_user_ptr (READ_ONCE (sqe->addr2)); sx->flags =READ_ONCE (sqe->statx_flags); - sx->filename =getname_flags (path, -getname_statx_lookup_flags (sx->flags)); - -if (IS_ERR (sx->filename)) { -int ret =PTR_ERR (sx->filename); - - sx->filename =NULL ; -return ret; + sx->filename =NULL ; +if (!(sx->flags ==AT_EMPTY_PATH &&vfs_empty_path (sx->dfd, path))) { + filename =getname_flags (path, +getname_statx_lookup_flags (sx->flags)); +if (IS_ERR (filename)) +return PTR_ERR (filename); + sx->filename = filename; } req->flags |=REQ_F_NEED_CLEANUP ;
@@ -58,7 +58,10 @@ int io_statx(struct io_kiocb *req, unsigned int issue_flags)WARN_ON_ONCE (issue_flags &IO_URING_F_NONBLOCK ); - ret =do_statx (sx->dfd, sx->filename, sx->flags, sx->mask, sx->buffer); +if (sx->filename ==NULL ) + ret =do_statx_fd (sx->dfd, sx->flags, sx->mask, sx->buffer); +else + ret =do_statx (sx->dfd, sx->filename, sx->flags, sx->mask, sx->buffer);io_req_set_res (req, ret,0 );return IOU_OK ; }
Signature · 1 line
2.43.0