diff options
| author | Christian Brauner <brauner@kernel.org> | 2024-11-21 11:15:21 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-12-22 11:29:51 +0100 |
| commit | 84208b8fa3b7e73d1cc08efe7eaf527e28d8b951 (patch) | |
| tree | af32d4014c1fea1d3f26d0421bbb89041ab6f675 /include | |
| parent | 135ec43eb29c68ed26e2d10f221d43f7d9139a8f (diff) | |
| parent | 657e726e0cb9ba4f583ae7d226100bc43cc43a41 (diff) | |
Merge patch series "symlink length caching"
Mateusz Guzik <mjguzik@gmail.com> says:
quote:
When utilized it dodges strlen() in vfs_readlink(), giving about 1.5%
speed up when issuing readlink on /initrd.img on ext4.
The size is stored in a union with i_devices, which is never looked at
unless the inode is for a device.
ext4 and tmpfs are patched, other filesystems can also get there with
some more work.
benchmark:
plug into will-it-scale into tests/readlink1.c:
char *testcase_description = "readlink /initrd.img";
void testcase(unsigned long long *iterations, unsigned long nr)
{
char *tmplink = "/initrd.img";
char buf[1024];
while (1) {
int error = readlink(tmplink, buf, sizeof(buf));
assert(error > 0);
(*iterations)++;
}
}
* patches from https://lore.kernel.org/r/20241120112037.822078-1-mjguzik@gmail.com:
tmpfs: use inode_set_cached_link()
ext4: use inode_set_cached_link()
vfs: support caching symlink lengths in inodes
Link: https://lore.kernel.org/r/20241120112037.822078-1-mjguzik@gmail.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7e29433c5ecc..2cc98de5af43 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -626,6 +626,7 @@ is_uncached_acl(struct posix_acl *acl) #define IOP_XATTR 0x0008 #define IOP_DEFAULT_READLINK 0x0010 #define IOP_MGTIME 0x0020 +#define IOP_CACHED_LINK 0x0040 /* * Keep mostly read-only and often accessed (especially for @@ -723,7 +724,10 @@ struct inode { }; struct file_lock_context *i_flctx; struct address_space i_data; - struct list_head i_devices; + union { + struct list_head i_devices; + int i_linklen; + }; union { struct pipe_inode_info *i_pipe; struct cdev *i_cdev; @@ -749,6 +753,13 @@ struct inode { void *i_private; /* fs or device private pointer */ } __randomize_layout; +static inline void inode_set_cached_link(struct inode *inode, char *link, int linklen) +{ + inode->i_link = link; + inode->i_linklen = linklen; + inode->i_opflags |= IOP_CACHED_LINK; +} + /* * Get bit address from inode->i_state to use with wait_var_event() * infrastructre. @@ -3351,7 +3362,7 @@ extern const struct file_operations generic_ro_fops; #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m)) -extern int readlink_copy(char __user *, int, const char *); +extern int readlink_copy(char __user *, int, const char *, int); extern int page_readlink(struct dentry *, char __user *, int); extern const char *page_get_link(struct dentry *, struct inode *, struct delayed_call *); |
