Skip to content

Commit 76f9377

Browse files
joannekoongbrauner
authored andcommitted
writeback: don't block sync for filesystems with no data integrity guarantees
Add a SB_I_NO_DATA_INTEGRITY superblock flag for filesystems that cannot guarantee data persistence on sync (eg fuse). For superblocks with this flag set, sync kicks off writeback of dirty inodes but does not wait for the flusher threads to complete the writeback. This replaces the per-inode AS_NO_DATA_INTEGRITY mapping flag added in commit f9a49aa ("fs/writeback: skip AS_NO_DATA_INTEGRITY mappings in wait_sb_inodes()"). The flag belongs at the superblock level because data integrity is a filesystem-wide property, not a per-inode one. Having this flag at the superblock level also allows us to skip having to iterate every dirty inode in wait_sb_inodes() only to skip each inode individually. Prior to this commit, mappings with no data integrity guarantees skipped waiting on writeback completion but still waited on the flusher threads to finish initiating the writeback. Waiting on the flusher threads is unnecessary. This commit kicks off writeback but does not wait on the flusher threads. This change properly addresses a recent report [1] for a suspend-to-RAM hang seen on fuse-overlayfs that was caused by waiting on the flusher threads to finish: Workqueue: pm_fs_sync pm_fs_sync_work_fn Call Trace: <TASK> __schedule+0x457/0x1720 schedule+0x27/0xd0 wb_wait_for_completion+0x97/0xe0 sync_inodes_sb+0xf8/0x2e0 __iterate_supers+0xdc/0x160 ksys_sync+0x43/0xb0 pm_fs_sync_work_fn+0x17/0xa0 process_one_work+0x193/0x350 worker_thread+0x1a1/0x310 kthread+0xfc/0x240 ret_from_fork+0x243/0x280 ret_from_fork_asm+0x1a/0x30 </TASK> On fuse this is problematic because there are paths that may cause the flusher thread to block (eg if systemd freezes the user session cgroups first, which freezes the fuse daemon, before invoking the kernel suspend. The kernel suspend triggers ->write_node() which on fuse issues a synchronous setattr request, which cannot be processed since the daemon is frozen. Or if the daemon is buggy and cannot properly complete writeback, initiating writeback on a dirty folio already under writeback leads to writeback_get_folio() -> folio_prepare_writeback() -> unconditional wait on writeback to finish, which will cause a hang). This commit restores fuse to its prior behavior before tmp folios were removed, where sync was essentially a no-op. [1] https://lore.kernel.org/linux-fsdevel/CAJnrk1a-asuvfrbKXbEwwDSctvemF+6zfhdnuzO65Pt8HsFSRw@mail.gmail.com/T/#m632c4648e9cafc4239299887109ebd880ac6c5c1 Fixes: 0c58a97 ("fuse: remove tmp folio for writebacks and internal rb tree") Reported-by: John <[email protected]> Cc: [email protected] Signed-off-by: Joanne Koong <[email protected]> Link: https://patch.msgid.link/[email protected] Reviewed-by: Jan Kara <[email protected]> Reviewed-by: David Hildenbrand (Arm) <[email protected]> Signed-off-by: Christian Brauner <[email protected]>
1 parent 7e57523 commit 76f9377

5 files changed

Lines changed: 15 additions & 20 deletions

File tree

fs/fs-writeback.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2787,13 +2787,8 @@ static void wait_sb_inodes(struct super_block *sb)
27872787
* The mapping can appear untagged while still on-list since we
27882788
* do not have the mapping lock. Skip it here, wb completion
27892789
* will remove it.
2790-
*
2791-
* If the mapping does not have data integrity semantics,
2792-
* there's no need to wait for the writeout to complete, as the
2793-
* mapping cannot guarantee that data is persistently stored.
27942790
*/
2795-
if (!mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK) ||
2796-
mapping_no_data_integrity(mapping))
2791+
if (!mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK))
27972792
continue;
27982793

