Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c54aad9 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.19.y' into android-4.19 



* aosp/upstream-f2fs-stable-linux-4.19.y:
  f2fs: fix quota_sync failure due to f2fs_lock_op
  f2fs: support read iostat
  f2fs: Fix the accounting of dcc->undiscard_blks
  f2fs: fix to handle error path of f2fs_ra_meta_pages()
  f2fs: report the discard cmd errors properly
  f2fs: fix long latency due to discard during umount
  f2fs: add tracepoint for f2fs iostat
  f2fs: introduce sysfs/data_io_flag to attach REQ_META/FUA
  ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE
  fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl

Change-Id: I976edb3288576caa0c56eff202690b1159fcf827
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@google.com>
parents 1fb5886e 8f36603e

Documentation/ABI/testing/sysfs-fs-f2fs

+15 −0
Original line number Diff line number Diff line
@@ -323,3 +323,18 @@ What: /sys/fs/f2fs/<disk>/mounted_time_sec 
Date:		February 2020

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:	Show the mounted time in secs of this partition.



What:		/sys/fs/f2fs/<disk>/data_io_flag

Date:		April 2020

Contact:	"Jaegeuk Kim" <jaegeuk@kernel.org>

Description:	Give a way to attach REQ_META|FUA to data writes

		given temperature-based bits. Now the bits indicate:

		*      REQ_META     |      REQ_FUA      |

		*    5 |    4 |   3 |    2 |    1 |   0 |

		* Cold | Warm | Hot | Cold | Warm | Hot |



What:		/sys/fs/f2fs/<disk>/iostat_period_ms

Date:		April 2020

Contact:	"Daeho Jeong" <daehojeong@google.com>

Description:	Give a way to change iostat_period time. 3secs by default.

		The new iostat trace gives stats gap given the period.

fs/f2fs/checkpoint.c

+8 −2
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, 
		return ERR_PTR(err);

	}



	f2fs_update_iostat(sbi, FS_META_READ_IO, F2FS_BLKSIZE);



	lock_page(page);

	if (unlikely(page->mapping != mapping)) {

		f2fs_put_page(page, 1);
@@ -220,6 +222,7 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
		.is_por = (type == META_POR),

	};

	struct blk_plug plug;

	int err;



	if (unlikely(type == META_POR))

		fio.op_flags &= ~REQ_META;
@@ -263,8 +266,11 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
		}



		fio.page = page;

		f2fs_submit_page_bio(&fio);

		f2fs_put_page(page, 0);

		err = f2fs_submit_page_bio(&fio);

		f2fs_put_page(page, err ? 1 : 0);



		if (!err)

			f2fs_update_iostat(sbi, FS_META_READ_IO, F2FS_BLKSIZE);

	}

out:

	blk_finish_plug(&plug);

fs/f2fs/compress.c

+1 −1
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc, 
	loff_t psize;

	int i, err;



	if (!f2fs_trylock_op(sbi))

	if (!IS_NOQUOTA(inode) && !f2fs_trylock_op(sbi))

		return -EAGAIN;



	set_new_dnode(&dn, cc->inode, NULL, NULL, 0);

fs/f2fs/data.c

+31 −2
Original line number Diff line number Diff line
@@ -579,6 +579,28 @@ void f2fs_submit_bio(struct f2fs_sb_info *sbi, 
	__submit_bio(sbi, bio, type);

}



static void __attach_data_io_flag(struct f2fs_io_info *fio)

{

	struct f2fs_sb_info *sbi = fio->sbi;

	unsigned int temp_mask = (1 << NR_TEMP_TYPE) - 1;

	unsigned int fua_flag = sbi->data_io_flag & temp_mask;

	unsigned int meta_flag = (sbi->data_io_flag >> NR_TEMP_TYPE) &

								temp_mask;

	/*

	 * data io flag bits per temp:

	 *      REQ_META     |      REQ_FUA      |

	 *    5 |    4 |   3 |    2 |    1 |   0 |

	 * Cold | Warm | Hot | Cold | Warm | Hot |

	 */

	if (fio->type != DATA)

		return;



	if ((1 << fio->temp) & meta_flag)

		fio->op_flags |= REQ_META;

	if ((1 << fio->temp) & fua_flag)

		fio->op_flags |= REQ_FUA;

}



static void __submit_merged_bio(struct f2fs_bio_info *io)

