xfs: fix the ABBA deadlock around agf and inode
PATCH 1/1 xfs: fix the ABBA deadlock around agf and inode
Recently, we encounter a deadlock case where there are many tasks hung on agi and agf xfs_buf. It end up with a deadlock between agf and inode xfs_buf as following,
xfs_ifree() xfs_bmap_btalloc()xfs_iunlink_remove() xfs_alloc_vextent()
hold inode bp hold agfxfs_difree() xfs_trans_log_inode()
require agf require inode bp
The task requires inode bp with agf held block other tasks which want to require agf with agi held. Then the whole filesystem looks like a agi/agf deadlock. To fix this issue, get agf in xfs_iunlink_remove() after it get agi and before get indoe bp.
--- fs/xfs/xfs_inode.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/xfs/xfs_inode.c +10 -0
@@ -36,6 +36,7 @@#include "xfs_reflink.h" #include "xfs_ag.h" #include "xfs_log_priv.h" +#include "xfs_alloc.h" struct kmem_cache *xfs_inode_cache;
@@ -2337,6 +2338,7 @@ xfs_iunlink_remove( {struct xfs_mount *mp = tp->t_mountp;struct xfs_agi *agi; +struct xfs_buf *agfbp;struct xfs_buf *agibp;struct xfs_buf *last_ibp;struct xfs_dinode *last_dip =NULL ;
@@ -2352,6 +2354,14 @@ xfs_iunlink_remove( error =xfs_read_agi (mp, tp, pag->pag_agno, &agibp);if (error)return error; + +/* +* Get the agf buffer first to ensure the lock ordering against inode bp +*/ + error =xfs_read_agf (mp, tp, pag->pag_agno,0 , &agfbp); +if (error) +return error; + agi = agibp->b_addr;/*
Signature · 1 line
2.17.1
The deadlock context is as following,
hold inode, try to require agf
inode buf xfs_buf.b_log_item ffff9ca7491eb2c0
PID: 82240 TASK: ffff9ca4cd633d80 CPU: 88 COMMAND: ""
#0 [ffffb696ad7f7410] __schedule at ffffffffa0067073
#1 [ffffb696ad7f74b0] schedule at ffffffffa0067678
#2 [ffffb696ad7f74b8] schedule_timeout at ffffffffa006b88d
#3 [ffffb696ad7f7558] __down at ffffffffa0069dcb
#4 [ffffb696ad7f75b8] down at ffffffff9f90890b
#5 [ffffb696ad7f75d0] xfs_buf_lock at ffffffffc6cb1133 [xfs]
#6 [ffffb696ad7f75f0] xfs_buf_find at ffffffffc6cb15fa [xfs]
#7 [ffffb696ad7f7688] xfs_buf_get_map at ffffffffc6cb18e0 [xfs] #8 [ffffb696ad7f76d0] xfs_buf_read_map at ffffffffc6cb20e8 [xfs] #9 [ffffb696ad7f7710] xfs_trans_read_buf_map at ffffffffc6ce6796 [xfs]
#10 [ffffb696ad7f7750] xfs_read_agf at ffffffffc6c66fde [xfs] #11 [ffffb696ad7f77b8] xfs_alloc_read_agf at ffffffffc6c670ae [xfs] #12 [ffffb696ad7f77f0] xfs_alloc_fix_freelist at ffffffffc6c675dc [xfs] #13 [ffffb696ad7f7900] xfs_alloc_vextent at ffffffffc6c6796b [xfs] #14 [ffffb696ad7f7940] __xfs_inobt_alloc_block at ffffffffc6c972f0 [xfs] #15 [ffffb696ad7f79f8] __xfs_btree_split at ffffffffc6c7ee5d [xfs] #16 [ffffb696ad7f7ab8] xfs_btree_split at ffffffffc6c7f34b [xfs] #17 [ffffb696ad7f7b68] xfs_btree_make_block_unfull at ffffffffc6c80882 [xfs] #18 [ffffb696ad7f7bc8] xfs_btree_insrec at ffffffffc6c80ccd [xfs] #19 [ffffb696ad7f7ca0] xfs_btree_insert at ffffffffc6c80e3b [xfs] #20 [ffffb696ad7f7d60] xfs_difree_finobt at ffffffffc6c94859 [xfs] #21 [ffffb696ad7f7db8] xfs_difree at ffffffffc6c9634e [xfs]
#22 [ffffb696ad7f7e08] xfs_ifree at ffffffffc6cc63d2 [xfs]
#23 [ffffb696ad7f7e58] xfs_inactive_ifree at ffffffffc6cc6551 [xfs] #24 [ffffb696ad7f7e88] xfs_inactive at ffffffffc6cc66fe [xfs] #25 [ffffb696ad7f7ea0] xfs_fs_destroy_inode at ffffffffc6ccfdb8 [xfs] #26 [ffffb696ad7f7ec0] do_unlinkat at ffffffff9face066
#27 [ffffb696ad7f7f38] do_syscall_64 at ffffffff9f8041cb
#28 [ffffb696ad7f7f50] entry_SYSCALL_64_after_hwframe at ffffffffa02000ad
RIP: 00007f5e27b64e57 RSP: 00007f5e0d1f9a98 RFLAGS: 00000202
RAX: ffffffffffffffda RBX: 00007f578b4011a0 RCX: 00007f5e27b64e57
RDX: 00007f5b1684e680 RSI: 0000000000000070 RDI: 00007f5b1684e680
RBP: 00007f578b4011c0 R8: 00000000000002e8 R9: 0000000000000007
R10: 00007f5e0d1fae20 R11: 0000000000000202 R12: 00007f5e0d1f9c00
R13: 00007f5d191e2118 R14: 00007f5d191e22d0 R15: 00007f5e0d1f9b50
ORIG_RAX: 0000000000000057 CS: 0033 SS: 002bThe task hold agf, try to require inode
PID: 1653499 TASK: ffff9c9f5490bd80 CPU: 66 COMMAND: "kworker/u209:2"
#0 [ffffb696ccdff270] __schedule at ffffffffa0067073
#1 [ffffb696ccdff310] schedule at ffffffffa0067678
#2 [ffffb696ccdff318] schedule_timeout at ffffffffa006b88d
#3 [ffffb696ccdff3b8] __down at ffffffffa0069dcb
#4 [ffffb696ccdff410] down at ffffffff9f90890b
#5 [ffffb696ccdff428] xfs_buf_lock at ffffffffc6cb1133 [xfs] #6 [ffffb696ccdff448] xfs_buf_find at ffffffffc6cb15fa [xfs] #7 [ffffb696ccdff4e0] xfs_buf_get_map at ffffffffc6cb18e0 [xfs] #8 [ffffb696ccdff528] xfs_buf_read_map at ffffffffc6cb20e8 [xfs] #9 [ffffb696ccdff568] xfs_trans_read_buf_map at ffffffffc6ce6796 [xfs]
#10 [ffffb696ccdff5a8] xfs_imap_to_bp at ffffffffc6c9a3e7 [xfs] #11 [ffffb696ccdff608] xfs_trans_log_inode at ffffffffc6ce757e [xfs] #12 [ffffb696ccdff658] xfs_bmap_btalloc at ffffffffc6c75ccc [xfs] #13 [ffffb696ccdff750] xfs_bmapi_write at ffffffffc6c77ca0 [xfs] #14 [ffffb696ccdff8a8] xfs_bmapi_convert_delalloc at ffffffffc6c782a4 [xfs] #15 [ffffb696ccdff8d0] xfs_iomap_write_allocate at ffffffffc6cc11a7 [xfs] #16 [ffffb696ccdff940] xfs_map_blocks at ffffffffc6ca9f97 [xfs] #17 [ffffb696ccdff9d0] xfs_do_writepage at ffffffffc6caa911 [xfs] #18 [ffffb696ccdffa48] write_cache_pages at ffffffff9fa20675 #19 [ffffb696ccdffb40] xfs_vm_writepages at ffffffffc6caa3e4 [xfs] #20 [ffffb696ccdffba8] do_writepages at ffffffff9fa217c1
#21 [ffffb696ccdffc10] __writeback_single_inode at ffffffff9faec1bd #22 [ffffb696ccdffc58] writeback_sb_inodes at ffffffff9faec953 #23 [ffffb696ccdffd38] __writeback_inodes_wb at ffffffff9faecc1d #24 [ffffb696ccdffd78] wb_writeback at ffffffff9faecf9f
#25 [ffffb696ccdffe08] wb_workfn at ffffffff9faed8a2
#26 [ffffb696ccdffe98] process_one_work at ffffffff9f8cd9f7
#27 [ffffb696ccdffed8] worker_thread at ffffffff9f8ce0fa
#28 [ffffb696ccdfff10] kthread at ffffffff9f8d3802
#29 [ffffb696ccdfff50] ret_from_fork at ffffffffa020023f
Thanks
Jianchao
Quoted 55 lines · Wang Jianchao (Kuaishou)
Recently, we encounter a deadlock case where there are many tasks hung on agi and agf
xfs_buf. It end up with a deadlock between agf and inodexfs_bufas following,
xfs_ifree()xfs_bmap_btalloc()xfs_iunlink_remove()xfs_alloc_vextent()
hold inode bp hold agfxfs_difree()xfs_trans_log_inode()
require agf require inode bpThe task requires inode bp with agf held block other tasks which want to require agf with agi held. Then the whole filesystem looks like a agi/agf deadlock. To fix this issue, get agf in
xfs_iunlink_remove()after it get agi and before get indoe bp.Signed-off-by Wang Jianchao (Kuaishou) <[email protected]>--- fs/xfs/xfs_inode.c | 10 ++++++++++ 1 file changed, 10 insertions(+)fs/xfs/xfs_inode.c +10
-0@@ -36,6 +36,7 @@#include "xfs_reflink.h" #include "xfs_ag.h" #include "xfs_log_priv.h" +#include "xfs_alloc.h" struct kmem_cache *xfs_inode_cache;@@ -2337,6 +2338,7 @@ xfs_iunlink_remove( {struct xfs_mount *mp = tp->t_mountp;struct xfs_agi *agi; +struct xfs_buf *agfbp;struct xfs_buf *agibp;struct xfs_buf *last_ibp;struct xfs_dinode *last_dip =NULL ;@@ -2352,6 +2354,14 @@ xfs_iunlink_remove( error =xfs_read_agi (mp, tp, pag->pag_agno, &agibp);if (error)return error; + +/* +* Get the agf buffer first to ensure the lock ordering against inode bp +*/ + error =xfs_read_agf (mp, tp, pag->pag_agno,0 , &agfbp); +if (error) +return error; + agi = agibp->b_addr;/*
Quoted 70 lines · Wang Jianchao
The deadlock context is as following,
hold inode, try to require agfinode buf xfs_buf.b_log_item
ffff9ca7491eb2c0PID: 82240 TASK:
ffff9ca4cd633d80CPU: 88 COMMAND: ""
#0 [ffffb696ad7f7410]__scheduleatffffffffa0067073
#1 [ffffb696ad7f74b0] schedule atffffffffa0067678
#2 [ffffb696ad7f74b8]schedule_timeoutatffffffffa006b88d
#3 [ffffb696ad7f7558]__downatffffffffa0069dcb
#4 [ffffb696ad7f75b8] down atffffffff9f90890b
#5 [ffffb696ad7f75d0]xfs_buf_lockatffffffffc6cb1133[xfs]
#6 [ffffb696ad7f75f0]xfs_buf_findatffffffffc6cb15fa[xfs]
#7 [ffffb696ad7f7688]xfs_buf_get_mapatffffffffc6cb18e0[xfs] #8 [ffffb696ad7f76d0]xfs_buf_read_mapatffffffffc6cb20e8[xfs] #9 [ffffb696ad7f7710]xfs_trans_read_buf_mapatffffffffc6ce6796[xfs]
#10 [ffffb696ad7f7750]xfs_read_agfatffffffffc6c66fde[xfs] #11 [ffffb696ad7f77b8]xfs_alloc_read_agfatffffffffc6c670ae[xfs] #12 [ffffb696ad7f77f0]xfs_alloc_fix_freelistatffffffffc6c675dc[xfs] #13 [ffffb696ad7f7900]xfs_alloc_vextentatffffffffc6c6796b[xfs] #14 [ffffb696ad7f7940]__xfs_inobt_alloc_blockatffffffffc6c972f0[xfs] #15 [ffffb696ad7f79f8]__xfs_btree_splitatffffffffc6c7ee5d[xfs] #16 [ffffb696ad7f7ab8]xfs_btree_splitatffffffffc6c7f34b[xfs] #17 [ffffb696ad7f7b68]xfs_btree_make_block_unfullatffffffffc6c80882[xfs] #18 [ffffb696ad7f7bc8]xfs_btree_insrecatffffffffc6c80ccd[xfs] #19 [ffffb696ad7f7ca0]xfs_btree_insertatffffffffc6c80e3b[xfs] #20 [ffffb696ad7f7d60]xfs_difree_finobtatffffffffc6c94859[xfs] #21 [ffffb696ad7f7db8]xfs_difreeatffffffffc6c9634e[xfs]
#22 [ffffb696ad7f7e08]xfs_ifreeatffffffffc6cc63d2[xfs]
#23 [ffffb696ad7f7e58]xfs_inactive_ifreeatffffffffc6cc6551[xfs] #24 [ffffb696ad7f7e88]xfs_inactiveatffffffffc6cc66fe[xfs] #25 [ffffb696ad7f7ea0]xfs_fs_destroy_inodeatffffffffc6ccfdb8[xfs] #26 [ffffb696ad7f7ec0]do_unlinkatatffffffff9face066
#27 [ffffb696ad7f7f38]do_syscall_64atffffffff9f8041cb
#28 [ffffb696ad7f7f50]entry_SYSCALL_64_after_hwframeatffffffffa02000adRIP: 00007f5e27b64e57 RSP: 00007f5e0d1f9a98 RFLAGS: 00000202 RAX: ffffffffffffffda RBX: 00007f578b4011a0 RCX: 00007f5e27b64e57 RDX: 00007f5b1684e680 RSI: 0000000000000070 RDI: 00007f5b1684e680 RBP: 00007f578b4011c0 R8: 00000000000002e8 R9: 0000000000000007 R10: 00007f5e0d1fae20 R11: 0000000000000202 R12: 00007f5e0d1f9c00 R13: 00007f5d191e2118 R14: 00007f5d191e22d0 R15: 00007f5e0d1f9b50 ORIG_RAX: 0000000000000057 CS: 0033 SS: 002bThe task hold agf, try to require inode
PID: 1653499 TASK:
ffff9c9f5490bd80CPU: 66 COMMAND: "kworker/u209:2"
#0 [ffffb696ccdff270]__scheduleatffffffffa0067073
#1 [ffffb696ccdff310] schedule atffffffffa0067678
#2 [ffffb696ccdff318]schedule_timeoutatffffffffa006b88d
#3 [ffffb696ccdff3b8]__downatffffffffa0069dcb
#4 [ffffb696ccdff410] down atffffffff9f90890b
#5 [ffffb696ccdff428]xfs_buf_lockatffffffffc6cb1133[xfs] #6 [ffffb696ccdff448]xfs_buf_findatffffffffc6cb15fa[xfs] #7 [ffffb696ccdff4e0]xfs_buf_get_mapatffffffffc6cb18e0[xfs] #8 [ffffb696ccdff528]xfs_buf_read_mapatffffffffc6cb20e8[xfs] #9 [ffffb696ccdff568]xfs_trans_read_buf_mapatffffffffc6ce6796[xfs]
#10 [ffffb696ccdff5a8]xfs_imap_to_bpatffffffffc6c9a3e7[xfs] #11 [ffffb696ccdff608]xfs_trans_log_inodeatffffffffc6ce757e[xfs] #12 [ffffb696ccdff658]xfs_bmap_btallocatffffffffc6c75ccc[xfs] #13 [ffffb696ccdff750]xfs_bmapi_writeatffffffffc6c77ca0[xfs] #14 [ffffb696ccdff8a8]xfs_bmapi_convert_delallocatffffffffc6c782a4[xfs] #15 [ffffb696ccdff8d0]xfs_iomap_write_allocateatffffffffc6cc11a7[xfs] #16 [ffffb696ccdff940]xfs_map_blocksatffffffffc6ca9f97[xfs] #17 [ffffb696ccdff9d0]xfs_do_writepageatffffffffc6caa911[xfs] #18 [ffffb696ccdffa48]write_cache_pagesatffffffff9fa20675#19 [ffffb696ccdffb40]xfs_vm_writepagesatffffffffc6caa3e4[xfs] #20 [ffffb696ccdffba8]do_writepagesatffffffff9fa217c1
#21 [ffffb696ccdffc10]__writeback_single_inodeatffffffff9faec1bd
Quoted 8 lines
#22 [
ffffb696ccdffc58]writeback_sb_inodesatffffffff9faec953#23 [ffffb696ccdffd38]__writeback_inodes_wbatffffffff9faecc1d#24 [ffffb696ccdffd78]wb_writebackatffffffff9faecf9f#25 [ffffb696ccdffe08]wb_workfnatffffffff9faed8a2#26 [ffffb696ccdffe98]process_one_workatffffffff9f8cd9f7#27 [ffffb696ccdffed8]worker_threadatffffffff9f8ce0fa#28 [ffffb696ccdfff10] kthread atffffffff9f8d3802
#29 [ffffb696ccdfff50]ret_from_forkatffffffffa020023f
Does this solve the same problem as[1]?
[1]
https://lore.kernel.org/linux-xfs/[email protected]/
--D
Quoted 61 lines
Thanks
JianchaoQuoted 55 lines · Wang Jianchao (Kuaishou)
Recently, we encounter a deadlock case where there are many tasks hung on agi and agf
xfs_buf. It end up with a deadlock between agf and inodexfs_bufas following,
xfs_ifree()xfs_bmap_btalloc()xfs_iunlink_remove()xfs_alloc_vextent()
hold inode bp hold agfxfs_difree()xfs_trans_log_inode()
require agf require inode bpThe task requires inode bp with agf held block other tasks which want to require agf with agi held. Then the whole filesystem looks like a agi/agf deadlock. To fix this issue, get agf in
xfs_iunlink_remove()after it get agi and before get indoe bp.Signed-off-by Wang Jianchao (Kuaishou) <[email protected]>--- fs/xfs/xfs_inode.c | 10 ++++++++++ 1 file changed, 10 insertions(+)fs/xfs/xfs_inode.c +10
-0@@ -36,6 +36,7 @@#include "xfs_reflink.h" #include "xfs_ag.h" #include "xfs_log_priv.h" +#include "xfs_alloc.h" struct kmem_cache *xfs_inode_cache;@@ -2337,6 +2338,7 @@ xfs_iunlink_remove( {struct xfs_mount *mp = tp->t_mountp;struct xfs_agi *agi; +struct xfs_buf *agfbp;struct xfs_buf *agibp;struct xfs_buf *last_ibp;struct xfs_dinode *last_dip =NULL ;@@ -2352,6 +2354,14 @@ xfs_iunlink_remove( error =xfs_read_agi (mp, tp, pag->pag_agno, &agibp);if (error)return error; + +/* +* Get the agf buffer first to ensure the lock ordering against inode bp +*/ + error =xfs_read_agf (mp, tp, pag->pag_agno,0 , &agfbp); +if (error) +return error; + agi = agibp->b_addr;/*
Quoted 80 lines · Darrick J. Wong
Quoted 70 lines · Wang Jianchao
The deadlock context is as following,
hold inode, try to require agfinode buf xfs_buf.b_log_item
ffff9ca7491eb2c0PID: 82240 TASK:
ffff9ca4cd633d80CPU: 88 COMMAND: ""
#0 [ffffb696ad7f7410]__scheduleatffffffffa0067073
#1 [ffffb696ad7f74b0] schedule atffffffffa0067678
#2 [ffffb696ad7f74b8]schedule_timeoutatffffffffa006b88d
#3 [ffffb696ad7f7558]__downatffffffffa0069dcb
#4 [ffffb696ad7f75b8] down atffffffff9f90890b
#5 [ffffb696ad7f75d0]xfs_buf_lockatffffffffc6cb1133[xfs]
#6 [ffffb696ad7f75f0]xfs_buf_findatffffffffc6cb15fa[xfs]
#7 [ffffb696ad7f7688]xfs_buf_get_mapatffffffffc6cb18e0[xfs] #8 [ffffb696ad7f76d0]xfs_buf_read_mapatffffffffc6cb20e8[xfs] #9 [ffffb696ad7f7710]xfs_trans_read_buf_mapatffffffffc6ce6796[xfs]
#10 [ffffb696ad7f7750]xfs_read_agfatffffffffc6c66fde[xfs] #11 [ffffb696ad7f77b8]xfs_alloc_read_agfatffffffffc6c670ae[xfs] #12 [ffffb696ad7f77f0]xfs_alloc_fix_freelistatffffffffc6c675dc[xfs] #13 [ffffb696ad7f7900]xfs_alloc_vextentatffffffffc6c6796b[xfs] #14 [ffffb696ad7f7940]__xfs_inobt_alloc_blockatffffffffc6c972f0[xfs] #15 [ffffb696ad7f79f8]__xfs_btree_splitatffffffffc6c7ee5d[xfs] #16 [ffffb696ad7f7ab8]xfs_btree_splitatffffffffc6c7f34b[xfs] #17 [ffffb696ad7f7b68]xfs_btree_make_block_unfullatffffffffc6c80882[xfs] #18 [ffffb696ad7f7bc8]xfs_btree_insrecatffffffffc6c80ccd[xfs] #19 [ffffb696ad7f7ca0]xfs_btree_insertatffffffffc6c80e3b[xfs] #20 [ffffb696ad7f7d60]xfs_difree_finobtatffffffffc6c94859[xfs] #21 [ffffb696ad7f7db8]xfs_difreeatffffffffc6c9634e[xfs]
#22 [ffffb696ad7f7e08]xfs_ifreeatffffffffc6cc63d2[xfs]
#23 [ffffb696ad7f7e58]xfs_inactive_ifreeatffffffffc6cc6551[xfs] #24 [ffffb696ad7f7e88]xfs_inactiveatffffffffc6cc66fe[xfs] #25 [ffffb696ad7f7ea0]xfs_fs_destroy_inodeatffffffffc6ccfdb8[xfs] #26 [ffffb696ad7f7ec0]do_unlinkatatffffffff9face066
#27 [ffffb696ad7f7f38]do_syscall_64atffffffff9f8041cb
#28 [ffffb696ad7f7f50]entry_SYSCALL_64_after_hwframeatffffffffa02000adRIP: 00007f5e27b64e57 RSP: 00007f5e0d1f9a98 RFLAGS: 00000202 RAX: ffffffffffffffda RBX: 00007f578b4011a0 RCX: 00007f5e27b64e57 RDX: 00007f5b1684e680 RSI: 0000000000000070 RDI: 00007f5b1684e680 RBP: 00007f578b4011c0 R8: 00000000000002e8 R9: 0000000000000007 R10: 00007f5e0d1fae20 R11: 0000000000000202 R12: 00007f5e0d1f9c00 R13: 00007f5d191e2118 R14: 00007f5d191e22d0 R15: 00007f5e0d1f9b50 ORIG_RAX: 0000000000000057 CS: 0033 SS: 002bThe task hold agf, try to require inode
PID: 1653499 TASK:
ffff9c9f5490bd80CPU: 66 COMMAND: "kworker/u209:2"
#0 [ffffb696ccdff270]__scheduleatffffffffa0067073
#1 [ffffb696ccdff310] schedule atffffffffa0067678
#2 [ffffb696ccdff318]schedule_timeoutatffffffffa006b88d
#3 [ffffb696ccdff3b8]__downatffffffffa0069dcb
#4 [ffffb696ccdff410] down atffffffff9f90890b
#5 [ffffb696ccdff428]xfs_buf_lockatffffffffc6cb1133[xfs] #6 [ffffb696ccdff448]xfs_buf_findatffffffffc6cb15fa[xfs] #7 [ffffb696ccdff4e0]xfs_buf_get_mapatffffffffc6cb18e0[xfs] #8 [ffffb696ccdff528]xfs_buf_read_mapatffffffffc6cb20e8[xfs] #9 [ffffb696ccdff568]xfs_trans_read_buf_mapatffffffffc6ce6796[xfs]
#10 [ffffb696ccdff5a8]xfs_imap_to_bpatffffffffc6c9a3e7[xfs] #11 [ffffb696ccdff608]xfs_trans_log_inodeatffffffffc6ce757e[xfs] #12 [ffffb696ccdff658]xfs_bmap_btallocatffffffffc6c75ccc[xfs] #13 [ffffb696ccdff750]xfs_bmapi_writeatffffffffc6c77ca0[xfs] #14 [ffffb696ccdff8a8]xfs_bmapi_convert_delallocatffffffffc6c782a4[xfs] #15 [ffffb696ccdff8d0]xfs_iomap_write_allocateatffffffffc6cc11a7[xfs] #16 [ffffb696ccdff940]xfs_map_blocksatffffffffc6ca9f97[xfs] #17 [ffffb696ccdff9d0]xfs_do_writepageatffffffffc6caa911[xfs] #18 [ffffb696ccdffa48]write_cache_pagesatffffffff9fa20675#19 [ffffb696ccdffb40]xfs_vm_writepagesatffffffffc6caa3e4[xfs] #20 [ffffb696ccdffba8]do_writepagesatffffffff9fa217c1
#21 [ffffb696ccdffc10]__writeback_single_inodeatffffffff9faec1bdQuoted 8 lines
#22 [
ffffb696ccdffc58]writeback_sb_inodesatffffffff9faec953#23 [ffffb696ccdffd38]__writeback_inodes_wbatffffffff9faecc1d#24 [ffffb696ccdffd78]wb_writebackatffffffff9faecf9f#25 [ffffb696ccdffe08]wb_workfnatffffffff9faed8a2#26 [ffffb696ccdffe98]process_one_workatffffffff9f8cd9f7#27 [ffffb696ccdffed8]worker_threadatffffffff9f8ce0fa#28 [ffffb696ccdfff10] kthread atffffffff9f8d3802
#29 [ffffb696ccdfff50]ret_from_forkatffffffffa020023f
Quoted 4 lines
Does this solve the same problem as[1]?
Yes, it is !
Thanks so much
Jianchao
Quoted 64 lines
--D
Quoted 61 lines
Thanks
JianchaoQuoted 55 lines · Wang Jianchao (Kuaishou)
Recently, we encounter a deadlock case where there are many tasks hung on agi and agf
xfs_buf. It end up with a deadlock between agf and inodexfs_bufas following,
xfs_ifree()xfs_bmap_btalloc()xfs_iunlink_remove()xfs_alloc_vextent()
hold inode bp hold agfxfs_difree()xfs_trans_log_inode()
require agf require inode bpThe task requires inode bp with agf held block other tasks which want to require agf with agi held. Then the whole filesystem looks like a agi/agf deadlock. To fix this issue, get agf in
xfs_iunlink_remove()after it get agi and before get indoe bp.Signed-off-by Wang Jianchao (Kuaishou) <[email protected]>--- fs/xfs/xfs_inode.c | 10 ++++++++++ 1 file changed, 10 insertions(+)fs/xfs/xfs_inode.c +10
-0@@ -36,6 +36,7 @@#include "xfs_reflink.h" #include "xfs_ag.h" #include "xfs_log_priv.h" +#include "xfs_alloc.h" struct kmem_cache *xfs_inode_cache;@@ -2337,6 +2338,7 @@ xfs_iunlink_remove( {struct xfs_mount *mp = tp->t_mountp;struct xfs_agi *agi; +struct xfs_buf *agfbp;struct xfs_buf *agibp;struct xfs_buf *last_ibp;struct xfs_dinode *last_dip =NULL ;@@ -2352,6 +2354,14 @@ xfs_iunlink_remove( error =xfs_read_agi (mp, tp, pag->pag_agno, &agibp);if (error)return error; + +/* +* Get the agf buffer first to ensure the lock ordering against inode bp +*/ + error =xfs_read_agf (mp, tp, pag->pag_agno,0 , &agfbp); +if (error) +return error; + agi = agibp->b_addr;/*