Skip to contentSkip to conversation

Patch "Revert "f2fs: put allocate_segment after refresh_sit_entry"" has been added to the 4.11-stable tree

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

Subsystems (2)
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

Revert "f2fs: put allocate_segment after refresh_sit_entry"

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:
revert-f2fs-put-allocate_segment-after-refresh_sit_entry.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 c6f82fe90d7458e5fa190a6820bfc24f96b0de4e Mon Sep 17 00:00:00 2001

From: Jaegeuk Kim <[email protected]>
Date: Tue, 4 Apr 2017 16:45:30 -0700
Subject: Revert "f2fs: put allocate_segment after refresh_sit_entry"

From: Jaegeuk Kim <[email protected]>

commit c6f82fe90d7458e5fa190a6820bfc24f96b0de4e upstream.

This reverts commit 3436c4bdb30de421d46f58c9174669fbcfd40ce0.

This makes a leak to register dirty segments. I reproduced the issue by modified postmark which injects a lot of file create/delete/update and finally triggers huge number of SSR allocations.

[Jaegeuk Kim: Change missing incorrect comment]
---
 fs/f2fs/segment.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
fs/f2fs/segment.c +4 -5
@@ -1788,15 +1788,14 @@ void allocate_data_block(struct f2fs_sb_
 
 	stat_inc_block_count(sbi, curseg);
 
+	if (!__has_curseg_space(sbi, type))
+		sit_i->s_ops->allocate_segment(sbi, type, false);
 	/*
-	 * SIT information should be updated before segment allocation,
-	 * since SSR needs latest valid block information.
+	 * SIT information should be updated after segment allocation,
+	 * since we need to keep dirty segments precisely under SSR.
 	 */
 	refresh_sit_entry(sbi, old_blkaddr, *new_blkaddr);
 
-	if (!__has_curseg_space(sbi, type))
-		sit_i->s_ops->allocate_segment(sbi, type, false);
-
 	mutex_unlock(&sit_i->sentry_lock);
 
 	if (page && IS_NODESEG(type))

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

queue-4.11/f2fs-fix-wrong-max-cost-initialization.patch queue-4.11/f2fs-make-flush-bios-explicitely-sync.patch queue-4.11/revert-f2fs-put-allocate_segment-after-refresh_sit_entry.patch queue-4.11/f2fs-check-entire-encrypted-bigname-when-finding-a-dentry.patch queue-4.11/f2fs-fix-multiple-f2fs_add_link-having-same-name-for-inline-dentry.patch queue-4.11/f2fs-fix-fs-corruption-due-to-zero-inode-page.patch