diff for duplicates of <cover.1791877866.git.siddh.raman.pant@oracle.com> diff --git a/a/1.txt b/N1/1.txt index 3e6c1c2..0e7d768 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,55 +8,71 @@ https://lore.kernel.org/stable/2026-10-01-1-daily-reply-0012-re-xfs-umount-hang- xfstests_xfs testing results: Generic: - Ran: 001 to 771 (672 tests; gaps) + Ran: 001 to 771 (671 tests; gaps) Failures before changes: - Count: 15 - IDs: 075, 083, 091, 112, 127, 231, 263, - 269, 270, 363, 365, 645, 753, 759, - 760 + Count: 19 + IDs: 075, 083, 091, 112, 127, 263, 269, + 270, 363, 365, 373, 374, 645, 700, + 733, 753, 754, 759, 760 Failures after changes: - Count: 13 - IDs: 075, 083, 091, 127, 263, 269, 270, - 363, 365, 645, 753, 759, 760 + Count: 19 + IDs: 075, 083, 091, 112, 127, 263, 269, + 270, 363, 365, 373, 374, 645, 700, + 733, 753, 754, 759, 760 - New successes after changes: - Count: 2 - IDs: 112, 231 - - No new failure after changes. + No new success or failure after changes. XFS: - Ran: 001 to 789 (311 tests; gaps) + Ran: 001 to 789 (312 tests; gaps) Failures before changes: - Count: 7 - IDs: 104, 168, 300, 442, 597, 598, 609 + Count: 10 + IDs: 104, 168, 179, 300, 348, 442, 557, + 597, 598, 609 Failures after changes: - Count: 7 - IDs: 104, 168, 300, 442, 597, 598, 609 + Count: 10 + IDs: 104, 168, 179, 300, 348, 442, 557, + 597, 598, 609 No new success or failure after changes. Thanks, Siddh -Dave Chinner (5): +Dave Chinner (8): + xfs: log items should have a xlog pointer, not a mount + xfs: aborting inodes on shutdown may need buffer lock + xfs: buffer pins need to hold a buffer reference xfs: xfs_ifree_cluster vs xfs_iflush_shutdown_abort deadlock xfs: catch stale AGF/AGF metadata xfs: rearrange code in xfs_buf_item.c xfs: factor out stale buffer item completion xfs: fix unmount hang with unflushable inodes stuck in the AIL - fs/xfs/libxfs/xfs_alloc.c | 46 ++++-- +Guo Xuenan (1): + xfs: fix super block buf log item UAF during force shutdown + + fs/xfs/libxfs/xfs_alloc.c | 45 ++++- fs/xfs/libxfs/xfs_ialloc.c | 32 +++- - fs/xfs/xfs_buf_item.c | 299 ++++++++++++++++++++++--------------- + fs/xfs/xfs_bmap_item.c | 2 +- + fs/xfs/xfs_buf_item.c | 382 ++++++++++++++++++++++++------------- fs/xfs/xfs_buf_item.h | 3 +- - fs/xfs/xfs_icache.c | 8 + - fs/xfs/xfs_inode.c | 2 +- - 6 files changed, 256 insertions(+), 134 deletions(-) + fs/xfs/xfs_extfree_item.c | 2 +- + fs/xfs/xfs_icache.c | 10 +- + fs/xfs/xfs_inode.c | 4 +- + fs/xfs/xfs_inode_item.c | 164 +++++++++++++--- + fs/xfs/xfs_inode_item.h | 1 + + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_refcount_item.c | 2 +- + fs/xfs/xfs_rmap_item.c | 2 +- + fs/xfs/xfs_trace.h | 4 +- + fs/xfs/xfs_trans.c | 2 +- + fs/xfs/xfs_trans.h | 3 +- + 17 files changed, 467 insertions(+), 195 deletions(-) -- 2.53.0 diff --git a/a/content_digest b/N1/content_digest index 4f4a0e9..4646e80 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\02026-10-01-1-daily-reply-0012-re-xfs-umount-hang-backports@kernel.org\0" "From\0Siddh Raman Pant <siddh.raman.pant@oracle.com>\0" - "Subject\0[PATCH 6.1 v2 0/5] Backport of XFS umount hang fixes\0" - "Date\0Tue, 13 Oct 2026 13:43:44 +0530\0" + "Subject\0[PATCH 5.15 v2 0/9] Backport of XFS umount hang fixes\0" + "Date\0Tue, 13 Oct 2026 13:44:08 +0530\0" "To\0Darrick J . Wong <djwong@kernel.org>" linux-xfs@vger.kernel.org " stable@vger.kernel.org\0" @@ -20,57 +20,73 @@ "\n" "xfstests_xfs testing results:\n" "\tGeneric:\n" - "\t\tRan: 001 to 771 (672 tests; gaps)\n" + "\t\tRan: 001 to 771 (671 tests; gaps)\n" "\n" "\t\tFailures before changes:\n" - "\t\t\tCount: 15\n" - "\t\t\tIDs: 075, 083, 091, 112, 127, 231, 263,\n" - "\t\t\t 269, 270, 363, 365, 645, 753, 759,\n" - "\t\t\t 760\n" + "\t\t\tCount: 19\n" + "\t\t\tIDs: 075, 083, 091, 112, 127, 263, 269,\n" + "\t\t\t 270, 363, 365, 373, 374, 645, 700,\n" + "\t\t\t 733, 753, 754, 759, 760\n" "\n" "\t\tFailures after changes:\n" - "\t\t\tCount: 13\n" - "\t\t\tIDs: 075, 083, 091, 127, 263, 269, 270,\n" - "\t\t\t 363, 365, 645, 753, 759, 760\n" + "\t\t\tCount: 19\n" + "\t\t\tIDs: 075, 083, 091, 112, 127, 263, 269,\n" + "\t\t\t 270, 363, 365, 373, 374, 645, 700,\n" + "\t\t\t 733, 753, 754, 759, 760\n" "\n" - "\t\tNew successes after changes:\n" - "\t\t\tCount: 2\n" - "\t\t\tIDs: 112, 231\n" - "\n" - "\t\tNo new failure after changes.\n" + "\t\tNo new success or failure after changes.\n" "\n" "\tXFS:\n" - "\t\tRan: 001 to 789 (311 tests; gaps)\n" + "\t\tRan: 001 to 789 (312 tests; gaps)\n" "\n" "\t\tFailures before changes:\n" - "\t\t\tCount: 7\n" - "\t\t\tIDs: 104, 168, 300, 442, 597, 598, 609\n" + "\t\t\tCount: 10\n" + "\t\t\tIDs: 104, 168, 179, 300, 348, 442, 557,\n" + "\t\t\t 597, 598, 609\n" "\n" "\t\tFailures after changes:\n" - "\t\t\tCount: 7\n" - "\t\t\tIDs: 104, 168, 300, 442, 597, 598, 609\n" + "\t\t\tCount: 10\n" + "\t\t\tIDs: 104, 168, 179, 300, 348, 442, 557,\n" + "\t\t\t 597, 598, 609\n" "\n" "\t\tNo new success or failure after changes.\n" "\n" "Thanks,\n" "Siddh\n" "\n" - "Dave Chinner (5):\n" + "Dave Chinner (8):\n" + " xfs: log items should have a xlog pointer, not a mount\n" + " xfs: aborting inodes on shutdown may need buffer lock\n" + " xfs: buffer pins need to hold a buffer reference\n" " xfs: xfs_ifree_cluster vs xfs_iflush_shutdown_abort deadlock\n" " xfs: catch stale AGF/AGF metadata\n" " xfs: rearrange code in xfs_buf_item.c\n" " xfs: factor out stale buffer item completion\n" " xfs: fix unmount hang with unflushable inodes stuck in the AIL\n" "\n" - " fs/xfs/libxfs/xfs_alloc.c | 46 ++++--\n" + "Guo Xuenan (1):\n" + " xfs: fix super block buf log item UAF during force shutdown\n" + "\n" + " fs/xfs/libxfs/xfs_alloc.c | 45 ++++-\n" " fs/xfs/libxfs/xfs_ialloc.c | 32 +++-\n" - " fs/xfs/xfs_buf_item.c | 299 ++++++++++++++++++++++---------------\n" + " fs/xfs/xfs_bmap_item.c | 2 +-\n" + " fs/xfs/xfs_buf_item.c | 382 ++++++++++++++++++++++++-------------\n" " fs/xfs/xfs_buf_item.h | 3 +-\n" - " fs/xfs/xfs_icache.c | 8 +\n" - " fs/xfs/xfs_inode.c | 2 +-\n" - " 6 files changed, 256 insertions(+), 134 deletions(-)\n" + " fs/xfs/xfs_extfree_item.c | 2 +-\n" + " fs/xfs/xfs_icache.c | 10 +-\n" + " fs/xfs/xfs_inode.c | 4 +-\n" + " fs/xfs/xfs_inode_item.c | 164 +++++++++++++---\n" + " fs/xfs/xfs_inode_item.h | 1 +\n" + " fs/xfs/xfs_log.c | 2 +-\n" + " fs/xfs/xfs_log_cil.c | 2 +-\n" + " fs/xfs/xfs_refcount_item.c | 2 +-\n" + " fs/xfs/xfs_rmap_item.c | 2 +-\n" + " fs/xfs/xfs_trace.h | 4 +-\n" + " fs/xfs/xfs_trans.c | 2 +-\n" + " fs/xfs/xfs_trans.h | 3 +-\n" + " 17 files changed, 467 insertions(+), 195 deletions(-)\n" "\n" "-- \n" 2.53.0 -681dc2ed709a0067c4e10d1799947fabddb4c354cbd90e4a68480b50fae6fa6d +b7c017200bd4f65ac373b9d4c5d5906a3ca62d0d43aa864711dc319d7732fde3
diff --git a/a/1.txt b/N2/1.txt index 3e6c1c2..b8f5652 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,57 +6,67 @@ I have added information in commit message upon conflict resolutions. v2: Address Sasha's comments to v1 in the below mail: https://lore.kernel.org/stable/2026-10-01-1-daily-reply-0012-re-xfs-umount-hang-backports@kernel.org/ -xfstests_xfs testing results: - Generic: - Ran: 001 to 771 (672 tests; gaps) - - Failures before changes: - Count: 15 - IDs: 075, 083, 091, 112, 127, 231, 263, - 269, 270, 363, 365, 645, 753, 759, - 760 - - Failures after changes: - Count: 13 - IDs: 075, 083, 091, 127, 263, 269, 270, - 363, 365, 645, 753, 759, 760 - - New successes after changes: - Count: 2 - IDs: 112, 231 - - No new failure after changes. - - XFS: - Ran: 001 to 789 (311 tests; gaps) - - Failures before changes: - Count: 7 - IDs: 104, 168, 300, 442, 597, 598, 609 - - Failures after changes: - Count: 7 - IDs: 104, 168, 300, 442, 597, 598, 609 - - No new success or failure after changes. - Thanks, Siddh -Dave Chinner (5): +Darrick J. Wong (7): + xfs: hoist recovered bmap intent checks out of xfs_bui_item_recover + xfs: improve the code that checks recovered bmap intent items + xfs: hoist recovered rmap intent checks out of xfs_rui_item_recover + xfs: improve the code that checks recovered rmap intent items + xfs: hoist recovered refcount intent checks out of + xfs_cui_item_recover + xfs: improve the code that checks recovered refcount intent items + xfs: fix intermittent hang during quotacheck + +Dave Chinner (11): + xfs: don't nest icloglock inside ic_callback_lock + xfs: convert XLOG_FORCED_SHUTDOWN() to xlog_is_shutdown() + xfs: log items should have a xlog pointer, not a mount + xfs: aborting inodes on shutdown may need buffer lock + xfs: remove xfs_buf_t typedef + xfs: buffer pins need to hold a buffer reference xfs: xfs_ifree_cluster vs xfs_iflush_shutdown_abort deadlock xfs: catch stale AGF/AGF metadata xfs: rearrange code in xfs_buf_item.c xfs: factor out stale buffer item completion xfs: fix unmount hang with unflushable inodes stuck in the AIL - fs/xfs/libxfs/xfs_alloc.c | 46 ++++-- - fs/xfs/libxfs/xfs_ialloc.c | 32 +++- - fs/xfs/xfs_buf_item.c | 299 ++++++++++++++++++++++--------------- - fs/xfs/xfs_buf_item.h | 3 +- - fs/xfs/xfs_icache.c | 8 + - fs/xfs/xfs_inode.c | 2 +- - 6 files changed, 256 insertions(+), 134 deletions(-) +Guo Xuenan (1): + xfs: fix super block buf log item UAF during force shutdown + + fs/xfs/libxfs/xfs_alloc.c | 61 ++++-- + fs/xfs/libxfs/xfs_bmap.c | 6 +- + fs/xfs/libxfs/xfs_btree.c | 10 +- + fs/xfs/libxfs/xfs_ialloc.c | 38 +++- + fs/xfs/libxfs/xfs_rtbitmap.c | 22 +- + fs/xfs/xfs_bmap_item.c | 76 ++++--- + fs/xfs/xfs_buf.c | 24 +-- + fs/xfs/xfs_buf.h | 14 +- + fs/xfs/xfs_buf_item.c | 384 ++++++++++++++++++++++------------- + fs/xfs/xfs_buf_item.h | 3 +- + fs/xfs/xfs_dquot_item.c | 5 +- + fs/xfs/xfs_extfree_item.c | 2 +- + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_icache.c | 10 +- + fs/xfs/xfs_inode.c | 9 +- + fs/xfs/xfs_inode_item.c | 164 ++++++++++++--- + fs/xfs/xfs_inode_item.h | 1 + + fs/xfs/xfs_log.c | 50 ++--- + fs/xfs/xfs_log_cil.c | 12 +- + fs/xfs/xfs_log_priv.h | 7 +- + fs/xfs/xfs_log_recover.c | 17 +- + fs/xfs/xfs_qm.c | 7 + + fs/xfs/xfs_refcount_item.c | 60 ++++-- + fs/xfs/xfs_rmap_item.c | 75 ++++--- + fs/xfs/xfs_rtalloc.c | 20 +- + fs/xfs/xfs_rtalloc.h | 4 +- + fs/xfs/xfs_symlink.c | 4 +- + fs/xfs/xfs_trace.h | 4 +- + fs/xfs/xfs_trans.c | 6 +- + fs/xfs/xfs_trans.h | 3 +- + fs/xfs/xfs_trans_buf.c | 16 +- + 31 files changed, 723 insertions(+), 393 deletions(-) -- 2.53.0 diff --git a/a/content_digest b/N2/content_digest index 4f4a0e9..3841b06 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\02026-10-01-1-daily-reply-0012-re-xfs-umount-hang-backports@kernel.org\0" "From\0Siddh Raman Pant <siddh.raman.pant@oracle.com>\0" - "Subject\0[PATCH 6.1 v2 0/5] Backport of XFS umount hang fixes\0" - "Date\0Tue, 13 Oct 2026 13:43:44 +0530\0" + "Subject\0[PATCH 5.10 v2 00/19] Backport of XFS umount hang fixes\0" + "Date\0Tue, 13 Oct 2026 13:44:44 +0530\0" "To\0Darrick J . Wong <djwong@kernel.org>" linux-xfs@vger.kernel.org " stable@vger.kernel.org\0" @@ -18,59 +18,69 @@ "v2: Address Sasha's comments to v1 in the below mail:\n" "https://lore.kernel.org/stable/2026-10-01-1-daily-reply-0012-re-xfs-umount-hang-backports@kernel.org/\n" "\n" - "xfstests_xfs testing results:\n" - "\tGeneric:\n" - "\t\tRan: 001 to 771 (672 tests; gaps)\n" - "\n" - "\t\tFailures before changes:\n" - "\t\t\tCount: 15\n" - "\t\t\tIDs: 075, 083, 091, 112, 127, 231, 263,\n" - "\t\t\t 269, 270, 363, 365, 645, 753, 759,\n" - "\t\t\t 760\n" - "\n" - "\t\tFailures after changes:\n" - "\t\t\tCount: 13\n" - "\t\t\tIDs: 075, 083, 091, 127, 263, 269, 270,\n" - "\t\t\t 363, 365, 645, 753, 759, 760\n" - "\n" - "\t\tNew successes after changes:\n" - "\t\t\tCount: 2\n" - "\t\t\tIDs: 112, 231\n" - "\n" - "\t\tNo new failure after changes.\n" - "\n" - "\tXFS:\n" - "\t\tRan: 001 to 789 (311 tests; gaps)\n" - "\n" - "\t\tFailures before changes:\n" - "\t\t\tCount: 7\n" - "\t\t\tIDs: 104, 168, 300, 442, 597, 598, 609\n" - "\n" - "\t\tFailures after changes:\n" - "\t\t\tCount: 7\n" - "\t\t\tIDs: 104, 168, 300, 442, 597, 598, 609\n" - "\n" - "\t\tNo new success or failure after changes.\n" - "\n" "Thanks,\n" "Siddh\n" "\n" - "Dave Chinner (5):\n" + "Darrick J. Wong (7):\n" + " xfs: hoist recovered bmap intent checks out of xfs_bui_item_recover\n" + " xfs: improve the code that checks recovered bmap intent items\n" + " xfs: hoist recovered rmap intent checks out of xfs_rui_item_recover\n" + " xfs: improve the code that checks recovered rmap intent items\n" + " xfs: hoist recovered refcount intent checks out of\n" + " xfs_cui_item_recover\n" + " xfs: improve the code that checks recovered refcount intent items\n" + " xfs: fix intermittent hang during quotacheck\n" + "\n" + "Dave Chinner (11):\n" + " xfs: don't nest icloglock inside ic_callback_lock\n" + " xfs: convert XLOG_FORCED_SHUTDOWN() to xlog_is_shutdown()\n" + " xfs: log items should have a xlog pointer, not a mount\n" + " xfs: aborting inodes on shutdown may need buffer lock\n" + " xfs: remove xfs_buf_t typedef\n" + " xfs: buffer pins need to hold a buffer reference\n" " xfs: xfs_ifree_cluster vs xfs_iflush_shutdown_abort deadlock\n" " xfs: catch stale AGF/AGF metadata\n" " xfs: rearrange code in xfs_buf_item.c\n" " xfs: factor out stale buffer item completion\n" " xfs: fix unmount hang with unflushable inodes stuck in the AIL\n" "\n" - " fs/xfs/libxfs/xfs_alloc.c | 46 ++++--\n" - " fs/xfs/libxfs/xfs_ialloc.c | 32 +++-\n" - " fs/xfs/xfs_buf_item.c | 299 ++++++++++++++++++++++---------------\n" - " fs/xfs/xfs_buf_item.h | 3 +-\n" - " fs/xfs/xfs_icache.c | 8 +\n" - " fs/xfs/xfs_inode.c | 2 +-\n" - " 6 files changed, 256 insertions(+), 134 deletions(-)\n" + "Guo Xuenan (1):\n" + " xfs: fix super block buf log item UAF during force shutdown\n" + "\n" + " fs/xfs/libxfs/xfs_alloc.c | 61 ++++--\n" + " fs/xfs/libxfs/xfs_bmap.c | 6 +-\n" + " fs/xfs/libxfs/xfs_btree.c | 10 +-\n" + " fs/xfs/libxfs/xfs_ialloc.c | 38 +++-\n" + " fs/xfs/libxfs/xfs_rtbitmap.c | 22 +-\n" + " fs/xfs/xfs_bmap_item.c | 76 ++++---\n" + " fs/xfs/xfs_buf.c | 24 +--\n" + " fs/xfs/xfs_buf.h | 14 +-\n" + " fs/xfs/xfs_buf_item.c | 384 ++++++++++++++++++++++-------------\n" + " fs/xfs/xfs_buf_item.h | 3 +-\n" + " fs/xfs/xfs_dquot_item.c | 5 +-\n" + " fs/xfs/xfs_extfree_item.c | 2 +-\n" + " fs/xfs/xfs_fsops.c | 2 +-\n" + " fs/xfs/xfs_icache.c | 10 +-\n" + " fs/xfs/xfs_inode.c | 9 +-\n" + " fs/xfs/xfs_inode_item.c | 164 ++++++++++++---\n" + " fs/xfs/xfs_inode_item.h | 1 +\n" + " fs/xfs/xfs_log.c | 50 ++---\n" + " fs/xfs/xfs_log_cil.c | 12 +-\n" + " fs/xfs/xfs_log_priv.h | 7 +-\n" + " fs/xfs/xfs_log_recover.c | 17 +-\n" + " fs/xfs/xfs_qm.c | 7 +\n" + " fs/xfs/xfs_refcount_item.c | 60 ++++--\n" + " fs/xfs/xfs_rmap_item.c | 75 ++++---\n" + " fs/xfs/xfs_rtalloc.c | 20 +-\n" + " fs/xfs/xfs_rtalloc.h | 4 +-\n" + " fs/xfs/xfs_symlink.c | 4 +-\n" + " fs/xfs/xfs_trace.h | 4 +-\n" + " fs/xfs/xfs_trans.c | 6 +-\n" + " fs/xfs/xfs_trans.h | 3 +-\n" + " fs/xfs/xfs_trans_buf.c | 16 +-\n" + " 31 files changed, 723 insertions(+), 393 deletions(-)\n" "\n" "-- \n" 2.53.0 -681dc2ed709a0067c4e10d1799947fabddb4c354cbd90e4a68480b50fae6fa6d +1327606b67f55983b180d6dbf2183da72fed819fedb6125dcc9e2675af922d21
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox