Commit 52118743 authored by Daeho Jeong's avatar Daeho Jeong Committed by Jaegeuk Kim
Browse files

f2fs: separate out iostat feature 



Added F2FS_IOSTAT config option to support getting IO statistics through
sysfs and printing out periodic IO statistics tracepoint events and
moved I/O statistics related codes into separate files for better
maintenance.

Signed-off-by: default avatarDaeho Jeong <daehojeong@google.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
[Jaegeuk Kim: set default=y]
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent bbe1da7e

fs/f2fs/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -133,3 +133,12 @@ config F2FS_FS_ZSTD 
	default y

	help

	  Support ZSTD compress algorithm, if unsure, say Y.



config F2FS_IOSTAT

	bool "F2FS IO statistics information"

	depends on F2FS_FS

	default y

	help

	  Support getting IO statistics through sysfs and printing out periodic

	  IO statistics tracepoint events. You have to turn on "iostat_enable"

	  sysfs node to enable this feature.

fs/f2fs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ f2fs-$(CONFIG_F2FS_FS_XATTR) += xattr.o 
f2fs-$(CONFIG_F2FS_FS_POSIX_ACL) += acl.o

f2fs-$(CONFIG_FS_VERITY) += verity.o

f2fs-$(CONFIG_F2FS_FS_COMPRESSION) += compress.o

f2fs-$(CONFIG_F2FS_IOSTAT) += iostat.o

fs/f2fs/checkpoint.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "f2fs.h"

#include "node.h"

#include "segment.h"

#include "iostat.h"

#include <trace/events/f2fs.h>



#define DEFAULT_CHECKPOINT_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))

fs/f2fs/data.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "f2fs.h"

#include "node.h"

#include "segment.h"

#include "iostat.h"

#include <trace/events/f2fs.h>



#define NUM_PREALLOC_POST_READ_CTXS	128

fs/f2fs/f2fs.h

+10 −49
Original line number Diff line number Diff line
@@ -1713,14 +1713,6 @@ struct f2fs_sb_info { 
#endif

	spinlock_t stat_lock;			/* lock for stat operations */



	/* For app/fs IO statistics */

	spinlock_t iostat_lock;

	unsigned long long rw_iostat[NR_IO_TYPE];

	unsigned long long prev_rw_iostat[NR_IO_TYPE];

	bool iostat_enable;

	unsigned long iostat_next_period;

	unsigned int iostat_period_ms;



	/* to attach REQ_META|REQ_FUA flags */

	unsigned int data_io_flag;

	unsigned int node_io_flag;
@@ -1780,6 +1772,16 @@ struct f2fs_sb_info { 
	unsigned int compress_watermark;	/* cache page watermark */

	atomic_t compress_page_hit;		/* cache hit count */

#endif



#ifdef CONFIG_F2FS_IOSTAT

	/* For app/fs IO statistics */

	spinlock_t iostat_lock;

	unsigned long long rw_iostat[NR_IO_TYPE];

	unsigned long long prev_rw_iostat[NR_IO_TYPE];

	bool iostat_enable;

	unsigned long iostat_next_period;

	unsigned int iostat_period_ms;

#endif

};



struct f2fs_private_dio {
@@ -3257,47 +3259,6 @@ static inline int get_inline_xattr_addrs(struct inode *inode) 
		sizeof((f2fs_inode)->field))			\

		<= (F2FS_OLD_ATTRIBUTE_SIZE + (extra_isize)))	\



#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



static inline void f2fs_reset_iostat(struct f2fs_sb_info *sbi)

{

	int i;



	spin_lock(&sbi->iostat_lock);

	for (i = 0; i < NR_IO_TYPE; i++) {

		sbi->rw_iostat[i] = 0;

		sbi->prev_rw_iostat[i] = 0;

	}

	spin_unlock(&sbi->iostat_lock);

}



extern void f2fs_record_iostat(struct f2fs_sb_info *sbi);



static inline void f2fs_update_iostat(struct f2fs_sb_info *sbi,

			enum iostat_type type, unsigned long long io_bytes)

{

	if (!sbi->iostat_enable)

		return;

	spin_lock(&sbi->iostat_lock);

	sbi->rw_iostat[type] += io_bytes;



	if (type == APP_WRITE_IO || type == APP_DIRECT_IO)

		sbi->rw_iostat[APP_BUFFERED_IO] =

			sbi->rw_iostat[APP_WRITE_IO] -

			sbi->rw_iostat[APP_DIRECT_IO];



	if (type == APP_READ_IO || type == APP_DIRECT_READ_IO)

		sbi->rw_iostat[APP_BUFFERED_READ_IO] =

			sbi->rw_iostat[APP_READ_IO] -

			sbi->rw_iostat[APP_DIRECT_READ_IO];

	spin_unlock(&sbi->iostat_lock);



	f2fs_record_iostat(sbi);

}



#define __is_large_section(sbi)		((sbi)->segs_per_sec > 1)



#define __is_meta_io(fio) (PAGE_TYPE_OF_BIO((fio)->type) == META)