Skip to contentSkip to conversation

Patch "f2fs: Make flush bios explicitely sync" has been added to the 4.11-stable tree

PATCH [email protected] 1 participant 1 message May 18, 2017

Subsystems (2)
Stable branch F2FS file system
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

f2fs: Make flush bios explicitely sync

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
f2fs-make-flush-bios-explicitely-sync.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3adc5fcb7edf5f8dfe8d37dcb50ba6b30077c905 Mon Sep 17 00:00:00 2001

From: Jan Kara <[email protected]>
Date: Tue, 2 May 2017 17:03:47 +0200
Subject: f2fs: Make flush bios explicitely sync

From: Jan Kara <[email protected]>

commit 3adc5fcb7edf5f8dfe8d37dcb50ba6b30077c905 upstream.

Commit b685d3d65ac7 "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 b685d3d65ac791406e0dfd8779cc9b3707fea5a3
CC Jaegeuk Kim <[email protected]>
CC [email protected]
Signed-off-by Jan Kara <[email protected]>
Acked-by Chao Yu <[email protected]>
Signed-off-by Jaegeuk Kim <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 fs/f2fs/data.c    |    2 +-
 fs/f2fs/segment.c |    2 +-
 fs/f2fs/super.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
fs/f2fs/data.c +1 -1
@@ -309,7 +309,7 @@ static void __f2fs_submit_merged_bio(str
 	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
@@ -416,7 +416,7 @@ static int __submit_flush_wait(struct bl
 	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
@@ -1307,7 +1307,7 @@ static int __f2fs_commit_super(struct bu
 	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,

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/fs-block_dev-always-invalidate-cleancache-in-invalidate_bdev.patch queue-4.11/ext4-return-to-starting-transaction-in-ext4_dax_huge_fault.patch queue-4.11/dax-prevent-invalidation-of-mapped-dax-entries.patch queue-4.11/dax-fix-pmd-data-corruption-when-fault-races-with-write.patch queue-4.11/f2fs-make-flush-bios-explicitely-sync.patch queue-4.11/jbd2-fix-dbench4-performance-regression-for-nobarrier-mounts.patch queue-4.11/fs-fix-data-invalidation-in-the-cleancache-during-direct-io.patch queue-4.11/mm-fix-data-corruption-due-to-stale-mmap-reads.patch