f2fs: Make flush bios explicitely sync (3adc5fcb) · Commits · 戴 / test

Commit "block: treat REQ_FUA and REQ_PREFLUSH as synchronous" removed REQ_SYNC flag from WRITE_{FUA|PREFLUSH|...} definitions. generic_make_request_checks() however strips REQ_FUA and REQ_PREFLUSH flags from a bio when the storage doesn't report volatile write cache and thus write effectively becomes asynchronous which can lead to performance regressions. Fix the problem by making sure all bios which are synchronous are properly marked with REQ_SYNC. Fixes: Cc: stable@vger.kernel.org # 4.9+ CC: Jaegeuk Kim <jaegeuk@kernel.org> CC: linux-f2fs-devel@lists.sourceforge.net Signed-off-by:

Jan Kara <jack@suse.cz> Acked-by:

Chao Yu <yuchao0@huawei.com> Signed-off-by:

Jaegeuk Kim <jaegeuk@kernel.org>

fs/f2fs/data.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ static void __f2fs_submit_merged_bio(struct f2fs_sb_info *sbi,
		if (type >= META_FLUSH) {
		io->fio.type = META_FLUSH;
		io->fio.op = REQ_OP_WRITE;
		io->fio.op_flags = REQ_META \| REQ_PRIO;
		io->fio.op_flags = REQ_META \| REQ_PRIO \| REQ_SYNC;
		if (!test_opt(sbi, NOBARRIER))
		io->fio.op_flags \|= REQ_PREFLUSH \| REQ_FUA;
		}

fs/f2fs/segment.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -446,7 +446,7 @@ static int __submit_flush_wait(struct f2fs_sb_info *sbi,
		struct bio *bio = f2fs_bio_alloc(0);
		int ret;

		bio->bi_opf = REQ_OP_WRITE \| REQ_PREFLUSH;
		bio->bi_opf = REQ_OP_WRITE \| REQ_SYNC \| REQ_PREFLUSH;
		bio->bi_bdev = bdev;
		ret = submit_bio_wait(bio);
		bio_put(bio);

fs/f2fs/super.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1325,7 +1325,7 @@ static int __f2fs_commit_super(struct buffer_head *bh,
		unlock_buffer(bh);

		/* it's rare case, we can do fua all the time */
		return __sync_dirty_buffer(bh, REQ_PREFLUSH \| REQ_FUA);
		return __sync_dirty_buffer(bh, REQ_SYNC \| REQ_PREFLUSH \| REQ_FUA);
		}

		static inline bool sanity_check_area_boundary(struct f2fs_sb_info *sbi,

Admin message