From: Hongzhen Luo <[email protected]> When creating the EROFS image, users can specify the fingerprint name. This is to prepare for the upcoming inode page cache share.
Signed-off-by: Hongzhen Luo <[email protected]> [hongbo: forward port, minor fixes and cleanup] Signed-off-by: Hongbo Li <[email protected]> --- fs/erofs/Kconfig | 10 ++++++++++ fs/erofs/erofs_fs.h | 6 ++++-- fs/erofs/internal.h | 6 ++++++ fs/erofs/super.c | 3 ++- fs/erofs/xattr.c | 47 +++++++++++++++++++++++++++++++++++++++++++++ fs/erofs/xattr.h | 6 ++++++ 6 files changed, 75 insertions(+), 3 deletions(-) diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig index d81f3318417d..ef30cb452244 100644 --- a/fs/erofs/Kconfig +++ b/fs/erofs/Kconfig @@ -194,3 +194,13 @@ config EROFS_FS_PCPU_KTHREAD_HIPRI at higher priority. If unsure, say N. + +config EROFS_FS_INODE_SHARE + bool "EROFS inode page cache share support" + depends on EROFS_FS && EROFS_FS_XATTR + default n + help + This permits EROFS to share page cache for files with same + fingerprints. + + If unsure, say N. \ No newline at end of file diff --git a/fs/erofs/erofs_fs.h b/fs/erofs/erofs_fs.h index 3d5738f80072..f6ea8c35db45 100644 --- a/fs/erofs/erofs_fs.h +++ b/fs/erofs/erofs_fs.h @@ -35,8 +35,9 @@ #define EROFS_FEATURE_INCOMPAT_XATTR_PREFIXES 0x00000040 #define EROFS_FEATURE_INCOMPAT_48BIT 0x00000080 #define EROFS_FEATURE_INCOMPAT_METABOX 0x00000100 +#define EROFS_FEATURE_INCOMPAT_ISHARE_KEY 0x00000200 #define EROFS_ALL_FEATURE_INCOMPAT \ - ((EROFS_FEATURE_INCOMPAT_METABOX << 1) - 1) + ((EROFS_FEATURE_INCOMPAT_ISHARE_KEY << 1) - 1) #define EROFS_SB_EXTSLOT_SIZE 16 @@ -86,7 +87,8 @@ struct erofs_super_block { __u8 reserved[3]; __le32 build_time; /* seconds added to epoch for mkfs time */ __le64 rootnid_8b; /* (48BIT on) nid of root directory */ - __le64 reserved2; + __le32 ishare_key_start; /* start of ishare key */ + __le32 reserved2; __le64 metabox_nid; /* (METABOX on) nid of the metabox inode */ __le64 reserved3; /* [align to extslot 1] */ }; diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index eac067446140..245b9e3897bc 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -167,6 +167,11 @@ struct erofs_sb_info { struct erofs_domain *domain; char *fsid; char *domain_id; + + /* inode page cache share support */ + u32 ishare_key_start; + int ishare_key_idx; + char *ishare_key; }; #define EROFS_SB(sb) ((struct erofs_sb_info *)(sb)->s_fs_info) @@ -232,6 +237,7 @@ EROFS_FEATURE_FUNCS(dedupe, incompat, INCOMPAT_DEDUPE) EROFS_FEATURE_FUNCS(xattr_prefixes, incompat, INCOMPAT_XATTR_PREFIXES) EROFS_FEATURE_FUNCS(48bit, incompat, INCOMPAT_48BIT) EROFS_FEATURE_FUNCS(metabox, incompat, INCOMPAT_METABOX) +EROFS_FEATURE_FUNCS(ishare_key, incompat, INCOMPAT_ISHARE_KEY) EROFS_FEATURE_FUNCS(sb_chksum, compat, COMPAT_SB_CHKSUM) EROFS_FEATURE_FUNCS(xattr_filter, compat, COMPAT_XATTR_FILTER) EROFS_FEATURE_FUNCS(shared_ea_in_metabox, compat, COMPAT_SHARED_EA_IN_METABOX) diff --git a/fs/erofs/super.c b/fs/erofs/super.c index f9d8f978bf81..283449024996 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -339,7 +339,7 @@ static int erofs_read_superblock(struct super_block *sb) return -EFSCORRUPTED; /* self-loop detection */ } sbi->inos = le64_to_cpu(dsb->inos); - + sbi->ishare_key_start = le32_to_cpu(dsb->ishare_key_start); sbi->epoch = (s64)le64_to_cpu(dsb->epoch); sbi->fixed_nsec = le32_to_cpu(dsb->fixed_nsec); super_set_uuid(sb, (void *)dsb->uuid, sizeof(dsb->uuid)); @@ -738,6 +738,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) if (err) return err; + erofs_xattr_set_ishare_key(sb); erofs_set_sysfs_name(sb); err = erofs_register_sysfs(sb); if (err) diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c index 396536d9a862..6610c007ee4c 100644 --- a/fs/erofs/xattr.c +++ b/fs/erofs/xattr.c @@ -564,3 +564,50 @@ struct posix_acl *erofs_get_acl(struct inode *inode, int type, bool rcu) return acl; } #endif + +#ifdef CONFIG_EROFS_FS_INODE_SHARE +void erofs_xattr_set_ishare_key(struct super_block *sb) +{ + struct erofs_sb_info *sbi = EROFS_SB(sb); + struct erofs_buf buf = __EROFS_BUF_INITIALIZER; + struct xattr_handler const *handler; + erofs_off_t pos; + char *key; + int len, i; + void *ptr; + + if (!erofs_sb_has_fragments(sbi) || !erofs_sb_has_ishare_key(sbi) || + !sbi->packed_inode) + return; + + buf.mapping = sbi->packed_inode->i_mapping; + pos = sbi->ishare_key_start << 2; + (void)erofs_init_metabuf(&buf, sb, false); + ptr = erofs_read_metadata(sb, &buf, &pos, &len); + + if (IS_ERR(ptr)) + goto out; + + for (i = 0; ARRAY_SIZE(erofs_xattr_handlers) - 1; i++) { + handler = erofs_xattr_handlers[i]; + if (!handler) + break; + if (!memcmp(handler->prefix, ptr, strlen(handler->prefix))) + break; + } + + if (!handler) + goto out; + + len -= strlen(handler->prefix); + key = kzalloc(len + 1, GFP_KERNEL); + if (!key) + goto out; + + memcpy(key, ptr + strlen(handler->prefix), len); + sbi->ishare_key = key; + sbi->ishare_key_idx = handler->flags; +out: + erofs_put_metabuf(&buf); +} +#endif diff --git a/fs/erofs/xattr.h b/fs/erofs/xattr.h index 6317caa8413e..99c4674cfd51 100644 --- a/fs/erofs/xattr.h +++ b/fs/erofs/xattr.h @@ -67,4 +67,10 @@ struct posix_acl *erofs_get_acl(struct inode *inode, int type, bool rcu); #define erofs_get_acl (NULL) #endif +#ifdef CONFIG_EROFS_FS_INODE_SHARE +void erofs_xattr_set_ishare_key(struct super_block *sb); +#else +static inline void erofs_xattr_set_ishare_key(struct super_block *sb) {} +#endif + #endif -- 2.22.0