27992794
spin_unlock_irq(&sb->s_inode_wblist_lock);
@@ -2928,6 +2923,17 @@ void sync_inodes_sb(struct super_block *sb)
29282923
*/
29292924
if (bdi == &noop_backing_dev_info)
29302925
return;
2926+
2927+
/*
2928+
* If the superblock has SB_I_NO_DATA_INTEGRITY set, there's no need to
2929+
* wait for the writeout to complete, as the filesystem cannot guarantee
2930+
* data persistence on sync. Just kick off writeback and return.
2931+
*/
2932+
if (sb->s_iflags & SB_I_NO_DATA_INTEGRITY) {
2933+
wakeup_flusher_threads_bdi(bdi, WB_REASON_SYNC);
2934+
return;
2935+
}
2936+
29312937
WARN_ON(!rwsem_is_locked(&sb->s_umount));
29322938

29332939
/* protect against inode wb switch, see inode_switch_wbs_work_fn() */

fs/fuse/file.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3201,10 +3201,8 @@ void fuse_init_file_inode(struct inode *inode, unsigned int flags)
32013201

32023202
inode->i_fop = &fuse_file_operations;
32033203
inode->i_data.a_ops = &fuse_file_aops;
3204-
if (fc->writeback_cache) {
3204+
if (fc->writeback_cache)
32053205
mapping_set_writeback_may_deadlock_on_reclaim(&inode->i_data);
3206-
mapping_set_no_data_integrity(&inode->i_data);
3207-
}
32083206

32093207
INIT_LIST_HEAD(&fi->write_files);
32103208
INIT_LIST_HEAD(&fi->queued_writes);

fs/fuse/inode.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,6 +1709,7 @@ static void fuse_sb_defaults(struct super_block *sb)
17091709
sb->s_export_op = &fuse_export_operations;
17101710
sb->s_iflags |= SB_I_IMA_UNVERIFIABLE_SIGNATURE;
17111711
sb->s_iflags |= SB_I_NOIDMAP;
1712+
sb->s_iflags |= SB_I_NO_DATA_INTEGRITY;
17121713
if (sb->s_user_ns != &init_user_ns)
17131714
sb->s_iflags |= SB_I_UNTRUSTED_MOUNTER;
17141715
sb->s_flags &= ~(SB_NOSEC | SB_I_VERSION);

include/linux/fs/super_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,5 +338,6 @@ struct super_block {
338338
#define SB_I_NOUMASK 0x00001000 /* VFS does not apply umask */
339339
#define SB_I_NOIDMAP 0x00002000 /* No idmapped mounts on this superblock */
340340
#define SB_I_ALLOW_HSM 0x00004000 /* Allow HSM events on this superblock */
341+
#define SB_I_NO_DATA_INTEGRITY 0x00008000 /* fs cannot guarantee data persistence on sync */
341342

342343
#endif /* _LINUX_FS_SUPER_TYPES_H */

include/linux/pagemap.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ enum mapping_flags {
210210
AS_WRITEBACK_MAY_DEADLOCK_ON_RECLAIM = 9,
211211
AS_KERNEL_FILE = 10, /* mapping for a fake kernel file that shouldn't
212212
account usage to user cgroups */
213-
AS_NO_DATA_INTEGRITY = 11, /* no data integrity guarantees */
214213
/* Bits 16-25 are used for FOLIO_ORDER */
215214
AS_FOLIO_ORDER_BITS = 5,
216215
AS_FOLIO_ORDER_MIN = 16,
@@ -346,16 +345,6 @@ static inline bool mapping_writeback_may_deadlock_on_reclaim(const struct addres
346345
return test_bit(AS_WRITEBACK_MAY_DEADLOCK_ON_RECLAIM, &mapping->flags);
347346
}
348347

349-
static inline void mapping_set_no_data_integrity(struct address_space *mapping)
350-
{
351-
set_bit(AS_NO_DATA_INTEGRITY, &mapping->flags);
352-
}
353-
354-
static inline bool mapping_no_data_integrity(const struct address_space *mapping)
355-
{
356-
return test_bit(AS_NO_DATA_INTEGRITY, &mapping->flags);
357-
}
358-
359348
static inline gfp_t mapping_gfp_mask(const struct address_space *mapping)
360349
{
361350
return mapping->gfp_mask;

0 commit comments

Comments
 (0)