vfs: avoid spurious dentry ref/unref cycle on open
PATCH v2 1/1 vfs: avoid spurious dentry ref/unref cycle on open
Opening a file grabs a reference on the terminal dentry in __legitimize_path(), then another one in do_dentry_open() and finally drops the initial reference in terminate_walk().
That's 2 modifications which don't need to be there -- do_dentry_open can consume the already held reference instead.
In order to facilitate some debugging a dedicated namei state flag was added to denote this happened.
When benchmarking on a 20-core vm using will-it-scale's open3_processes ("Same file open/close"), the results are (ops/s):
before: 3087010
after: 4173977 (+35%)
---
- drop the debug flag
- tweak commentary
- make vfs_open_consume clean up the path
perhaps this will do the trick? :)
fs/internal.h | 3 ++- fs/namei.c | 15 ++++++++++++--- fs/open.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 55 insertions(+), 7 deletions(-)
fs/internal.h +2 -1
@@ -193,7 +193,8 @@ int chmod_common(const struct path *path, umode_t mode);int do_fchownat (int dfd,const char __user *filename,uid_t user,gid_t group,int flag);int chown_common (const struct path *path,uid_t user,gid_t group); -extern int vfs_open (const struct path *,struct file *); +int vfs_open_consume (struct path *,struct file *); +int vfs_open (const struct path *,struct file *);/* * inode.c
fs/namei.c +12 -3
@@ -3683,6 +3683,7 @@ static const char *open_last_lookups(struct nameidata *nd,static int do_open (struct nameidata *nd,struct file *file,const struct open_flags *op) { +struct vfsmount *mnt;struct mnt_idmap *idmap;int open_flag = op->open_flag;bool do_truncate;
@@ -3720,11 +3721,17 @@ static int do_open(struct nameidata *nd, error =mnt_want_write (nd->path.mnt);if (error)return error; +/* +* We grab an additional reference here because after the call to +* vfs_open_consume() we no longer own the reference in nd->path.mnt +* while we need to undo write access below. +*/ + mnt =mntget (nd->path.mnt); do_truncate = true; } error =may_open (idmap, &nd->path, acc_mode, open_flag);if (!error && !(file->f_mode &FMODE_OPENED )) - error =vfs_open (&nd->path, file); + error =vfs_open_consume (&nd->path, file);if (!error) error =security_file_post_open (file, op->acc_mode);if (!error && do_truncate)
@@ -3733,8 +3740,10 @@ static int do_open(struct nameidata *nd,WARN_ON (1 ); error = -EINVAL ; } -if (do_truncate) -mnt_drop_write (nd->path.mnt); +if (do_truncate) { +mnt_drop_write (mnt); +mntput (mnt); + }return error; }
fs/open.c +41 -3
87 lines not on this page · raw message
Signature · 1 line
2.43.0