f2fs: add node_io_flag for bio flags likewise data_io_flag
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: add node_io_flag for bio flags likewise data_io_flag
This patch adds another way to attach bio flags to node writes.
Description: Give a way to attach REQ_META|FUA to node writes
given temperature-based bits. Now the bits indicate:
* REQ_META | REQ_FUA |
* 5 | 4 | 3 | 2 | 1 | 0 |
* Cold | Warm | Hot | Cold | Warm | Hot |
--- Documentation/ABI/testing/sysfs-fs-f2fs | 9 ++++++ fs/f2fs/data.c | 39 ++++++++++++++++++------- fs/f2fs/f2fs.h | 1 + fs/f2fs/sysfs.c | 2 ++ 4 files changed, 40 insertions(+), 11 deletions(-)
Documentation/ABI/testing/sysfs-fs-f2fs +9 -0
@@ -333,6 +333,15 @@ Description: Give a way to attach REQ_META|FUA to data writes * 5 | 4 | 3 | 2 | 1 | 0 | * Cold | Warm | Hot | Cold | Warm | Hot | +What: /sys/fs/f2fs/<disk>/node_io_flag +Date: June 2020 +Contact: "Jaegeuk Kim" <[email protected]> +Description: Give a way to attach REQ_META|FUA to node writes + given temperature-based bits. Now the bits indicate: + * REQ_META | REQ_FUA | + * 5 | 4 | 3 | 2 | 1 | 0 | + * Cold | Warm | Hot | Cold | Warm | Hot | + What: /sys/fs/f2fs/<disk>/iostat_period_ms Date: April 2020 Contact: "Daeho Jeong" <[email protected]>
fs/f2fs/data.c +28 -11
@@ -514,26 +514,43 @@ void f2fs_submit_bio(struct f2fs_sb_info *sbi,__submit_bio (sbi, bio, type); } -static void __attach_data_io_flag (struct f2fs_io_info *fio) +static void __attach_io_flag (struct f2fs_io_info *fio) {struct f2fs_sb_info *sbi = fio->sbi;unsigned int temp_mask = (1 <<NR_TEMP_TYPE ) -1 ; -unsigned int fua_flag = sbi->data_io_flag & temp_mask; -unsigned int meta_flag = (sbi->data_io_flag >>NR_TEMP_TYPE ) & - temp_mask; +/* * data io flag bits per temp: * REQ_META | REQ_FUA | * 5 | 4 | 3 | 2 | 1 | 0 | * Cold | Warm | Hot | Cold | Warm | Hot | */ -if (fio->type !=DATA ) -return ; +if (fio->type ==DATA ) { +unsigned int fua_flag = sbi->data_io_flag & temp_mask; +unsigned int meta_flag = (sbi->data_io_flag >>NR_TEMP_TYPE ) & + temp_mask; -if ((1 << fio->temp) & meta_flag) - fio->op_flags |=REQ_META ; -if ((1 << fio->temp) & fua_flag) - fio->op_flags |=REQ_FUA ; +if ((1 << fio->temp) & meta_flag) + fio->op_flags |=REQ_META ; +if ((1 << fio->temp) & fua_flag) + fio->op_flags |=REQ_FUA ; + } +/* +* node io flag bits per temp: +* REQ_META | REQ_FUA | +* 5 | 4 | 3 | 2 | 1 | 0 | +* Cold | Warm | Hot | Cold | Warm | Hot | +*/ +if (fio->type ==NODE ) { +unsigned int fua_flag = sbi->node_io_flag & temp_mask; +unsigned int meta_flag = (sbi->node_io_flag >>NR_TEMP_TYPE ) & + temp_mask; + +if ((1 << fio->temp) & meta_flag) + fio->op_flags |=REQ_META ; +if ((1 << fio->temp) & fua_flag) + fio->op_flags |=REQ_FUA ; + } }static void __submit_merged_bio (struct f2fs_bio_info *io)
@@ -543,7 +560,7 @@ static void __submit_merged_bio(struct f2fs_bio_info *io)if (!io->bio)return ; -__attach_data_io_flag (fio); +__attach_io_flag (fio);bio_set_op_attrs (io->bio, fio->op, fio->op_flags);if (is_read_io (fio->op))
fs/f2fs/f2fs.h +1 -0
@@ -1568,6 +1568,7 @@ struct f2fs_sb_info {/* to attach REQ_META|REQ_FUA flags */ unsigned int data_io_flag; +unsigned int node_io_flag;/* For sysfs suppport */ struct kobject s_kobj;
fs/f2fs/sysfs.c +2 -0
@@ -554,6 +554,7 @@ F2FS_RW_ATTR(FAULT_INFO_RATE, f2fs_fault_info, inject_rate, inject_rate);F2FS_RW_ATTR (FAULT_INFO_TYPE , f2fs_fault_info, inject_type, inject_type);#endif F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, data_io_flag, data_io_flag); +F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, node_io_flag, node_io_flag);F2FS_GENERAL_RO_ATTR (dirty_segments);F2FS_GENERAL_RO_ATTR (free_segments);F2FS_GENERAL_RO_ATTR (lifetime_write_kbytes);
@@ -635,6 +636,7 @@ static struct attribute *f2fs_attrs[] = {ATTR_LIST (inject_type), #endifATTR_LIST (data_io_flag), +ATTR_LIST (node_io_flag),ATTR_LIST (dirty_segments),ATTR_LIST (free_segments), ATTR_LIST(unusable),
Signature · 1 line
2.27.0.278.ge193c7cf3a9-goog
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: attach IO flags to the missing cases
This adds more IOs to attach flags.
--- fs/f2fs/data.c | 2 ++ 1 file changed, 2 insertions(+)
fs/f2fs/data.c +2 -0
@@ -702,6 +702,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)if (fio->io_wbc && !is_read_io (fio->op))wbc_account_cgroup_owner (fio->io_wbc, page,PAGE_SIZE ); +__attach_io_flag (fio);bio_set_op_attrs (bio, fio->op, fio->op_flags); inc_page_count(fio->sbi, is_read_io(fio->op) ?
@@ -888,6 +889,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) alloc_new:if (!bio) { bio =__bio_alloc (fio,BIO_MAX_PAGES ); +__attach_io_flag (fio);bio_set_op_attrs (bio, fio->op, fio->op_flags);add_bio_entry (fio->sbi, bio, page, fio->temp);
Signature · 1 line
2.27.0.278.ge193c7cf3a9-goog
Re: [f2fs-dev] [PATCH 2/2] f2fs: attach IO flags to the missing cases
Quoted 4 lines · Jaegeuk Kim
This adds more IOs to attach flags.
Fixes d58f2f658159 ("f2fs: add node_io_flag for bio flags likewise data_io_flag")Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Jaegeuk Kim
maintainerRe: [PATCH 2/2 v2] f2fs: attach IO flags to the missing cases
In reply to Jaegeuk KimThis patch adds another way to attach bio flags to node writes.
Description: Give a way to attach REQ_META|FUA to node writes
given temperature-based bits. Now the bits indicate:
* REQ_META | REQ_FUA |
* 5 | 4 | 3 | 2 | 1 | 0 |
* Cold | Warm | Hot | Cold | Warm | Hot |
---
v2 log:
- remove redundant code
Documentation/ABI/testing/sysfs-fs-f2fs | 9 +++++++++ fs/f2fs/data.c | 24 +++++++++++++++--------- fs/f2fs/f2fs.h | 1 + fs/f2fs/sysfs.c | 2 ++ 4 files changed, 27 insertions(+), 9 deletions(-)
Documentation/ABI/testing/sysfs-fs-f2fs +9 -0
@@ -333,6 +333,15 @@ Description: Give a way to attach REQ_META|FUA to data writes * 5 | 4 | 3 | 2 | 1 | 0 | * Cold | Warm | Hot | Cold | Warm | Hot | +What: /sys/fs/f2fs/<disk>/node_io_flag +Date: June 2020 +Contact: "Jaegeuk Kim" <[email protected]> +Description: Give a way to attach REQ_META|FUA to node writes + given temperature-based bits. Now the bits indicate: + * REQ_META | REQ_FUA | + * 5 | 4 | 3 | 2 | 1 | 0 | + * Cold | Warm | Hot | Cold | Warm | Hot | + What: /sys/fs/f2fs/<disk>/iostat_period_ms Date: April 2020 Contact: "Daeho Jeong" <[email protected]>
fs/f2fs/data.c +15 -9
@@ -514,22 +514,28 @@ void f2fs_submit_bio(struct f2fs_sb_info *sbi,__submit_bio (sbi, bio, type); } -static void __attach_data_io_flag (struct f2fs_io_info *fio) +static void __attach_io_flag (struct f2fs_io_info *fio) {struct f2fs_sb_info *sbi = fio->sbi;unsigned int temp_mask = (1 <<NR_TEMP_TYPE ) -1 ; -unsigned int fua_flag = sbi->data_io_flag & temp_mask; -unsigned int meta_flag = (sbi->data_io_flag >>NR_TEMP_TYPE ) & - temp_mask; +unsigned int io_flag, fua_flag, meta_flag; + +if (fio->type ==DATA ) + io_flag = sbi->data_io_flag; +else if (fio->type ==NODE ) + io_flag = sbi->node_io_flag; +else +return ; + + fua_flag = io_flag & temp_mask; + meta_flag = (io_flag >>NR_TEMP_TYPE ) & temp_mask; +/* -* data io flag bits per temp: +* data/node io flag bits per temp: * REQ_META | REQ_FUA | * 5 | 4 | 3 | 2 | 1 | 0 | * Cold | Warm | Hot | Cold | Warm | Hot | */ -if (fio->type !=DATA ) -return ; -if ((1 << fio->temp) & meta_flag) fio->op_flags |=REQ_META ;if ((1 << fio->temp) & fua_flag)
@@ -543,7 +549,7 @@ static void __submit_merged_bio(struct f2fs_bio_info *io)if (!io->bio)return ; -__attach_data_io_flag (fio); +__attach_io_flag (fio);bio_set_op_attrs (io->bio, fio->op, fio->op_flags);if (is_read_io (fio->op))
fs/f2fs/f2fs.h +1 -0
@@ -1568,6 +1568,7 @@ struct f2fs_sb_info {/* to attach REQ_META|REQ_FUA flags */ unsigned int data_io_flag; +unsigned int node_io_flag;/* For sysfs suppport */ struct kobject s_kobj;
fs/f2fs/sysfs.c +2 -0
@@ -554,6 +554,7 @@ F2FS_RW_ATTR(FAULT_INFO_RATE, f2fs_fault_info, inject_rate, inject_rate);F2FS_RW_ATTR (FAULT_INFO_TYPE , f2fs_fault_info, inject_type, inject_type);#endif F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, data_io_flag, data_io_flag); +F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, node_io_flag, node_io_flag);F2FS_GENERAL_RO_ATTR (dirty_segments);F2FS_GENERAL_RO_ATTR (free_segments);F2FS_GENERAL_RO_ATTR (lifetime_write_kbytes);
@@ -635,6 +636,7 @@ static struct attribute *f2fs_attrs[] = {ATTR_LIST (inject_type), #endifATTR_LIST (data_io_flag), +ATTR_LIST (node_io_flag),ATTR_LIST (dirty_segments),ATTR_LIST (free_segments), ATTR_LIST(unusable),
Signature · 1 line
2.27.0.278.ge193c7cf3a9-goog
Chao Yu
Reviewed-byRe: [f2fs-dev] [PATCH 2/2 v2] f2fs: attach IO flags to the missing cases
Jaegeuk,
This patch should be applied before "f2fs: attach IO flags to the missing cases", otherwise, gcc may complain about implicit declaration of "__attach_io_flag".
Quoted 9 lines · Jaegeuk Kim
This patch adds another way to attach bio flags to node writes.
Description: Give a way to attach REQ_META|FUA to node writes
given temperature-based bits. Now the bits indicate:
*REQ_META|REQ_FUA|
* 5 | 4 | 3 | 2 | 1 | 0 |
* Cold | Warm | Hot | Cold | Warm | Hot |Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/2 v2] f2fs: attach IO flags to the missing cases
Quoted 4 lines · Chao Yu
Jaegeuk,
This patch should be applied before "f2fs: attach IO flags to the missing cases", otherwise, gcc may complain about implicit declaration of "
__attach_io_flag".
Yup. Done. :P
Quoted 15 lines · Jaegeuk Kim
Quoted 9 lines
This patch adds another way to attach bio flags to node writes.
Description: Give a way to attach REQ_META|FUA to node writes
given temperature-based bits. Now the bits indicate:
*REQ_META|REQ_FUA|
* 5 | 4 | 3 | 2 | 1 | 0 |
* Cold | Warm | Hot | Cold | Warm | Hot |Signed-off-by Jaegeuk Kim <[email protected]>Reviewed-by Chao Yu <[email protected]>Thanks,
Quoted 41 lines · Jaegeuk Kim
This patch adds another way to attach bio flags to node writes.
Description: Give a way to attach REQ_META|FUA to node writes
given temperature-based bits. Now the bits indicate:
*REQ_META|REQ_FUA|
* 5 | 4 | 3 | 2 | 1 | 0 |
* Cold | Warm | Hot | Cold | Warm | Hot |Signed-off-by Jaegeuk Kim <[email protected]>--- Documentation/ABI/testing/sysfs-fs-f2fs | 9 ++++++ fs/f2fs/data.c | 39 ++++++++++++++++++------- fs/f2fs/f2fs.h | 1 + fs/f2fs/sysfs.c | 2 ++ 4 files changed, 40 insertions(+), 11 deletions(-)Documentation/ABI/testing/sysfs-fs-f2fs +9
-0@@ -333,6 +333,15 @@ Description: Give a way to attach REQ_META|FUA to data writes * 5 | 4 | 3 | 2 | 1 | 0 | * Cold | Warm | Hot | Cold | Warm | Hot | +What: /sys/fs/f2fs/<disk>/node_io_flag +Date: June 2020 +Contact: "Jaegeuk Kim" <[email protected]> +Description: Give a way to attach REQ_META|FUA to node writes + given temperature-based bits. Now the bits indicate: + * REQ_META | REQ_FUA | + * 5 | 4 | 3 | 2 | 1 | 0 | + * Cold | Warm | Hot | Cold | Warm | Hot | + What: /sys/fs/f2fs/<disk>/iostat_period_ms Date: April 2020 Contact: "Daeho Jeong" <[email protected]>fs/f2fs/data.c +0
-0
fs/f2fs/data.c void f2fs_submit_bio(struct f2fs_sb_info *sbi, · line 520
Quoted 8 lines
fs/f2fs/data.c +1
-1@@ -514,26 +514,43 @@ void f2fs_submit_bio(struct f2fs_sb_info *sbi,__submit_bio (sbi, bio, type); } -static void __attach_data_io_flag (struct f2fs_io_info *fio) +static void __attach_io_flag (struct f2fs_io_info *fio) {struct f2fs_sb_info *sbi = fio->sbi;unsigned int temp_mask = (1 <<NR_TEMP_TYPE ) -1 ;
Could we avoid duplicated codes as much as possible?
unsigned int flag = fio->type == DATA ? sbi->data_io_flag : sbi->node_io_flag; unsigned int fua_flag = flag & temp_mask;
unsigned int meta_flag = (flag >> NR_TEMP_TYPE) & temp_mask;
Thanks,
Quoted 80 lines
fs/f2fs/data.c +27
-10-unsigned int fua_flag = sbi->data_io_flag & temp_mask; -unsigned int meta_flag = (sbi->data_io_flag >>NR_TEMP_TYPE ) & - temp_mask; +/* * data io flag bits per temp: * REQ_META | REQ_FUA | * 5 | 4 | 3 | 2 | 1 | 0 | * Cold | Warm | Hot | Cold | Warm | Hot | */ -if (fio->type !=DATA ) -return ; +if (fio->type ==DATA ) { +unsigned int fua_flag = sbi->data_io_flag & temp_mask; +unsigned int meta_flag = (sbi->data_io_flag >>NR_TEMP_TYPE ) & + temp_mask; -if ((1 << fio->temp) & meta_flag) - fio->op_flags |=REQ_META ; -if ((1 << fio->temp) & fua_flag) - fio->op_flags |=REQ_FUA ; +if ((1 << fio->temp) & meta_flag) + fio->op_flags |=REQ_META ; +if ((1 << fio->temp) & fua_flag) + fio->op_flags |=REQ_FUA ; + } +/* +* node io flag bits per temp: +* REQ_META | REQ_FUA | +* 5 | 4 | 3 | 2 | 1 | 0 | +* Cold | Warm | Hot | Cold | Warm | Hot | +*/ +if (fio->type ==NODE ) { +unsigned int fua_flag = sbi->node_io_flag & temp_mask; +unsigned int meta_flag = (sbi->node_io_flag >>NR_TEMP_TYPE ) & + temp_mask; + +if ((1 << fio->temp) & meta_flag) + fio->op_flags |=REQ_META ; +if ((1 << fio->temp) & fua_flag) + fio->op_flags |=REQ_FUA ; + } }static void __submit_merged_bio (struct f2fs_bio_info *io)@@ -543,7 +560,7 @@ static void __submit_merged_bio(struct f2fs_bio_info *io)if (!io->bio)return ; -__attach_data_io_flag (fio); +__attach_io_flag (fio);bio_set_op_attrs (io->bio, fio->op, fio->op_flags);if (is_read_io (fio->op))fs/f2fs/f2fs.h +1
-0@@ -1568,6 +1568,7 @@ struct f2fs_sb_info {/* to attach REQ_META|REQ_FUA flags */ unsigned int data_io_flag; +unsigned int node_io_flag;/* For sysfs suppport */ struct kobject s_kobj;fs/f2fs/sysfs.c +1
-0@@ -554,6 +554,7 @@ F2FS_RW_ATTR(FAULT_INFO_RATE, f2fs_fault_info, inject_rate, inject_rate);F2FS_RW_ATTR (FAULT_INFO_TYPE , f2fs_fault_info, inject_type, inject_type);#endif F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, data_io_flag, data_io_flag); +F2FS_RW_ATTR (F2FS_SBI , f2fs_sb_info, node_io_flag, node_io_flag);F2FS_GENERAL_RO_ATTR (dirty_segments);F2FS_GENERAL_RO_ATTR (free_segments);F2FS_GENERAL_RO_ATTR (lifetime_write_kbytes);
fs/f2fs/sysfs.c static struct attribute *f2fs_attrs[] = { · line 642
Quoted 7 lines
fs/f2fs/sysfs.c +1
-0@@ -635,6 +636,7 @@ static struct attribute *f2fs_attrs[] = {ATTR_LIST (inject_type), #endifATTR_LIST (data_io_flag), +ATTR_LIST (node_io_flag),ATTR_LIST (dirty_segments),ATTR_LIST (free_segments), ATTR_LIST(unusable),
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel