* [PATCH 1/2] f2fs: add node_io_flag for bio flags likewise data_io_flag
@ 2020-06-04 23:50 Jaegeuk Kim
2020-06-04 23:50 ` [PATCH 2/2] f2fs: attach IO flags to the missing cases Jaegeuk Kim
2020-06-08 2:18 ` [f2fs-dev] [PATCH 1/2] f2fs: add node_io_flag for bio flags likewise data_io_flag Chao Yu
0 siblings, 2 replies; 7+ messages in thread
From: Jaegeuk Kim @ 2020-06-04 23:50 UTC (permalink / raw)
To: linux-kernel, linux-f2fs-devel, kernel-team; +Cc: 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 <jaegeuk@kernel.org>
---
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(-)
diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
index 427f5b45c67f1..4bb93a06d8abc 100644
--- a/Documentation/ABI/testing/sysfs-fs-f2fs
+++ b/Documentation/ABI/testing/sysfs-fs-f2fs
@@ -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" <jaegeuk@kernel.org>
+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" <daehojeong@google.com>
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index a65bfc07ddb97..2f5293eb5e52a 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -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))
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index fb180020e175c..50e6cdf20b733 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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;
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index a117ae1f9d5f1..fc4a46b689040 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -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),
#endif
ATTR_LIST(data_io_flag),
+ ATTR_LIST(node_io_flag),
ATTR_LIST(dirty_segments),
ATTR_LIST(free_segments),
ATTR_LIST(unusable),
--
2.27.0.278.ge193c7cf3a9-goog
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] f2fs: attach IO flags to the missing cases
2020-06-04 23:50 [PATCH 1/2] f2fs: add node_io_flag for bio flags likewise data_io_flag Jaegeuk Kim
@ 2020-06-04 23:50 ` Jaegeuk Kim
2020-06-08 2:18 ` [f2fs-dev] " Chao Yu
2020-06-08 2:51 ` [PATCH 2/2 v2] " Jaegeuk Kim
2020-06-08 2:18 ` [f2fs-dev] [PATCH 1/2] f2fs: add node_io_flag for bio flags likewise data_io_flag Chao Yu
1 sibling, 2 replies; 7+ messages in thread
From: Jaegeuk Kim @ 2020-06-04 23:50 UTC (permalink / raw)
To: linux-kernel, linux-f2fs-devel, kernel-team; +Cc: 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 <jaegeuk@kernel.org>
---
fs/f2fs/data.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 2f5293eb5e52a..9d40db50cd65a 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -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);
--
2.27.0.278.ge193c7cf3a9-goog
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [f2fs-dev] [PATCH 2/2] f2fs: attach IO flags to the missing cases
2020-06-04 23:50 ` [PATCH 2/2] f2fs: attach IO flags to the missing cases Jaegeuk Kim
@ 2020-06-08 2:18 ` Chao Yu
2020-06-08 2:51 ` [PATCH 2/2 v2] " Jaegeuk Kim
1 sibling, 0 replies; 7+ messages in thread
From: Chao Yu @ 2020-06-08 2:18 UTC (permalink / raw)
To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel, kernel-team
On 2020/6/5 7:50, Jaegeuk Kim wrote:
> 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 <jaegeuk@kernel.org>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Thanks,
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/2 v2] f2fs: attach IO flags to the missing cases
2020-06-04 23:50 ` [PATCH 2/2] f2fs: attach IO flags to the missing cases Jaegeuk Kim
2020-06-08 2:18 ` [f2fs-dev] " Chao Yu
@ 2020-06-08 2:51 ` Jaegeuk Kim
2020-06-08 8:35 ` [f2fs-dev] " Chao Yu
1 sibling, 1 reply; 7+ messages in thread
From: Jaegeuk Kim @ 2020-06-08 2:51 UTC (permalink / raw)
To: linux-kernel, linux-f2fs-devel, kernel-team
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 <jaegeuk@kernel.org>
---
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(-)
diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
index 427f5b45c67f1..4bb93a06d8abc 100644
--- a/Documentation/ABI/testing/sysfs-fs-f2fs
+++ b/Documentation/ABI/testing/sysfs-fs-f2fs
@@ -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" <jaegeuk@kernel.org>
+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" <daehojeong@google.com>
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 703fcb2433269..267b5e76a02b5 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -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))
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 7794e2f0d6e8a..c812fb8e2d9c7 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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;
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index a117ae1f9d5f1..fc4a46b689040 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -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),
#endif
ATTR_LIST(data_io_flag),
+ ATTR_LIST(node_io_flag),
ATTR_LIST(dirty_segments),
ATTR_LIST(free_segments),
ATTR_LIST(unusable),
--
2.27.0.278.ge193c7cf3a9-goog
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [f2fs-dev] [PATCH 2/2 v2] f2fs: attach IO flags to the missing cases
2020-06-08 2:51 ` [PATCH 2/2 v2] " Jaegeuk Kim
@ 2020-06-08 8:35 ` Chao Yu
2020-06-08 12:58 ` Jaegeuk Kim
0 siblings, 1 reply; 7+ messages in thread
From: Chao Yu @ 2020-06-08 8:35 UTC (permalink / raw)
To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel, kernel-team
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".
On 2020/6/8 10:51, Jaegeuk Kim wrote:
> 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 <jaegeuk@kernel.org>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Thanks,
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [f2fs-dev] [PATCH 2/2 v2] f2fs: attach IO flags to the missing cases
2020-06-08 8:35 ` [f2fs-dev] " Chao Yu
@ 2020-06-08 12:58 ` Jaegeuk Kim
0 siblings, 0 replies; 7+ messages in thread
From: Jaegeuk Kim @ 2020-06-08 12:58 UTC (permalink / raw)
To: Chao Yu; +Cc: linux-kernel, linux-f2fs-devel, kernel-team
On 06/08, Chao Yu wrote:
> 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
>
> On 2020/6/8 10:51, Jaegeuk Kim wrote:
> > 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 <jaegeuk@kernel.org>
>
> Reviewed-by: Chao Yu <yuchao0@huawei.com>
>
> Thanks,
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [f2fs-dev] [PATCH 1/2] f2fs: add node_io_flag for bio flags likewise data_io_flag
2020-06-04 23:50 [PATCH 1/2] f2fs: add node_io_flag for bio flags likewise data_io_flag Jaegeuk Kim
2020-06-04 23:50 ` [PATCH 2/2] f2fs: attach IO flags to the missing cases Jaegeuk Kim
@ 2020-06-08 2:18 ` Chao Yu
1 sibling, 0 replies; 7+ messages in thread
From: Chao Yu @ 2020-06-08 2:18 UTC (permalink / raw)
To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel, kernel-team
On 2020/6/5 7:50, Jaegeuk Kim wrote:
> 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 <jaegeuk@kernel.org>
> ---
> 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(-)
>
> diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs
> index 427f5b45c67f1..4bb93a06d8abc 100644
> --- a/Documentation/ABI/testing/sysfs-fs-f2fs
> +++ b/Documentation/ABI/testing/sysfs-fs-f2fs
> @@ -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" <jaegeuk@kernel.org>
> +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" <daehojeong@google.com>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index a65bfc07ddb97..2f5293eb5e52a 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -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,
> - 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))
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index fb180020e175c..50e6cdf20b733 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -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;
> diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
> index a117ae1f9d5f1..fc4a46b689040 100644
> --- a/fs/f2fs/sysfs.c
> +++ b/fs/f2fs/sysfs.c
> @@ -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),
> #endif
> ATTR_LIST(data_io_flag),
> + ATTR_LIST(node_io_flag),
> ATTR_LIST(dirty_segments),
> ATTR_LIST(free_segments),
> ATTR_LIST(unusable),
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-06-08 12:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-04 23:50 [PATCH 1/2] f2fs: add node_io_flag for bio flags likewise data_io_flag Jaegeuk Kim
2020-06-04 23:50 ` [PATCH 2/2] f2fs: attach IO flags to the missing cases Jaegeuk Kim
2020-06-08 2:18 ` [f2fs-dev] " Chao Yu
2020-06-08 2:51 ` [PATCH 2/2 v2] " Jaegeuk Kim
2020-06-08 8:35 ` [f2fs-dev] " Chao Yu
2020-06-08 12:58 ` Jaegeuk Kim
2020-06-08 2:18 ` [f2fs-dev] [PATCH 1/2] f2fs: add node_io_flag for bio flags likewise data_io_flag Chao Yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).