From: Darrick J. Wong <djwong@xxxxxxxxxx> During the 6.7 merge window, Linus noticed that the realtime allocator was doing some sketchy things trying to encode a u64 sequence counter into the rtbitmap file's atime. The sketchy casting of a struct pointer to a u64 pointer has subtly broken several times over the past decade as the codebase has transitioned to using the VFS i_atime field and that field has changed in size and layout over time. Since the goal of the rtpick code is to _suggest_ a starting place for new rt file allocations, the repeated breakage has not resulted in inconsistent metadata. IOWs, it's a hint. For rtgroups, we don't need this complex code to cut the rtextents space into fractions. Add an rtgroup rotor and use that for rtpick, similar to AG rotoring on the data device. The new rotor does not persist, which reduces the logging overhead slightly. Link: https://lore.kernel.org/linux-xfs/CAHk-=wj3oM3d-Hw2vvxys3KCZ9De+gBN7Gxr2jf96OTisL9udw@xxxxxxxxxxxxxx/ Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- include/xfs_mount.h | 1 + libxfs/xfs_rtbitmap.c | 12 ++++++++---- mkfs/proto.c | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/xfs_mount.h b/include/xfs_mount.h index ecee4ccc0b7..a2fdd7c2f14 100644 --- a/include/xfs_mount.h +++ b/include/xfs_mount.h @@ -52,6 +52,7 @@ typedef struct xfs_mount { char *m_fsname; /* filesystem name */ int m_bsize; /* fs logical block size */ spinlock_t m_agirotor_lock; + xfs_rgnumber_t m_rtgrotor; /* last rtgroup rtpicked */ xfs_agnumber_t m_agfrotor; /* last ag where space found */ xfs_agnumber_t m_agirotor; /* last ag dir inode alloced */ xfs_agnumber_t m_maxagi; /* highest inode alloc group */ diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c index 7be1c0bdbea..7d29a72be6b 100644 --- a/libxfs/xfs_rtbitmap.c +++ b/libxfs/xfs_rtbitmap.c @@ -1060,10 +1060,14 @@ xfs_rtfree_extent( if (!(mp->m_rbmip->i_diflags & XFS_DIFLAG_NEWRTBM)) mp->m_rbmip->i_diflags |= XFS_DIFLAG_NEWRTBM; - atime = inode_get_atime(VFS_I(mp->m_rbmip)); - atime.tv_sec = 0; - inode_set_atime_to_ts(VFS_I(mp->m_rbmip), atime); - xfs_trans_log_inode(tp, mp->m_rbmip, XFS_ILOG_CORE); + if (xfs_has_rtgroups(mp)) { + mp->m_rtgrotor = 0; + } else { + atime = inode_get_atime(VFS_I(mp->m_rbmip)); + atime.tv_sec = 0; + inode_set_atime_to_ts(VFS_I(mp->m_rbmip), atime); + xfs_trans_log_inode(tp, mp->m_rbmip, XFS_ILOG_CORE); + } } error = 0; out: diff --git a/mkfs/proto.c b/mkfs/proto.c index 33d454cffb2..36df148018f 100644 --- a/mkfs/proto.c +++ b/mkfs/proto.c @@ -810,7 +810,8 @@ rtbitmap_create( rbmip->i_disk_size = mp->m_sb.sb_rbmblocks * mp->m_sb.sb_blocksize; rbmip->i_diflags |= XFS_DIFLAG_NEWRTBM; - inode_set_atime(VFS_I(rbmip), 0, 0); + if (!xfs_has_rtgroups(mp)) + inode_set_atime(VFS_I(rbmip), 0, 0); libxfs_trans_log_inode(upd.tp, rbmip, XFS_ILOG_CORE); error = -libxfs_imeta_commit_update(&upd);
