Commit d9bac032 authored by Yangtao Li's avatar Yangtao Li Committed by Jaegeuk Kim
Browse files

f2fs: use iostat_lat_type directly as a parameter in the iostat_update_and_unbind_ctx() 



Convert to use iostat_lat_type as parameter instead of raw number.
BTW, move NUM_PREALLOC_IOSTAT_CTXS to the header file, adjust
iostat_lat[{0,1,2}] to iostat_lat[{READ_IO,WRITE_SYNC_IO,WRITE_ASYNC_IO}]
in tracepoint function, and rename iotype to page_type to match the definition.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent d23be468

fs/f2fs/data.c

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void f2fs_read_end_io(struct bio *bio) 
	struct bio_post_read_ctx *ctx;

	bool intask = in_task();



	iostat_update_and_unbind_ctx(bio, 0);

	iostat_update_and_unbind_ctx(bio);

	ctx = bio->bi_private;



	if (time_to_inject(sbi, FAULT_READ_IO))
@@ -330,7 +330,7 @@ static void f2fs_write_end_io(struct bio *bio) 
	struct bio_vec *bvec;

	struct bvec_iter_all iter_all;



	iostat_update_and_unbind_ctx(bio, 1);

	iostat_update_and_unbind_ctx(bio);

	sbi = bio->bi_private;



	if (time_to_inject(sbi, FAULT_WRITE_IO))

fs/f2fs/iostat.c

+21 −27
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include "iostat.h"

#include <trace/events/f2fs.h>



#define NUM_PREALLOC_IOSTAT_CTXS	128

static struct kmem_cache *bio_iostat_ctx_cache;

static mempool_t *bio_iostat_ctx_pool;
@@ -210,53 +209,48 @@ void f2fs_update_iostat(struct f2fs_sb_info *sbi, struct inode *inode, 
}



static inline void __update_iostat_latency(struct bio_iostat_ctx *iostat_ctx,

				int rw, bool is_sync)

				enum iostat_lat_type lat_type)

{

	unsigned long ts_diff;

	unsigned int iotype = iostat_ctx->type;

	unsigned int page_type = iostat_ctx->type;

	struct f2fs_sb_info *sbi = iostat_ctx->sbi;

	struct iostat_lat_info *io_lat = sbi->iostat_io_lat;

	int idx;

	unsigned long flags;



	if (!sbi->iostat_enable)

		return;



	ts_diff = jiffies - iostat_ctx->submit_ts;

	if (iotype == META_FLUSH) {

		iotype = META;

	} else if (iotype >= NR_PAGE_TYPE) {

		f2fs_warn(sbi, "%s: %d over NR_PAGE_TYPE", __func__, iotype);

	if (page_type == META_FLUSH) {

		page_type = META;

	} else if (page_type >= NR_PAGE_TYPE) {

		f2fs_warn(sbi, "%s: %d over NR_PAGE_TYPE", __func__, page_type);

		return;

	}



	if (rw == 0) {

		idx = READ_IO;

	} else {

		if (is_sync)

			idx = WRITE_SYNC_IO;

		else

			idx = WRITE_ASYNC_IO;

	}



	spin_lock_irqsave(&sbi->iostat_lat_lock, flags);

	io_lat->sum_lat[idx][iotype] += ts_diff;

	io_lat->bio_cnt[idx][iotype]++;

	if (ts_diff > io_lat->peak_lat[idx][iotype])

		io_lat->peak_lat[idx][iotype] = ts_diff;

	io_lat->sum_lat[lat_type][page_type] += ts_diff;

	io_lat->bio_cnt[lat_type][page_type]++;

	if (ts_diff > io_lat->peak_lat[lat_type][page_type])

		io_lat->peak_lat[lat_type][page_type] = ts_diff;

	spin_unlock_irqrestore(&sbi->iostat_lat_lock, flags);

}



void iostat_update_and_unbind_ctx(struct bio *bio, int rw)

void iostat_update_and_unbind_ctx(struct bio *bio)

{

	struct bio_iostat_ctx *iostat_ctx = bio->bi_private;

	bool is_sync = bio->bi_opf & REQ_SYNC;

	enum iostat_lat_type lat_type;



	if (rw == 0)

		bio->bi_private = iostat_ctx->post_read_ctx;

	else

	if (op_is_write(bio_op(bio))) {

		lat_type = bio->bi_opf & REQ_SYNC ?

				WRITE_SYNC_IO : WRITE_ASYNC_IO;

		bio->bi_private = iostat_ctx->sbi;

	__update_iostat_latency(iostat_ctx, rw, is_sync);

	} else {

		lat_type = READ_IO;

		bio->bi_private = iostat_ctx->post_read_ctx;

	}



	__update_iostat_latency(iostat_ctx, lat_type);

	mempool_free(iostat_ctx, bio_iostat_ctx_pool);

}

fs/f2fs/iostat.h

+10 −9
Original line number Diff line number Diff line
@@ -8,20 +8,21 @@ 


struct bio_post_read_ctx;



enum iostat_lat_type {

