f2fs: split discard command in prior to block layer
Chao Yu
maintainerPATCH v5 1/1 f2fs: split discard command in prior to block layer
From: Chao Yu <[email protected]>
Some devices has small max_{hw,}discard_sectors, so that in __blkdev_issue_discard(), one big size discard bio can be split into multiple small size discard bios, result in heavy load in IO scheduler and device, which can hang other sync IO for long time.
Now, f2fs is trying to control discard commands more elaboratively, in order to make less conflict in between discard IO and user IO to enhance application's performance, so in this patch, we will split discard bio in f2fs in prior to in block layer to reduce issuing multiple discard bios in a short time.
Signed-off-by Chao Yu <[email protected]>
---
v5:
- fix to add missing parenthese.
fs/f2fs/f2fs.h | 23 +++---- fs/f2fs/segment.c | 148 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 127 insertions(+), 44 deletions(-)
fs/f2fs/f2fs.h +13 -10
@@ -178,7 +178,6 @@ enum {#define MAX_DISCARD_BLOCKS (sbi) BLKS_PER_SEC(sbi)#define DEF_MAX_DISCARD_REQUEST 8/* issue 8 discards per round */ -#define DEF_MAX_DISCARD_LEN 512/* Max. 2MB per discard */ #define DEF_MIN_DISCARD_ISSUE_TIME 50/* 50 ms, if exists */ #define DEF_MID_DISCARD_ISSUE_TIME 500/* 500 ms, if device busy */ #define DEF_MAX_DISCARD_ISSUE_TIME 60000/* 60 s, if no candidates */
@@ -250,9 +249,10 @@ struct discard_entry { (MAX_PLIST_NUM - 1) : (blk_num - 1))enum { -D_PREP , -D_SUBMIT , -D_DONE , +D_PREP ,/* initial */ +D_PARTIAL ,/* partially submitted */ +D_SUBMIT ,/* all submitted */ +D_DONE ,/* finished */ };struct discard_info {
@@ -277,7 +277,10 @@ struct discard_cmd {struct block_device *bdev;/* bdev */ unsigned short ref;/* reference count */ unsigned char state;/* state */ +unsigned char issuing;/* issuing discard */ int error;/* bio error */ +spinlock_t lock;/* for state/bio_ref updating */ +unsigned short bio_ref;/* bio reference count */ };enum {
@@ -710,22 +713,22 @@ static inline void set_extent_info(struct extent_info *ei, unsigned int fofs, }static inline bool __is_discard_mergeable (struct discard_info *back, -struct discard_info *front) +struct discard_info *front,unsigned int max_len) {return (back->lstart + back->len == front->lstart) && - (back->len + front->len <DEF_MAX_DISCARD_LEN ); + (back->len + front->len <= max_len); }static inline bool __is_discard_back_mergeable (struct discard_info *cur, -struct discard_info *back) +struct discard_info *back,unsigned int max_len) { -return __is_discard_mergeable (back, cur); +return __is_discard_mergeable (back, cur, max_len); }static inline bool __is_discard_front_mergeable (struct discard_info *cur, -struct discard_info *front) +struct discard_info *front,unsigned int max_len) { -return __is_discard_mergeable (cur, front); +return __is_discard_mergeable (cur, front, max_len); } static inline bool __is_extent_mergeable(struct extent_info *back,
fs/f2fs/segment.c +114 -34
262 lines not on this page · raw message
Signature · 1 line
2.18.0