To fix:
WARNING: function definition argument 'struct f2fs_attr *' should also have an identifier name
+ ssize_t (*show)(struct f2fs_attr *, struct f2fs_sb_info *, char *);
WARNING: return sysfs_emit(...) formats should include a terminating newline
+ return sysfs_emit(buf, "(none)");
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
+ unsigned npages = NODE_MAPPING(sbi)->nrpages;
WARNING: Missing a blank line after declarations
+ unsigned npages = COMPRESS_MAPPING(sbi)->nrpages;
+ si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
WARNING: quoted string split across lines
+ seq_printf(s, "CP merge (Queued: %4d, Issued: %4d, Total: %4d, "
+ "Cur time: %4d(ms), Peak time: %4d(ms))\n",
Signed-off-by: Yangtao Li <[email protected]>
---
fs/f2fs/debug.c | 45 +++++++++++++++++++++++----------------------
fs/f2fs/sysfs.c | 10 +++++-----
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index a216dcdf6941..733b1bd37404 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -301,18 +301,19 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
si->page_mem = 0;
if (sbi->node_inode) {
- unsigned npages = NODE_MAPPING(sbi)->nrpages;
+ unsigned long npages = NODE_MAPPING(sbi)->nrpages;
si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
}
if (sbi->meta_inode) {
- unsigned npages = META_MAPPING(sbi)->nrpages;
+ unsigned long npages = META_MAPPING(sbi)->nrpages;
si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
}
#ifdef CONFIG_F2FS_FS_COMPRESSION
if (sbi->compress_inode) {
- unsigned npages = COMPRESS_MAPPING(sbi)->nrpages;
+ unsigned long npages = COMPRESS_MAPPING(sbi)->nrpages;
+
si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
}
#endif
@@ -460,28 +461,28 @@ static int stat_show(struct seq_file *s, void *v)
si->meta_count[META_NAT]);
seq_printf(s, " - ssa blocks : %u\n",
si->meta_count[META_SSA]);
- seq_printf(s, "CP merge (Queued: %4d, Issued: %4d, Total: %4d, "
- "Cur time: %4d(ms), Peak time: %4d(ms))\n",
- si->nr_queued_ckpt, si->nr_issued_ckpt,
- si->nr_total_ckpt, si->cur_ckpt_time,
- si->peak_ckpt_time);
+ seq_puts(s, "CP merge:\n");
+ seq_printf(s, " - Queued : %4d\n", si->nr_queued_ckpt);
+ seq_printf(s, " - Issued : %4d\n", si->nr_issued_ckpt);
+ seq_printf(s, " - Total : %4d\n", si->nr_total_ckpt);
+ seq_printf(s, " - Cur time : %4d(ms)\n", si->cur_ckpt_time);
+ seq_printf(s, " - Peak time : %4d(ms)\n", si->peak_ckpt_time);
seq_printf(s, "GC calls: %d (BG: %d)\n",
si->call_count, si->bg_gc);
seq_printf(s, " - data segments : %d (%d)\n",
si->data_segs, si->bg_data_segs);
seq_printf(s, " - node segments : %d (%d)\n",
si->node_segs, si->bg_node_segs);
- seq_printf(s, " - Reclaimed segs : Normal (%d), Idle CB (%d), "
- "Idle Greedy (%d), Idle AT (%d), "
- "Urgent High (%d), Urgent Mid (%d), "
- "Urgent Low (%d)\n",
- si->sbi->gc_reclaimed_segs[GC_NORMAL],
- si->sbi->gc_reclaimed_segs[GC_IDLE_CB],
- si->sbi->gc_reclaimed_segs[GC_IDLE_GREEDY],
- si->sbi->gc_reclaimed_segs[GC_IDLE_AT],
- si->sbi->gc_reclaimed_segs[GC_URGENT_HIGH],
- si->sbi->gc_reclaimed_segs[GC_URGENT_MID],
- si->sbi->gc_reclaimed_segs[GC_URGENT_LOW]);
+ seq_puts(s, " - Reclaimed segs :\n");
+ seq_printf(s, " - Normal : %d\n", si->sbi->gc_reclaimed_segs[GC_NORMAL]);
+ seq_printf(s, " - Idle CB : %d\n", si->sbi->gc_reclaimed_segs[GC_IDLE_CB]);
+ seq_printf(s, " - Idle Greedy : %d\n",
+ si->sbi->gc_reclaimed_segs[GC_IDLE_GREEDY]);
+ seq_printf(s, " - Idle AT : %d\n", si->sbi->gc_reclaimed_segs[GC_IDLE_AT]);
+ seq_printf(s, " - Urgent High : %d\n",
+ si->sbi->gc_reclaimed_segs[GC_URGENT_HIGH]);
+ seq_printf(s, " - Urgent Mid : %d\n", si->sbi->gc_reclaimed_segs[GC_URGENT_MID]);
+ seq_printf(s, " - Urgent Low : %d\n", si->sbi->gc_reclaimed_segs[GC_URGENT_LOW]);
seq_printf(s, "Try to move %d blocks (BG: %d)\n", si->tot_blks,
si->bg_data_blks + si->bg_node_blks);
seq_printf(s, " - data blocks : %d (%d)\n", si->data_blks,
@@ -505,11 +506,11 @@ static int stat_show(struct seq_file *s, void *v)
si->nr_dio_read, si->nr_dio_write);
seq_printf(s, " - IO_R (Data: %4d, Node: %4d, Meta: %4d\n",
si->nr_rd_data, si->nr_rd_node, si->nr_rd_meta);
- seq_printf(s, " - IO_W (CP: %4d, Data: %4d, Flush: (%4d %4d %4d), "
- "Discard: (%4d %4d)) cmd: %4d undiscard:%4u\n",
+ seq_printf(s, " - IO_W (CP: %4d, Data: %4d, Flush: (%4d %4d %4d), ",
si->nr_wb_cp_data, si->nr_wb_data,
si->nr_flushing, si->nr_flushed,
- si->flush_list_empty,
+ si->flush_list_empty);
+ seq_printf(s, "Discard: (%4d %4d)) cmd: %4d undiscard:%4u\n",
si->nr_discarding, si->nr_discarded,
si->nr_discard_cmd, si->undiscard_blks);
seq_printf(s, " - atomic IO: %4d (Max. %4d)\n",
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index a4745d596310..024346f0e9ce 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -53,9 +53,9 @@ static const char *gc_mode_names[MAX_GC_MODE] = {
struct f2fs_attr {
struct attribute attr;
- ssize_t (*show)(struct f2fs_attr *, struct f2fs_sb_info *, char *);
- ssize_t (*store)(struct f2fs_attr *, struct f2fs_sb_info *,
- const char *, size_t);
+ ssize_t (*show)(struct f2fs_attr *a, struct f2fs_sb_info *sbi, char *buf);
+ ssize_t (*store)(struct f2fs_attr *a, struct f2fs_sb_info *sbi,
+ const char *buf, size_t len);
int struct_type;
int offset;
int id;
@@ -232,13 +232,13 @@ static ssize_t encoding_show(struct f2fs_attr *a,
(sb->s_encoding->version >> 8) & 0xff,
sb->s_encoding->version & 0xff);
#endif
- return sysfs_emit(buf, "(none)");
+ return sysfs_emit(buf, "(none)\n");
}
static ssize_t mounted_time_sec_show(struct f2fs_attr *a,
struct f2fs_sb_info *sbi, char *buf)
{
- return sysfs_emit(buf, "%llu", SIT_I(sbi)->mounted_time);
+ return sysfs_emit(buf, "%llu\n", SIT_I(sbi)->mounted_time);
}
#ifdef CONFIG_F2FS_STAT_FS
--
2.25.1
This patch adds support for counting the average time of submit discard
command, and we can see its value in debugfs.
Signed-off-by: Yangtao Li <[email protected]>
---
fs/f2fs/debug.c | 7 +++++--
fs/f2fs/f2fs.h | 5 +++++
fs/f2fs/segment.c | 18 ++++++++++++++++--
3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index 733b1bd37404..eed3edfc5faf 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -109,6 +109,9 @@ static void update_general_status(struct f2fs_sb_info *sbi)
llist_empty(&SM_I(sbi)->fcc_info->issue_list);
}
if (SM_I(sbi)->dcc_info) {
+ struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
+
+ si->discard_avg = dcc->discard_time_avg;
si->nr_discarded =
atomic_read(&SM_I(sbi)->dcc_info->issued_discard);
si->nr_discarding =
@@ -510,8 +513,8 @@ static int stat_show(struct seq_file *s, void *v)
si->nr_wb_cp_data, si->nr_wb_data,
si->nr_flushing, si->nr_flushed,
si->flush_list_empty);
- seq_printf(s, "Discard: (%4d %4d)) cmd: %4d undiscard:%4u\n",
- si->nr_discarding, si->nr_discarded,
+ seq_printf(s, "Discard: (%4d %4d, avg:%4lldns)) cmd: %4d undiscard:%4u\n",
+ si->nr_discarding, si->nr_discarded, ktime_to_us(si->discard_avg),
si->nr_discard_cmd, si->undiscard_blks);
seq_printf(s, " - atomic IO: %4d (Max. %4d)\n",
si->aw_cnt, si->max_aw_cnt);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index eb8c27c4e5fc..5a99759d10ac 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -370,6 +370,8 @@ struct discard_cmd {
int error; /* bio error */
spinlock_t lock; /* for state/bio_ref updating */
unsigned short bio_ref; /* bio reference count */
+ struct discard_cmd_control *dcc; /* global discard cmd control */
+ ktime_t submit_start; /* submit start time */
};
enum {
@@ -414,6 +416,8 @@ struct discard_cmd_control {
unsigned int max_ordered_discard; /* maximum discard granularity issued by lba order */
unsigned int undiscard_blks; /* # of undiscard blocks */
unsigned int next_pos; /* next discard position */
+ spinlock_t discard_time_lock; /* for discard time statistics */
+ ktime_t discard_time_avg; /* issued discard cmd avg time */
atomic_t issued_discard; /* # of issued discard */
atomic_t queued_discard; /* # of queued discard */
atomic_t discard_cmd_cnt; /* # of cached cmd count */
@@ -3882,6 +3886,7 @@ struct f2fs_stat_info {
int nr_dio_read, nr_dio_write;
unsigned int io_skip_bggc, other_skip_bggc;
int nr_flushing, nr_flushed, flush_list_empty;
+ ktime_t discard_avg;
int nr_discarding, nr_discarded;
int nr_discard_cmd;
unsigned int undiscard_blks;
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 9486ca49ecb1..bc96b1afb308 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -931,6 +931,7 @@ static struct discard_cmd *__create_discard_cmd(struct f2fs_sb_info *sbi,
list_add_tail(&dc->list, pend_list);
spin_lock_init(&dc->lock);
dc->bio_ref = 0;
+ dc->dcc = dcc;
atomic_inc(&dcc->discard_cmd_cnt);
dcc->undiscard_blks += len;
@@ -1000,9 +1001,13 @@ static void __remove_discard_cmd(struct f2fs_sb_info *sbi,
static void f2fs_submit_discard_endio(struct bio *bio)
{
struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
+ struct discard_cmd_control *dcc = dc->dcc;
unsigned long flags;
+ ktime_t submit_time;
+ int nr_discarded;
spin_lock_irqsave(&dc->lock, flags);
+ submit_time = ktime_sub(ktime_get(), dc->submit_start);
if (!dc->error)
dc->error = blk_status_to_errno(bio->bi_status);
dc->bio_ref--;
@@ -1012,6 +1017,14 @@ static void f2fs_submit_discard_endio(struct bio *bio)
}
spin_unlock_irqrestore(&dc->lock, flags);
bio_put(bio);
+
+ spin_lock_irqsave(&dcc->discard_time_lock, flags);
+ nr_discarded = atomic_read(&dcc->issued_discard);
+ dcc->discard_time_avg = div_u64(ktime_add(nr_discarded * dcc->discard_time_avg,
+ submit_time),
+ nr_discarded + 1);
+ atomic_inc(&dcc->issued_discard);
+ spin_unlock_irqrestore(&dcc->discard_time_lock, flags);
}
static void __check_sit_bitmap(struct f2fs_sb_info *sbi,
@@ -1160,6 +1173,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
* right away
*/
spin_lock_irqsave(&dc->lock, flags);
+ dc->submit_start = ktime_get();
if (last)
dc->state = D_SUBMIT;
else
@@ -1179,8 +1193,6 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
bio->bi_opf |= flag;
submit_bio(bio);
- atomic_inc(&dcc->issued_discard);
-
f2fs_update_iostat(sbi, NULL, FS_DISCARD, 1);
lstart += len;
@@ -2070,9 +2082,11 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
INIT_LIST_HEAD(&dcc->wait_list);
INIT_LIST_HEAD(&dcc->fstrim_list);
mutex_init(&dcc->cmd_lock);
+ spin_lock_init(&dcc->discard_time_lock);
atomic_set(&dcc->issued_discard, 0);
atomic_set(&dcc->queued_discard, 0);
atomic_set(&dcc->discard_cmd_cnt, 0);
+ dcc->discard_time_avg = 0;
dcc->nr_discards = 0;
dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
--
2.25.1
On 11/29, Yangtao Li wrote:
> This patch adds support for counting the average time of submit discard
> command, and we can see its value in debugfs.
What about peak latencies as well?
>
> Signed-off-by: Yangtao Li <[email protected]>
> ---
> fs/f2fs/debug.c | 7 +++++--
> fs/f2fs/f2fs.h | 5 +++++
> fs/f2fs/segment.c | 18 ++++++++++++++++--
> 3 files changed, 26 insertions(+), 4 deletions(-)
>
> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> index 733b1bd37404..eed3edfc5faf 100644
> --- a/fs/f2fs/debug.c
> +++ b/fs/f2fs/debug.c
> @@ -109,6 +109,9 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> llist_empty(&SM_I(sbi)->fcc_info->issue_list);
> }
> if (SM_I(sbi)->dcc_info) {
> + struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
> +
> + si->discard_avg = dcc->discard_time_avg;
> si->nr_discarded =
> atomic_read(&SM_I(sbi)->dcc_info->issued_discard);
> si->nr_discarding =
> @@ -510,8 +513,8 @@ static int stat_show(struct seq_file *s, void *v)
> si->nr_wb_cp_data, si->nr_wb_data,
> si->nr_flushing, si->nr_flushed,
> si->flush_list_empty);
> - seq_printf(s, "Discard: (%4d %4d)) cmd: %4d undiscard:%4u\n",
> - si->nr_discarding, si->nr_discarded,
> + seq_printf(s, "Discard: (%4d %4d, avg:%4lldns)) cmd: %4d undiscard:%4u\n",
> + si->nr_discarding, si->nr_discarded, ktime_to_us(si->discard_avg),
> si->nr_discard_cmd, si->undiscard_blks);
> seq_printf(s, " - atomic IO: %4d (Max. %4d)\n",
> si->aw_cnt, si->max_aw_cnt);
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index eb8c27c4e5fc..5a99759d10ac 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -370,6 +370,8 @@ struct discard_cmd {
> int error; /* bio error */
> spinlock_t lock; /* for state/bio_ref updating */
> unsigned short bio_ref; /* bio reference count */
> + struct discard_cmd_control *dcc; /* global discard cmd control */
> + ktime_t submit_start; /* submit start time */
> };
>
> enum {
> @@ -414,6 +416,8 @@ struct discard_cmd_control {
> unsigned int max_ordered_discard; /* maximum discard granularity issued by lba order */
> unsigned int undiscard_blks; /* # of undiscard blocks */
> unsigned int next_pos; /* next discard position */
> + spinlock_t discard_time_lock; /* for discard time statistics */
> + ktime_t discard_time_avg; /* issued discard cmd avg time */
> atomic_t issued_discard; /* # of issued discard */
> atomic_t queued_discard; /* # of queued discard */
> atomic_t discard_cmd_cnt; /* # of cached cmd count */
> @@ -3882,6 +3886,7 @@ struct f2fs_stat_info {
> int nr_dio_read, nr_dio_write;
> unsigned int io_skip_bggc, other_skip_bggc;
> int nr_flushing, nr_flushed, flush_list_empty;
> + ktime_t discard_avg;
> int nr_discarding, nr_discarded;
> int nr_discard_cmd;
> unsigned int undiscard_blks;
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 9486ca49ecb1..bc96b1afb308 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -931,6 +931,7 @@ static struct discard_cmd *__create_discard_cmd(struct f2fs_sb_info *sbi,
> list_add_tail(&dc->list, pend_list);
> spin_lock_init(&dc->lock);
> dc->bio_ref = 0;
> + dc->dcc = dcc;
> atomic_inc(&dcc->discard_cmd_cnt);
> dcc->undiscard_blks += len;
>
> @@ -1000,9 +1001,13 @@ static void __remove_discard_cmd(struct f2fs_sb_info *sbi,
> static void f2fs_submit_discard_endio(struct bio *bio)
> {
> struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
> + struct discard_cmd_control *dcc = dc->dcc;
> unsigned long flags;
> + ktime_t submit_time;
> + int nr_discarded;
>
> spin_lock_irqsave(&dc->lock, flags);
> + submit_time = ktime_sub(ktime_get(), dc->submit_start);
> if (!dc->error)
> dc->error = blk_status_to_errno(bio->bi_status);
> dc->bio_ref--;
> @@ -1012,6 +1017,14 @@ static void f2fs_submit_discard_endio(struct bio *bio)
> }
> spin_unlock_irqrestore(&dc->lock, flags);
> bio_put(bio);
> +
> + spin_lock_irqsave(&dcc->discard_time_lock, flags);
> + nr_discarded = atomic_read(&dcc->issued_discard);
> + dcc->discard_time_avg = div_u64(ktime_add(nr_discarded * dcc->discard_time_avg,
> + submit_time),
> + nr_discarded + 1);
> + atomic_inc(&dcc->issued_discard);
> + spin_unlock_irqrestore(&dcc->discard_time_lock, flags);
> }
>
> static void __check_sit_bitmap(struct f2fs_sb_info *sbi,
> @@ -1160,6 +1173,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
> * right away
> */
> spin_lock_irqsave(&dc->lock, flags);
> + dc->submit_start = ktime_get();
> if (last)
> dc->state = D_SUBMIT;
> else
> @@ -1179,8 +1193,6 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
> bio->bi_opf |= flag;
> submit_bio(bio);
>
> - atomic_inc(&dcc->issued_discard);
> -
> f2fs_update_iostat(sbi, NULL, FS_DISCARD, 1);
>
> lstart += len;
> @@ -2070,9 +2082,11 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
> INIT_LIST_HEAD(&dcc->wait_list);
> INIT_LIST_HEAD(&dcc->fstrim_list);
> mutex_init(&dcc->cmd_lock);
> + spin_lock_init(&dcc->discard_time_lock);
> atomic_set(&dcc->issued_discard, 0);
> atomic_set(&dcc->queued_discard, 0);
> atomic_set(&dcc->discard_cmd_cnt, 0);
> + dcc->discard_time_avg = 0;
> dcc->nr_discards = 0;
> dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;
> --
> 2.25.1
On 2022/11/29 12:15, Yangtao Li wrote:
> This patch adds support for counting the average time of submit discard
> command, and we can see its value in debugfs.
How about enabling this only when CONFIG_DEBUG_FS is on?
+Cc block mailing list
Not sure block layer has similar stats? if it hasn't, can such stat
be accounted in block layer, and then all filesystem can be benefited.
Thanks,
>
> Signed-off-by: Yangtao Li <[email protected]>
> ---
> fs/f2fs/debug.c | 7 +++++--
> fs/f2fs/f2fs.h | 5 +++++
> fs/f2fs/segment.c | 18 ++++++++++++++++--
> 3 files changed, 26 insertions(+), 4 deletions(-)
>
> diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
> index 733b1bd37404..eed3edfc5faf 100644
> --- a/fs/f2fs/debug.c
> +++ b/fs/f2fs/debug.c
> @@ -109,6 +109,9 @@ static void update_general_status(struct f2fs_sb_info *sbi)
> llist_empty(&SM_I(sbi)->fcc_info->issue_list);
> }
> if (SM_I(sbi)->dcc_info) {
> + struct discard_cmd_control *dcc = SM_I(sbi)->dcc_info;
> +
> + si->discard_avg = dcc->discard_time_avg;
> si->nr_discarded =
> atomic_read(&SM_I(sbi)->dcc_info->issued_discard);
> si->nr_discarding =
> @@ -510,8 +513,8 @@ static int stat_show(struct seq_file *s, void *v)
> si->nr_wb_cp_data, si->nr_wb_data,
> si->nr_flushing, si->nr_flushed,
> si->flush_list_empty);
> - seq_printf(s, "Discard: (%4d %4d)) cmd: %4d undiscard:%4u\n",
> - si->nr_discarding, si->nr_discarded,
> + seq_printf(s, "Discard: (%4d %4d, avg:%4lldns)) cmd: %4d undiscard:%4u\n",
> + si->nr_discarding, si->nr_discarded, ktime_to_us(si->discard_avg),
> si->nr_discard_cmd, si->undiscard_blks);
> seq_printf(s, " - atomic IO: %4d (Max. %4d)\n",
> si->aw_cnt, si->max_aw_cnt);
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index eb8c27c4e5fc..5a99759d10ac 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -370,6 +370,8 @@ struct discard_cmd {
> int error; /* bio error */
> spinlock_t lock; /* for state/bio_ref updating */
> unsigned short bio_ref; /* bio reference count */
> + struct discard_cmd_control *dcc; /* global discard cmd control */
> + ktime_t submit_start; /* submit start time */
> };
>
> enum {
> @@ -414,6 +416,8 @@ struct discard_cmd_control {
> unsigned int max_ordered_discard; /* maximum discard granularity issued by lba order */
> unsigned int undiscard_blks; /* # of undiscard blocks */
> unsigned int next_pos; /* next discard position */
> + spinlock_t discard_time_lock; /* for discard time statistics */
> + ktime_t discard_time_avg; /* issued discard cmd avg time */
> atomic_t issued_discard; /* # of issued discard */
> atomic_t queued_discard; /* # of queued discard */
> atomic_t discard_cmd_cnt; /* # of cached cmd count */
> @@ -3882,6 +3886,7 @@ struct f2fs_stat_info {
> int nr_dio_read, nr_dio_write;
> unsigned int io_skip_bggc, other_skip_bggc;
> int nr_flushing, nr_flushed, flush_list_empty;
> + ktime_t discard_avg;
> int nr_discarding, nr_discarded;
> int nr_discard_cmd;
> unsigned int undiscard_blks;
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 9486ca49ecb1..bc96b1afb308 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -931,6 +931,7 @@ static struct discard_cmd *__create_discard_cmd(struct f2fs_sb_info *sbi,
> list_add_tail(&dc->list, pend_list);
> spin_lock_init(&dc->lock);
> dc->bio_ref = 0;
> + dc->dcc = dcc;
> atomic_inc(&dcc->discard_cmd_cnt);
> dcc->undiscard_blks += len;
>
> @@ -1000,9 +1001,13 @@ static void __remove_discard_cmd(struct f2fs_sb_info *sbi,
> static void f2fs_submit_discard_endio(struct bio *bio)
> {
> struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
> + struct discard_cmd_control *dcc = dc->dcc;
> unsigned long flags;
> + ktime_t submit_time;
> + int nr_discarded;
>
> spin_lock_irqsave(&dc->lock, flags);
> + submit_time = ktime_sub(ktime_get(), dc->submit_start);
> if (!dc->error)
> dc->error = blk_status_to_errno(bio->bi_status);
> dc->bio_ref--;
> @@ -1012,6 +1017,14 @@ static void f2fs_submit_discard_endio(struct bio *bio)
> }
> spin_unlock_irqrestore(&dc->lock, flags);
> bio_put(bio);
> +
> + spin_lock_irqsave(&dcc->discard_time_lock, flags);
> + nr_discarded = atomic_read(&dcc->issued_discard);
> + dcc->discard_time_avg = div_u64(ktime_add(nr_discarded * dcc->discard_time_avg,
> + submit_time),
> + nr_discarded + 1);
> + atomic_inc(&dcc->issued_discard);
> + spin_unlock_irqrestore(&dcc->discard_time_lock, flags);
> }
>
> static void __check_sit_bitmap(struct f2fs_sb_info *sbi,
> @@ -1160,6 +1173,7 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
> * right away
> */
> spin_lock_irqsave(&dc->lock, flags);
> + dc->submit_start = ktime_get();
> if (last)
> dc->state = D_SUBMIT;
> else
> @@ -1179,8 +1193,6 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
> bio->bi_opf |= flag;
> submit_bio(bio);
>
> - atomic_inc(&dcc->issued_discard);
> -
> f2fs_update_iostat(sbi, NULL, FS_DISCARD, 1);
>
> lstart += len;
> @@ -2070,9 +2082,11 @@ static int create_discard_cmd_control(struct f2fs_sb_info *sbi)
> INIT_LIST_HEAD(&dcc->wait_list);
> INIT_LIST_HEAD(&dcc->fstrim_list);
> mutex_init(&dcc->cmd_lock);
> + spin_lock_init(&dcc->discard_time_lock);
> atomic_set(&dcc->issued_discard, 0);
> atomic_set(&dcc->queued_discard, 0);
> atomic_set(&dcc->discard_cmd_cnt, 0);
> + dcc->discard_time_avg = 0;
> dcc->nr_discards = 0;
> dcc->max_discards = MAIN_SEGS(sbi) << sbi->log_blocks_per_seg;
> dcc->max_discard_request = DEF_MAX_DISCARD_REQUEST;