aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2020-01-06 16:43:09 -0800
committerJaegeuk Kim <jaegeuk@kernel.org>2020-01-17 16:48:43 -0800
commit0e7f41974e9c6ceac3ac9b5d0377c5f74b1bc4fc (patch)
treef0ac5c4242560a103d231f744a458355bc5d219d
parentf2fs: code cleanup for f2fs_statfs_project() (diff)
downloadlinux-dev-0e7f41974e9c6ceac3ac9b5d0377c5f74b1bc4fc.tar.xz
linux-dev-0e7f41974e9c6ceac3ac9b5d0377c5f74b1bc4fc.zip
f2fs: add a way to turn off ipu bio cache
Setting 0x40 in /sys/fs/f2fs/dev/ipu_policy gives a way to turn off bio cache, which is useufl to check whether block layer using hardware encryption engine merges IOs correctly. Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--Documentation/filesystems/f2fs.txt5
-rw-r--r--fs/f2fs/segment.c2
-rw-r--r--fs/f2fs/segment.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/filesystems/f2fs.txt b/Documentation/filesystems/f2fs.txt
index 41b5aa94b30f..b80a7b69f210 100644
--- a/Documentation/filesystems/f2fs.txt
+++ b/Documentation/filesystems/f2fs.txt
@@ -331,10 +331,11 @@ Files in /sys/fs/f2fs/<devname>
conducts. 32 sections is set by default.
ipu_policy This parameter controls the policy of in-place
- updates in f2fs. There are five policies:
+ updates in f2fs. User can set:
0x01: F2FS_IPU_FORCE, 0x02: F2FS_IPU_SSR,
0x04: F2FS_IPU_UTIL, 0x08: F2FS_IPU_SSR_UTIL,
- 0x10: F2FS_IPU_FSYNC.
+ 0x10: F2FS_IPU_FSYNC, 0x40: F2FS_IPU_NOCACHE.
+ Refer segment.h for details.
min_ipu_util This parameter controls the threshold to trigger
in-place-updates. The number indicates percentage
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 72cf2574a00d..1d3bb2605b03 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3289,7 +3289,7 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio)
stat_inc_inplace_blocks(fio->sbi);
- if (fio->bio)
+ if (fio->bio && !(SM_I(sbi)->ipu_policy & (1 << F2FS_IPU_NOCACHE)))
err = f2fs_merge_page_bio(fio);
else
err = f2fs_submit_page_bio(fio);
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index a1b3951367cd..5e6cd8d8411d 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -608,6 +608,7 @@ static inline int utilization(struct f2fs_sb_info *sbi)
* F2FS_IPU_FSYNC - activated in fsync path only for high performance flash
* storages. IPU will be triggered only if the # of dirty
* pages over min_fsync_blocks.
+ * F2FS_IPU_NOCACHE - disable IPU bio cache.
* F2FS_IPUT_DISABLE - disable IPU. (=default option)
*/
#define DEF_MIN_IPU_UTIL 70
@@ -623,6 +624,7 @@ enum {
F2FS_IPU_SSR_UTIL,
F2FS_IPU_FSYNC,
F2FS_IPU_ASYNC,
+ F2FS_IPU_NOCACHE,
};
static inline unsigned int curseg_segno(struct f2fs_sb_info *sbi,