f2fs: support hot file extension
PATCH v2 1/1 f2fs: support hot file extension
This patch supports to recognize hot file extension in f2fs, so that we can allocate proper hot segment location for its data, which can lead to better hot/cold seperation in filesystem.
In addition, we changes a bit on query/add/del operation method for extension_list sysfs entry as below:
- Query: cat /sys/fs/f2fs/<disk>/extension_list
- Add: echo 'extension' > /sys/fs/f2fs/<disk>/extension_list
- Del: echo '!extension' > /sys/fs/f2fs/<disk>/extension_list
- Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list
- Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list
- [h] means add/del hot file extension
- [c] means add/del cold file extension
---
v2:
- fix to use hot data segment for hot file's data.
Documentation/ABI/testing/sysfs-fs-f2fs | 6 ++- fs/f2fs/f2fs.h | 6 ++- fs/f2fs/namei.c | 79 ++++++++++++++++++++++++--------- fs/f2fs/segment.c | 3 +- fs/f2fs/sysfs.c | 30 ++++++++++--- include/linux/f2fs_fs.h | 3 +- 6 files changed, 96 insertions(+), 31 deletions(-)
Documentation/ABI/testing/sysfs-fs-f2fs +4 -2
@@ -199,5 +199,7 @@ Contact: "Chao Yu" <[email protected]> Description: Used to control configure extension list: - Query: cat /sys/fs/f2fs/<disk>/extension_list - - Add: echo 'extension' > /sys/fs/f2fs/<disk>/extension_list - - Del: echo '!extension' > /sys/fs/f2fs/<disk>/extension_list + - Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list + - Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list + - [h] means add/del hot file extension + - [c] means add/del cold file extension
fs/f2fs/f2fs.h +5 -1
@@ -578,6 +578,7 @@ enum {#define FADVISE_ENCRYPT_BIT 0x04#define FADVISE_ENC_NAME_BIT 0x08#define FADVISE_KEEP_SIZE_BIT 0x10 +#define FADVISE_HOT_BIT 0x20#define file_is_cold (inode) is_file(inode, FADVISE_COLD_BIT)#define file_wrong_pino (inode) is_file(inode, FADVISE_LOST_PINO_BIT)
@@ -592,6 +593,9 @@ enum {#define file_set_enc_name (inode) set_file(inode, FADVISE_ENC_NAME_BIT)#define file_keep_isize (inode) is_file(inode, FADVISE_KEEP_SIZE_BIT)#define file_set_keep_isize (inode) set_file(inode, FADVISE_KEEP_SIZE_BIT) +#define file_is_hot (inode) is_file(inode, FADVISE_HOT_BIT) +#define file_set_hot (inode) set_file(inode, FADVISE_HOT_BIT) +#define file_clear_hot (inode) clear_file(inode, FADVISE_HOT_BIT)#define DEF_DIR_LEVEL 0
@@ -2622,7 +2626,7 @@ void handle_failed_inode(struct inode *inode);* namei.c */ int update_extension_list (struct f2fs_sb_info *sbi,const char *name, -bool set); +bool hot,bool set);struct dentry *f2fs_get_parent (struct dentry *child);/*
fs/f2fs/namei.c +59 -20
126 lines not on this page · raw message
fs/f2fs/segment.c +2 -1
@@ -2588,7 +2588,8 @@ static int __get_segment_type_6(struct f2fs_io_info *fio)if (is_cold_data (fio->page) ||file_is_cold (inode))return CURSEG_COLD_DATA ; -if (is_inode_flag_set (inode,FI_HOT_DATA )) +if (file_is_hot (inode) || +is_inode_flag_set (inode,FI_HOT_DATA ))return CURSEG_HOT_DATA ;return rw_hint_to_seg_type (inode->i_write_hint); }else {
fs/f2fs/sysfs.c +24 -6
@@ -139,10 +139,19 @@ static ssize_t f2fs_sbi_show(struct f2fs_attr *a,if (!strcmp (a->attr.name,"extension_list" )) {__u8 (*extlist)[F2FS_EXTENSION_LEN ] = sbi->raw_super->extension_list; -int count =le32_to_cpu (sbi->raw_super->extension_count); +int cold_count =le32_to_cpu (sbi->raw_super->extension_count); +int hot_count = sbi->raw_super->hot_ext_count;int len =0 , i; -for (i =0 ; i < count; i++) + len +=snprintf (buf + len,PAGE_SIZE - len, +"cold file extenstion:\n" ); +for (i =0 ; i < cold_count; i++) + len +=snprintf (buf + len,PAGE_SIZE - len,"%s\n" , + extlist[i]); + + len +=snprintf (buf + len,PAGE_SIZE - len, +"hot file extenstion:\n" ); +for (i = cold_count; i < cold_count + hot_count; i++) len +=snprintf (buf + len,PAGE_SIZE - len,"%s\n" , extlist[i]);return len;
@@ -168,9 +177,18 @@ static ssize_t f2fs_sbi_store(struct f2fs_attr *a,if (!strcmp (a->attr.name,"extension_list" )) {const char *name =strim ((char *)buf); -bool set = true; +bool set = true, hot; + +if (!strncmp (name,"[h]" ,3 )) + hot = true; +else if (!strncmp (name,"[c]" ,3 )) + hot = false; +else +return -EINVAL ; + + name +=3 ; -if (name[0 ] =='!' ) { +if (*name =='!' ) { name++; set = false; }
@@ -180,13 +198,13 @@ static ssize_t f2fs_sbi_store(struct f2fs_attr *a,down_write (&sbi->sb_lock); - ret =update_extension_list (sbi, name, set); + ret =update_extension_list (sbi, name, hot, set);if (ret) goto out; ret =f2fs_commit_super (sbi, false);if (ret) -update_extension_list (sbi, name, !set); +update_extension_list (sbi, name, hot, !set); out:up_write (&sbi->sb_lock);return ret ? ret : count;
include/linux/f2fs_fs.h +2 -1
@@ -112,7 +112,8 @@ struct f2fs_super_block {__u8 encrypt_pw_salt[16 ];/* Salt used for string2key algorithm */ struct f2fs_device devs[MAX_DEVICES ];/* device list */ __le32 qf_ino[F2FS_MAX_QUOTAS ];/* quota inode numbers */ -__u8 reserved[315 ];/* valid reserved region */ +__u8 hot_ext_count;/* # of hot file extension */ +__u8 reserved[314 ];/* valid reserved region */ } __packed;/*
Signature · 1 line
2.15.0.55.gc2ece9dc4de6