	READ_IO = 0,

	WRITE_SYNC_IO,

	WRITE_ASYNC_IO,

	MAX_IO_TYPE,

};



#ifdef CONFIG_F2FS_IOSTAT



#define NUM_PREALLOC_IOSTAT_CTXS	128

#define DEFAULT_IOSTAT_PERIOD_MS	3000

#define MIN_IOSTAT_PERIOD_MS		100

/* maximum period of iostat tracing is 1 day */

#define MAX_IOSTAT_PERIOD_MS		8640000



enum {

	READ_IO,

	WRITE_SYNC_IO,

	WRITE_ASYNC_IO,

	MAX_IO_TYPE,

};



struct iostat_lat_info {

	unsigned long sum_lat[MAX_IO_TYPE][NR_PAGE_TYPE];	/* sum of io latencies */

	unsigned long peak_lat[MAX_IO_TYPE][NR_PAGE_TYPE];	/* peak io latency */
@@ -57,7 +58,7 @@ static inline struct bio_post_read_ctx *get_post_read_ctx(struct bio *bio) 
	return iostat_ctx->post_read_ctx;

}



extern void iostat_update_and_unbind_ctx(struct bio *bio, int rw);

extern void iostat_update_and_unbind_ctx(struct bio *bio);

extern void iostat_alloc_and_bind_ctx(struct f2fs_sb_info *sbi,

		struct bio *bio, struct bio_post_read_ctx *ctx);

extern int f2fs_init_iostat_processing(void);
@@ -67,7 +68,7 @@ extern void f2fs_destroy_iostat(struct f2fs_sb_info *sbi); 
#else

static inline void f2fs_update_iostat(struct f2fs_sb_info *sbi, struct inode *inode,

		enum iostat_type type, unsigned long long io_bytes) {}

static inline void iostat_update_and_unbind_ctx(struct bio *bio, int rw) {}

static inline void iostat_update_and_unbind_ctx(struct bio *bio) {}

static inline void iostat_alloc_and_bind_ctx(struct f2fs_sb_info *sbi,

		struct bio *bio, struct bio_post_read_ctx *ctx) {}

static inline void iostat_update_submit_ctx(struct bio *bio,

include/trace/events/f2fs.h

+27 −27
Original line number Diff line number Diff line
@@ -2082,33 +2082,33 @@ TRACE_EVENT(f2fs_iostat_latency, 


	TP_fast_assign(

		__entry->dev		= sbi->sb->s_dev;

		__entry->d_rd_peak	= iostat_lat[0][DATA].peak_lat;

		__entry->d_rd_avg	= iostat_lat[0][DATA].avg_lat;

		__entry->d_rd_cnt	= iostat_lat[0][DATA].cnt;

		__entry->n_rd_peak	= iostat_lat[0][NODE].peak_lat;

		__entry->n_rd_avg	= iostat_lat[0][NODE].avg_lat;

		__entry->n_rd_cnt	= iostat_lat[0][NODE].cnt;

		__entry->m_rd_peak	= iostat_lat[0][META].peak_lat;

		__entry->m_rd_avg	= iostat_lat[0][META].avg_lat;

		__entry->m_rd_cnt	= iostat_lat[0][META].cnt;

		__entry->d_wr_s_peak	= iostat_lat[1][DATA].peak_lat;

		__entry->d_wr_s_avg	= iostat_lat[1][DATA].avg_lat;

		__entry->d_wr_s_cnt	= iostat_lat[1][DATA].cnt;

		__entry->n_wr_s_peak	= iostat_lat[1][NODE].peak_lat;

		__entry->n_wr_s_avg	= iostat_lat[1][NODE].avg_lat;

		__entry->n_wr_s_cnt	= iostat_lat[1][NODE].cnt;

		__entry->m_wr_s_peak	= iostat_lat[1][META].peak_lat;

		__entry->m_wr_s_avg	= iostat_lat[1][META].avg_lat;

		__entry->m_wr_s_cnt	= iostat_lat[1][META].cnt;

		__entry->d_wr_as_peak	= iostat_lat[2][DATA].peak_lat;

		__entry->d_wr_as_avg	= iostat_lat[2][DATA].avg_lat;

		__entry->d_wr_as_cnt	= iostat_lat[2][DATA].cnt;

		__entry->n_wr_as_peak	= iostat_lat[2][NODE].peak_lat;

		__entry->n_wr_as_avg	= iostat_lat[2][NODE].avg_lat;

		__entry->n_wr_as_cnt	= iostat_lat[2][NODE].cnt;

		__entry->m_wr_as_peak	= iostat_lat[2][META].peak_lat;

		__entry->m_wr_as_avg	= iostat_lat[2][META].avg_lat;

		__entry->m_wr_as_cnt	= iostat_lat[2][META].cnt;

		__entry->d_rd_peak	= iostat_lat[READ_IO][DATA].peak_lat;

		__entry->d_rd_avg	= iostat_lat[READ_IO][DATA].avg_lat;

		__entry->d_rd_cnt	= iostat_lat[READ_IO][DATA].cnt;

		__entry->n_rd_peak	= iostat_lat[READ_IO][NODE].peak_lat;

		__entry->n_rd_avg	= iostat_lat[READ_IO][NODE].avg_lat;

		__entry->n_rd_cnt	= iostat_lat[READ_IO][NODE].cnt;

		__entry->m_rd_peak	= iostat_lat[READ_IO][META].peak_lat;

		__entry->m_rd_avg	= iostat_lat[READ_IO][META].avg_lat;

		__entry->m_rd_cnt	= iostat_lat[READ_IO][META].cnt;

		__entry->d_wr_s_peak	= iostat_lat[WRITE_SYNC_IO][DATA].peak_lat;

		__entry->d_wr_s_avg	= iostat_lat[WRITE_SYNC_IO][DATA].avg_lat;

		__entry->d_wr_s_cnt	= iostat_lat[WRITE_SYNC_IO][DATA].cnt;

		__entry->n_wr_s_peak	= iostat_lat[WRITE_SYNC_IO][NODE].peak_lat;

		__entry->n_wr_s_avg	= iostat_lat[WRITE_SYNC_IO][NODE].avg_lat;

		__entry->n_wr_s_cnt	= iostat_lat[WRITE_SYNC_IO][NODE].cnt;

		__entry->m_wr_s_peak	= iostat_lat[WRITE_SYNC_IO][META].peak_lat;

		__entry->m_wr_s_avg	= iostat_lat[WRITE_SYNC_IO][META].avg_lat;

		__entry->m_wr_s_cnt	= iostat_lat[WRITE_SYNC_IO][META].cnt;

		__entry->d_wr_as_peak	= iostat_lat[WRITE_ASYNC_IO][DATA].peak_lat;

		__entry->d_wr_as_avg	= iostat_lat[WRITE_ASYNC_IO][DATA].avg_lat;

		__entry->d_wr_as_cnt	= iostat_lat[WRITE_ASYNC_IO][DATA].cnt;

		__entry->n_wr_as_peak	= iostat_lat[WRITE_ASYNC_IO][NODE].peak_lat;

		__entry->n_wr_as_avg	= iostat_lat[WRITE_ASYNC_IO][NODE].avg_lat;

		__entry->n_wr_as_cnt	= iostat_lat[WRITE_ASYNC_IO][NODE].cnt;

		__entry->m_wr_as_peak	= iostat_lat[WRITE_ASYNC_IO][META].peak_lat;

		__entry->m_wr_as_avg	= iostat_lat[WRITE_ASYNC_IO][META].avg_lat;

		__entry->m_wr_as_cnt	= iostat_lat[WRITE_ASYNC_IO][META].cnt;

	),



	TP_printk("dev = (%d,%d), "