iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/fs
History
Zhihao Cheng 9a9dc60da7 fs-writeback: writeback_sb_inodes：Recalculate 'wrote' according skipped pages 
commit 68f4c6eba70df70a720188bce95c85570ddfcc87 upstream.

Commit 505a666ee3fc ("writeback: plug writeback in wb_writeback() and
writeback_inodes_wb()") has us holding a plug during wb_writeback, which
may cause a potential ABBA dead lock:

    wb_writeback		fat_file_fsync
blk_start_plug(&plug)
for (;;) {
  iter i-1: some reqs have been added into plug->mq_list  // LOCK A
  iter i:
    progress = __writeback_inodes_wb(wb, work)
    . writeback_sb_inodes // fat's bdev
    .   __writeback_single_inode
    .   . generic_writepages
    .   .   __block_write_full_page
    .   .   . . 	    __generic_file_fsync
    .   .   . . 	      sync_inode_metadata
    .   .   . . 	        writeback_single_inode
    .   .   . . 		  __writeback_single_inode
    .   .   . . 		    fat_write_inode
    .   .   . . 		      __fat_write_inode
    .   .   . . 		        sync_dirty_buffer	// fat's bdev
    .   .   . . 			  lock_buffer(bh)	// LOCK B
    .   .   . . 			    submit_bh
    .   .   . . 			      blk_mq_get_tag	// LOCK A
    .   .   . trylock_buffer(bh)  // LOCK B
    .   .   .   redirty_page_for_writepage
    .   .   .     wbc->pages_skipped++
    .   .   --wbc->nr_to_write
    .   wrote += write_chunk - wbc.nr_to_write  // wrote > 0
    .   requeue_inode
    .     redirty_tail_locked
    if (progress)    // progress > 0
      continue;
  iter i+1:
      queue_io
      // similar process with iter i, infinite for-loop !
}
blk_finish_plug(&plug)   // flush plug won't be called

Above process triggers a hungtask like:
[  399.044861] INFO: task bb:2607 blocked for more than 30 seconds.
[  399.046824]       Not tainted 5.18.0-rc1-00005-gefae4d9eb6a2-dirty
[  399.051539] task:bb              state:D stack:    0 pid: 2607 ppid:
2426 flags:0x00004000
[  399.051556] Call Trace:
[  399.051570]  __schedule+0x480/0x1050
[  399.051592]  schedule+0x92/0x1a0
[  399.051602]  io_schedule+0x22/0x50
[  399.051613]  blk_mq_get_tag+0x1d3/0x3c0
[  399.051640]  __blk_mq_alloc_requests+0x21d/0x3f0
[  399.051657]  blk_mq_submit_bio+0x68d/0xca0
[  399.051674]  __submit_bio+0x1b5/0x2d0
[  399.051708]  submit_bio_noacct+0x34e/0x720
[  399.051718]  submit_bio+0x3b/0x150
[  399.051725]  submit_bh_wbc+0x161/0x230
[  399.051734]  __sync_dirty_buffer+0xd1/0x420
[  399.051744]  sync_dirty_buffer+0x17/0x20
[  399.051750]  __fat_write_inode+0x289/0x310
[  399.051766]  fat_write_inode+0x2a/0xa0
[  399.051783]  __writeback_single_inode+0x53c/0x6f0
[  399.051795]  writeback_single_inode+0x145/0x200
[  399.051803]  sync_inode_metadata+0x45/0x70
[  399.051856]  __generic_file_fsync+0xa3/0x150
[  399.051880]  fat_file_fsync+0x1d/0x80
[  399.051895]  vfs_fsync_range+0x40/0xb0
[  399.051929]  __x64_sys_fsync+0x18/0x30

In my test, 'need_resched()' (which is imported by 590dca3a71 "fs-writeback:
unplug before cond_resched in writeback_sb_inodes") in function
'writeback_sb_inodes()' seldom comes true, unless cond_resched() is deleted
from write_cache_pages().

Fix it by correcting wrote number according number of skipped pages
in writeback_sb_inodes().

Goto Link to find a reproducer.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=215837
Cc: stable@vger.kernel.org # v4.3
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220510133805.1988292-1-chengzhihao1@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2022-06-09 10:21:22 +02:00
..
9p
9p: only copy valid iattrs in 9P2000.L setattr implementation
2022-01-20 09:17:50 +01:00
adfs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
affs
fs/affs: release old buffer head on error path
2021-03-04 11:38:37 +01:00
afs
rxrpc, afs: Fix selection of abort codes
2022-06-09 10:20:56 +02:00
autofs
autofs: harden ioctl table
2020-10-16 11:11:22 -07:00
befs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
bfs
bfs: don't use WARNING: string when it's just info.
2021-01-06 14:56:52 +01:00
btrfs
btrfs: repair super block num_devices automatically
2022-06-09 10:20:49 +02:00
cachefiles
fs/cachefiles: Remove wait_bit_key layout dependency
2021-03-30 14:32:07 +02:00
ceph
ceph: fix setting of xattrs on async created inodes
2022-05-18 10:23:47 +02:00
cifs
cifs: when extending a file with falloc we should make files not-sparse
2022-06-09 10:20:48 +02:00
coda
…
configfs
configfs: fix a race in configfs_{,un}register_subsystem()
2022-03-02 11:42:52 +01:00
cramfs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
crypto
fscrypt: allow 256-bit master keys with AES-256-XTS
2021-11-18 14:03:54 +01:00
debugfs
debugfs: lockdown: Allow reading debugfs files that are not world readable
2022-01-27 10:54:02 +01:00
devpts
fsnotify: fix fsnotify hooks in pseudo filesystems
2022-02-01 17:25:39 +01:00
dlm
fs: dlm: filter user dlm messages for kernel locks
2022-01-27 10:54:10 +01:00
ecryptfs
Revert "ecryptfs: replace BUG_ON with error handling code"
2021-05-26 12:06:55 +02:00
efivarfs
efivarfs: revert "fix memory leak in efivarfs_create()"
2020-11-25 16:55:02 +01:00
efs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
erofs
erofs: fix deadlock when shrink erofs slab
2021-12-01 09:19:05 +01:00
exfat
exfat: check if cluster num is valid
2022-06-06 08:42:42 +02:00
exportfs
…
ext2
ext2: correct max file size computing
2022-04-08 14:40:18 +02:00
ext4
ext4: reject the 'commit' option on ext2 filesystems
2022-06-09 10:21:10 +02:00
f2fs
f2fs: fix to do sanity check for inline inode
2022-06-09 10:21:21 +02:00
fat
fat: add ratelimit to fat*_ent_bread()
2022-06-09 10:20:58 +02:00
freevxfs
…
fscache
fscache: Fix cookie key hashing
2021-09-18 13:40:15 +02:00
fuse
fuse: fix pipe buffer lifetime for direct_io
2022-03-16 14:16:01 +01:00
gfs2
gfs2: use i_lock spin_lock for inode qadata
2022-06-09 10:20:57 +02:00
hfs
hfs: add lock nesting notation to hfs_find_init
2021-07-31 08:16:12 +02:00
hfsplus
hfsplus: prevent corruption in shrinking truncate
2021-05-19 10:13:10 +02:00
hostfs
hostfs: fix memory handling in follow_link()
2021-04-14 08:42:06 +02:00
hpfs
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
hugetlbfs
mm, hugetlb: allow for "high" userspace addresses
2022-04-27 13:53:54 +02:00
iomap
iomap: iomap_write_failed fix
2022-06-09 10:21:06 +02:00
isofs
isofs: Fix out of bound access for corrupted isofs image
2021-11-12 14:58:33 +01:00
jbd2
jbd2: fix a potential race while discarding reserved buffers after an abort
2022-04-27 13:53:57 +02:00
jffs2
jffs2: fix memory leak in jffs2_scan_medium
2022-04-08 14:39:52 +02:00
jfs
fs: jfs: fix possible NULL pointer dereference in dbFree()
2022-06-09 10:20:57 +02:00
kernfs
kernfs: wire up ->splice_read and ->splice_write
2021-01-27 11:55:29 +01:00
lockd
lockd: lockd server-side shouldn't set fl_ops
2021-09-18 13:40:30 +02:00
minix
minix: fix bug when opening a file with O_DIRECT
2022-04-13 21:01:01 +02:00
nfs
NFSv4/pNFS: Do not fail I/O when we fail to allocate the pNFS layout
2022-06-09 10:21:20 +02:00
nfs_common
nfs_common: need lock during iterate through the list
2020-12-30 11:53:45 +01:00
nfsd
NFSD: Fix possible sleep during nfsd4_release_lockowner()
2022-06-06 08:42:45 +02:00
nilfs2
nilfs2: fix lockdep warnings during disk space reclamation
2022-05-25 09:17:54 +02:00
nls
…
notify
fsnotify: fix wrong lockdep annotations
2022-06-09 10:21:03 +02:00
ntfs
ntfs: add sanity check on allocation size
2022-04-08 14:40:33 +02:00
ocfs2
ocfs2: fix crash when initialize filecheck kobj fails
2022-03-23 09:13:27 +01:00
omfs
fs: omfs: use kmemdup() rather than kmalloc+memcpy
2020-09-22 23:39:45 -04:00
openpromfs
…
orangefs
orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc()
2022-01-20 09:17:50 +01:00
overlayfs
ovl: fix warning in ovl_create_real()
2021-12-22 09:30:58 +01:00
proc
proc: fix dentry/inode overinstantiating under /proc/${pid}/net
2022-06-09 10:21:17 +02:00
pstore
pstore: Don't use semaphores in always-atomic-context code
2022-04-08 14:39:56 +02:00
qnx4
qnx4: work around gcc false positive warning bug
2021-09-30 10:11:08 +02:00
qnx6
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
quota
quota: make dquot_quota_sync return errors from ->sync_fs
2022-02-23 12:00:59 +01:00
ramfs
ramfs: fix nommu mmap with gaps in the page cache
2020-10-16 11:11:22 -07:00
reiserfs
reiserfs: check directory items on read from disk
2021-08-12 13:22:19 +02:00
romfs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
squashfs
squashfs: fix divide error in calculate_skip()
2021-05-19 10:13:10 +02:00
sysfs
sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output
2020-10-02 12:02:30 +02:00
sysv
[PATCH] reduce boilerplate in fsid handling
2020-09-18 16:45:50 -04:00
tracefs
tracefs: Set the group ownership in apply_options() not parse_options()
2022-03-02 11:42:54 +01:00
ubifs
ubifs: Rectify space amount budget for mkdir/tmpfile operations
2022-04-13 21:00:53 +02:00
udf
udf: Fix NULL ptr deref when converting from inline format
2022-02-01 17:25:39 +01:00
ufs
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-10-24 12:26:05 -07:00
unicode
unicode: Add utf8_casefold_hash
2020-09-10 14:03:31 -07:00
vboxsf
vboxfs: fix broken legacy mount signature checking
2021-10-17 10:43:33 +02:00
verity
fs-verity: fix signed integer overflow with i_size near S64_MAX
2021-10-06 15:55:46 +02:00
xfs
xfs: Fix CIL throttle hang when CIL space used going backwards
2022-06-06 08:42:42 +02:00
zonefs
zonefs: Clear inode information flags on inode creation
2022-05-09 09:05:06 +02:00
aio.c
aio: fix use-after-free due to missing POLLFREE handling
2021-12-14 11:32:40 +01:00
anon_inodes.c
…
attr.c
…
bad_inode.c
…
binfmt_aout.c
…
binfmt_elf_fdpic.c
coredump: Snapshot the vmas in do_coredump
2022-04-08 14:40:44 +02:00
binfmt_elf.c
coredump: Use the vma snapshot in fill_files_note
2022-04-08 14:40:45 +02:00
binfmt_em86.c
…
binfmt_flat.c
binfmt_flat: do not stop relocating GOT entries prematurely on riscv
2022-06-09 10:20:47 +02:00
binfmt_misc.c
binfmt_misc: fix possible deadlock in bm_register_write
2021-03-17 17:06:35 +01:00
binfmt_script.c
…
block_dev.c
block: fix a race between del_gendisk and BLKRRPART
2021-06-03 09:00:45 +02:00
buffer.c
mm, memcg: rework remote charging API to support nesting
2020-10-18 09:27:09 -07:00
char_dev.c
…
compat_binfmt_elf.c
…
coredump.c
coredump: Use the vma snapshot in fill_files_note
2022-04-08 14:40:45 +02:00
d_path.c
fs: fix NULL dereference due to data race in prepend_path()
2020-10-14 14:54:45 -07:00
dax.c
dax: fix cache flush on PMD-mapped pages
2022-06-09 10:21:16 +02:00
dcache.c
…
dcookies.c
…
direct-io.c
fs: direct-io: fix missing sdio->boundary
2021-04-14 08:41:58 +02:00
drop_caches.c
…
eventfd.c
…
eventpoll.c
fs/epoll: restore waking from ep_done_scan()
2021-05-11 14:47:12 +02:00
exec.c
exec: Force single empty string when argv is empty
2022-04-08 14:39:57 +02:00
fcntl.c
fcntl: fix potential deadlock for &fasync_struct.fa_lock
2021-09-15 09:50:27 +02:00
fhandle.c
…
file_table.c
SUNRPC: Ensure we flush any closed sockets before xs_xprt_free()
2022-05-18 10:23:48 +02:00
file.c
fs: fix fd table size alignment properly
2022-04-08 14:40:30 +02:00
filesystems.c
…
fs_context.c
memcg: charge fs_context and legacy_fs_context
2022-02-08 18:30:36 +01:00
fs_parser.c
fs_parse: mark fs_param_bad_value() as static
2020-10-13 18:38:27 -07:00
fs_pin.c
…
fs_struct.c
…
fs_types.c
…
fs-writeback.c
fs-writeback: writeback_sb_inodes：Recalculate 'wrote' according skipped pages
2022-06-09 10:21:22 +02:00
fsopen.c
treewide: Use fallthrough pseudo-keyword
2020-08-23 17:36:59 -05:00
init.c
…
inode.c
fs: export an inode_update_time helper
2021-11-26 10:39:22 +01:00
internal.h
cgroup1: fix leaked context root causing sporadic NULL deref in LTP
2021-07-31 08:16:11 +02:00
io_uring.c
io_uring: fix using under-expanded iters
2022-06-06 08:42:41 +02:00
io-wq.c
io-wq: fix wakeup race when adding new work
2021-09-18 13:40:06 +02:00
io-wq.h
io_uring: always batch cancel in *cancel_files()
2021-02-13 13:54:56 +01:00
ioctl.c
fs: fix an infinite loop in iomap_fiemap
2022-05-25 09:17:54 +02:00
Kconfig
tmpfs: disallow CONFIG_TMPFS_INODE64 on alpha
2021-02-17 11:02:21 +01:00
Kconfig.binfmt
…
kernel_read_file.c
vfs: check fd has read access in kernel_read_file_from_fd()
2021-10-27 09:56:51 +02:00
libfs.c
libfs: fix error cast of negative value in simple_attr_write()
2020-11-22 10:48:22 -08:00
locks.c
Revert "nfsd4: a client's own opens needn't prevent delegations"
2021-03-20 10:43:44 +01:00
Makefile
Refactored code for 5.10:
2020-10-23 11:33:41 -07:00
mbcache.c
…
mount.h
…
mpage.c
…
namei.c
fsnotify: invalidate dcache before IN_DELETE event
2022-02-01 17:25:48 +01:00
namespace.c
fs: warn about impending deprecation of mandatory locks
2021-08-26 08:35:57 -04:00
no-block.c
…
nsfs.c
…
open.c
open: don't silently ignore unknown O-flags in openat2()
2021-07-14 16:55:59 +02:00
pipe.c
pipe: Fix missing lock in pipe_resize_ring()
2022-06-06 08:42:41 +02:00
pnode.c
…
pnode.h
mount: fix mounting of detached mounts onto targets that reside on shared mounts
2021-03-17 17:06:13 +01:00
posix_acl.c
…
proc_namespace.c
proc mountinfo: make splice available again
2020-12-30 11:54:02 +01:00
read_write.c
Refactored code for 5.10:
2020-10-23 11:33:41 -07:00
readdir.c
readdir: make sure to verify directory entry for legacy interfaces too
2021-04-21 13:00:54 +02:00
remap_range.c
vfs: move the remap range helpers to remap_range.c
2020-10-15 09:48:49 -07:00
select.c
select: Fix indefinitely sleeping task in poll_schedule_timeout()
2022-01-29 10:26:11 +01:00
seq_file.c
seq_file: disallow extremely large seq buffer allocations
2021-07-20 16:05:59 +02:00
signalfd.c
signalfd: use wake_up_pollfree()
2021-12-14 11:32:40 +01:00
splice.c
io_uring-5.10-2020-10-24
2020-10-24 12:40:18 -07:00
stack.c
…
stat.c
stat: fix inconsistency between struct stat and struct compat_stat
2022-04-27 13:53:54 +02:00
statfs.c
Add a "nosymfollow" mount option.
2020-08-27 16:06:47 -04:00
super.c
vfs: make freeze_super abort when sync_filesystem returns error
2022-02-23 12:00:59 +01:00
sync.c
…
timerfd.c
…
userfaultfd.c
userfaultfd: fix a race between writeprotect and exit_mmap()
2021-10-27 09:56:51 +02:00
utimes.c
…
xattr.c
fs/xattr.c: fix kernel-doc warnings for setxattr & removexattr
2020-10-13 18:38:27 -07:00