Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 0a1a961

Browse files
konisgregkh
authored andcommitted
nilfs2: fix state management in error path of log writing function
commit 6576dd6 upstream. After commit a694291 ("nilfs2: separate wait function from nilfs_segctor_write") was applied, the log writing function nilfs_segctor_do_construct() was able to issue I/O requests continuously even if user data blocks were split into multiple logs across segments, but two potential flaws were introduced in its error handling. First, if nilfs_segctor_begin_construction() fails while creating the second or subsequent logs, the log writing function returns without calling nilfs_segctor_abort_construction(), so the writeback flag set on pages/folios will remain uncleared. This causes page cache operations to hang waiting for the writeback flag. For example, truncate_inode_pages_final(), which is called via nilfs_evict_inode() when an inode is evicted from memory, will hang. Second, the NILFS_I_COLLECTED flag set on normal inodes remain uncleared. As a result, if the next log write involves checkpoint creation, that's fine, but if a partial log write is performed that does not, inodes with NILFS_I_COLLECTED set are erroneously removed from the "sc_dirty_files" list, and their data and b-tree blocks may not be written to the device, corrupting the block mapping. Fix these issues by uniformly calling nilfs_segctor_abort_construction() on failure of each step in the loop in nilfs_segctor_do_construct(), having it clean up logs and segment usages according to progress, and correcting the conditions for calling nilfs_redirty_inodes() to ensure that the NILFS_I_COLLECTED flag is cleared. Link: https://lkml.kernel.org/r/20240814101119.4070-1-konishi.ryusuke@gmail.com Fixes: a694291 ("nilfs2: separate wait function from nilfs_segctor_write") Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Tested-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8c6e43b commit 0a1a961

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

fs/nilfs2/segment.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,6 +1835,9 @@ static void nilfs_segctor_abort_construction(struct nilfs_sc_info *sci,
18351835
nilfs_abort_logs(&logs, ret ? : err);
18361836

18371837
list_splice_tail_init(&sci->sc_segbufs, &logs);
1838+
if (list_empty(&logs))
1839+
return; /* if the first segment buffer preparation failed */
1840+
18381841
nilfs_cancel_segusage(&logs, nilfs->ns_sufile);
18391842
nilfs_free_incomplete_logs(&logs, nilfs);
18401843

@@ -2079,7 +2082,7 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)
20792082

20802083
err = nilfs_segctor_begin_construction(sci, nilfs);
20812084
if (unlikely(err))
2082-
goto out;
2085+
goto failed;
20832086

20842087
/* Update time stamp */
20852088
sci->sc_seg_ctime = ktime_get_real_seconds();
@@ -2142,10 +2145,9 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode)
21422145
return err;
21432146

21442147
failed_to_write:
2145-
if (sci->sc_stage.flags & NILFS_CF_IFILE_STARTED)
2146-
nilfs_redirty_inodes(&sci->sc_dirty_files);
2147-
21482148
failed:
2149+
if (mode == SC_LSEG_SR && nilfs_sc_cstage_get(sci) >= NILFS_ST_IFILE)
2150+
nilfs_redirty_inodes(&sci->sc_dirty_files);
21492151
if (nilfs_doing_gc())
21502152
nilfs_redirty_inodes(&sci->sc_gc_inodes);
21512153
nilfs_segctor_abort_construction(sci, nilfs, err);

0 commit comments

Comments
 (0)