{

	struct f2fs_io_info *fio = &io->fio;
@@ -586,6 +608,7 @@ static void __submit_merged_bio(struct f2fs_bio_info *io) 
	if (!io->bio)

		return;



	__attach_data_io_flag(fio);

	bio_set_op_attrs(io->bio, fio->op, fio->op_flags);



	if (is_read_io(fio->op))
@@ -1096,6 +1119,7 @@ static int f2fs_submit_page_read(struct inode *inode, struct page *page, 
	}

	ClearPageError(page);

	inc_page_count(sbi, F2FS_RD_DATA);

	f2fs_update_iostat(sbi, FS_DATA_READ_IO, F2FS_BLKSIZE);

	__f2fs_submit_read_bio(sbi, bio, DATA);

	return 0;

}
@@ -2102,6 +2126,7 @@ static int f2fs_read_single_page(struct inode *inode, struct page *page, 
		goto submit_and_realloc;



	inc_page_count(F2FS_I_SB(inode), F2FS_RD_DATA);

	f2fs_update_iostat(F2FS_I_SB(inode), FS_DATA_READ_IO, F2FS_BLKSIZE);

	ClearPageError(page);

	*last_block_in_bio = block_nr;

	goto out;
@@ -2238,6 +2263,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret, 
			goto submit_and_realloc;



		inc_page_count(sbi, F2FS_RD_DATA);

		f2fs_update_iostat(sbi, FS_DATA_READ_IO, F2FS_BLKSIZE);

		ClearPageError(page);

		*last_block_in_bio = blkaddr;

	}
@@ -2724,8 +2750,8 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, 
			f2fs_available_free_memory(sbi, BASE_CHECK))))

		goto redirty_out;



	/* Dentry blocks are controlled by checkpoint */

	if (S_ISDIR(inode->i_mode)) {

	/* Dentry/quota blocks are controlled by checkpoint */

	if (S_ISDIR(inode->i_mode) || IS_NOQUOTA(inode)) {

		fio.need_lock = LOCK_DONE;

		err = f2fs_do_write_data_page(&fio);

		goto done;
@@ -3628,6 +3654,9 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
		} else if (err < 0) {

			f2fs_write_failed(mapping, offset + count);

		}

	} else {

		if (err > 0)

			f2fs_update_iostat(sbi, APP_DIRECT_READ_IO, err);

	}



out:

fs/f2fs/f2fs.h

+43 −9
Original line number Diff line number Diff line
@@ -1090,8 +1090,9 @@ enum cp_reason_type { 
};



enum iostat_type {

	APP_DIRECT_IO,			/* app direct IOs */

	APP_BUFFERED_IO,		/* app buffered IOs */

	/* WRITE IO */

	APP_DIRECT_IO,			/* app direct write IOs */

	APP_BUFFERED_IO,		/* app buffered write IOs */

	APP_WRITE_IO,			/* app write IOs */

	APP_MAPPED_IO,			/* app mapped IOs */

	FS_DATA_IO,			/* data IOs from kworker/fsync/reclaimer */
@@ -1102,6 +1103,17 @@ enum iostat_type { 
	FS_CP_DATA_IO,			/* data IOs from checkpoint */

	FS_CP_NODE_IO,			/* node IOs from checkpoint */

	FS_CP_META_IO,			/* meta IOs from checkpoint */



	/* READ IO */

	APP_DIRECT_READ_IO,		/* app direct read IOs */

	APP_BUFFERED_READ_IO,		/* app buffered read IOs */

	APP_READ_IO,			/* app read IOs */

	APP_MAPPED_READ_IO,		/* app mapped read IOs */

	FS_DATA_READ_IO,		/* data read IOs */

	FS_NODE_READ_IO,		/* node read IOs */

	FS_META_READ_IO,		/* meta read IOs */



	/* other */

	FS_DISCARD,			/* discard */

	NR_IO_TYPE,

};
@@ -1502,8 +1514,14 @@ struct f2fs_sb_info { 


	/* For app/fs IO statistics */

	spinlock_t iostat_lock;

	unsigned long long write_iostat[NR_IO_TYPE];

	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;



	/* For sysfs suppport */

	struct kobject s_kobj;
@@ -2995,29 +3013,45 @@ 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->write_iostat[i] = 0;

	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->write_iostat[type] += io_bytes;

	sbi->rw_iostat[type] += io_bytes;



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

		sbi->write_iostat[APP_BUFFERED_IO] =

			sbi->write_iostat[APP_WRITE_IO] -

			sbi->write_iostat[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)