xfs: don't commit sunit/swidth updates to disk if that would cause repair failures
PATCH v3 1/1 xfs: don't commit sunit/swidth updates to disk if that would cause repair failures
From: Darrick J. Wong <[email protected]>
Alex Lyakas reported[1] that mounting an xfs filesystem with new sunit and swidth values could cause xfs_repair to fail loudly. The problem here is that repair calculates the where mkfs should have allocated the root inode, based on the superblock geometry. The allocation decisions depend on sunit, which means that we really can't go updating sunit if it would lead to a subsequent repair failure on an otherwise correct filesystem.
Port the computation code from xfs_repair and teach mount to avoid the ondisk update if it would cause problems for repair. We allow the mount to proceed (and new allocations will reflect this new geometry) because we've never screened this kind of thing before.
---
v3: actually check the alignment check function return value
v2: v2: refactor the agfl length calculations, clarify the fsgeometry ioctl behavior, fix a bunch of the comments and make it clearer how we compute the rootino location
--- fs/xfs/libxfs/xfs_alloc.c | 18 ++++++-- fs/xfs/libxfs/xfs_ialloc.c | 70 +++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_ialloc.h | 1 fs/xfs/xfs_mount.c | 99 +++++++++++++++++++++++++++++++------------- fs/xfs/xfs_trace.h | 21 +++++++++ 5 files changed, 175 insertions(+), 34 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +13 -5
@@ -2248,24 +2248,32 @@ xfs_alloc_longest_free_extent(return pag->pagf_flcount >0 || pag->pagf_longest >0 ; } +/* +* Compute the minimum length of the AGFL in the given AG. If @pag is NULL, +* return the largest possible minimum length. +*/ unsigned int xfs_alloc_min_freelist (struct xfs_mount *mp,struct xfs_perag *pag) { +/* AG btrees have at least 1 level. */ +static const uint8_t fake_levels[XFS_BTNUM_AGF ] = {1 ,1 ,1 }; +const uint8_t *levels = pag ? pag->pagf_levels : fake_levels;unsigned int min_free; +ASSERT (mp->m_ag_maxlevels >0 ); +/* space needed by-bno freespace btree */ - min_free = min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_BNOi] + 1, + min_free = min_t(unsigned int, levels[XFS_BTNUM_BNOi] + 1, mp->m_ag_maxlevels);/* space needed by-size freespace btree */ - min_free += min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_CNTi] + 1, + min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1, mp->m_ag_maxlevels);/* space needed reverse mapping used space btree */ if (xfs_sb_version_hasrmapbt (&mp->m_sb)) - min_free += min_t(unsigned int, - pag->pagf_levels[XFS_BTNUM_RMAPi] +1 , - mp->m_rmap_maxlevels); + min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1, + mp->m_rmap_maxlevels);return min_free; }
fs/xfs/libxfs/xfs_ialloc.c +70 -0
73 lines not on this page · raw message
fs/xfs/libxfs/xfs_ialloc.h +1 -0
@@ -152,5 +152,6 @@ int xfs_inobt_insert_rec(struct xfs_btree_cur *cur, uint16_t holemask,int xfs_ialloc_cluster_alignment (struct xfs_mount *mp);void xfs_ialloc_setup_geometry (struct xfs_mount *mp); +xfs_ino_t xfs_ialloc_calc_rootino (struct xfs_mount *mp,int sunit);#endif /* __XFS_IALLOC_H__ */
fs/xfs/xfs_mount.c +70 -29
142 lines not on this page · raw message
fs/xfs/xfs_trace.h +21 -0
@@ -3573,6 +3573,27 @@ DEFINE_KMEM_EVENT(kmem_alloc_large);DEFINE_KMEM_EVENT (kmem_realloc);DEFINE_KMEM_EVENT (kmem_zone_alloc); +TRACE_EVENT (xfs_check_new_dalign, + TP_PROTO(struct xfs_mount *mp, int new_dalign, xfs_ino_t calc_rootino), +TP_ARGS (mp, new_dalign, calc_rootino), +TP_STRUCT__entry ( + __field(dev_t, dev) + __field(int, new_dalign) + __field(xfs_ino_t, sb_rootino) +__field (xfs_ino_t, calc_rootino) + ), +TP_fast_assign ( + __entry->dev = mp->m_super->s_dev; + __entry->new_dalign = new_dalign; + __entry->sb_rootino = mp->m_sb.sb_rootino; + __entry->calc_rootino = calc_rootino; + ), +TP_printk ("dev %d:%d new_dalign %d sb_rootino %llu calc_rootino %llu" , +MAJOR (__entry->dev),MINOR (__entry->dev), + __entry->new_dalign, __entry->sb_rootino, + __entry->calc_rootino) +) +#endif /* _TRACE_XFS_H */ #undef TRACE_INCLUDE_PATH
Quoted 32 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Alex Lyakas reported[1] that mounting an xfs filesystem with new sunit and swidth values could cause
xfs_repairto fail loudly. The problem here is that repair calculates the where mkfs should have allocated the root inode, based on the superblock geometry. The allocation decisions depend on sunit, which means that we really can't go updating sunit if it would lead to a subsequent repair failure on an otherwise correct filesystem.Port the computation code from
xfs_repairand teach mount to avoid the ondisk update if it would cause problems for repair. We allow the mount to proceed (and new allocations will reflect this new geometry) because we've never screened this kind of thing before.Reported-by Alex Lyakas <[email protected]>Signed-off-by Darrick J. Wong <[email protected]>---
v3: actually check the alignment check function return value
v2: v2: refactor the agfl length calculations, clarify the fsgeometry ioctl behavior, fix a bunch of the comments and make it clearer how we compute the rootino location--- fs/xfs/libxfs/xfs_alloc.c | 18 ++++++-- fs/xfs/libxfs/xfs_ialloc.c | 70 +++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_ialloc.h | 1 fs/xfs/xfs_mount.c | 99 +++++++++++++++++++++++++++++++------------- fs/xfs/xfs_trace.h | 21 +++++++++ 5 files changed, 175 insertions(+), 34 deletions(-)
...
Quoted 49 lines
fs/xfs/libxfs/xfs_ialloc.c +41
-0@@ -2909,3 +2909,73 @@ xfs_ialloc_setup_geometry(else igeo->ialloc_align =0 ; } + +/* +* Compute the location of the root directory inode that is laid out by mkfs. +* The @sunit parameter will be copied from the superblock if it is negative. +*/ +xfs_ino_t +xfs_ialloc_calc_rootino ( +struct xfs_mount *mp, +int sunit) +{ +struct xfs_ino_geometry *igeo =M_IGEO (mp); +xfs_agblock_t first_bno; + +if (sunit <0 ) + sunit = mp->m_sb.sb_unit; + +/* +* Pre-calculate the geometry of AG 0. We know what it looks like +* because libxfs knows how to create allocation groups now. +* +* first_bno is the first block in which mkfs could possibly have +* allocated the root directory inode, once we factor in the metadata +* that mkfs formats before it. Namely, the four AG headers... +*/ + first_bno =howmany (4 * mp->m_sb.sb_sectsize, mp->m_sb.sb_blocksize); + +/* ...the two free space btree roots... */ + first_bno +=2 ; + +/* ...the inode btree root... */ + first_bno +=1 ; + +/* ...the initial AGFL... */ + first_bno +=xfs_alloc_min_freelist (mp,NULL ); + +/* ...the free inode btree root... */ +if (xfs_sb_version_hasfinobt (&mp->m_sb)) + first_bno++; + +/* ...the reverse mapping btree root... */ +if (xfs_sb_version_hasrmapbt (&mp->m_sb))
fs/xfs/libxfs/xfs_ialloc.c xfs_ialloc_setup_geometry( · line 2962
Quoted 10 lines
fs/xfs/libxfs/xfs_ialloc.c +10
-0+ first_bno++; + +/* ...the reference count btree... */ +if (xfs_sb_version_hasreflink (&mp->m_sb)) + first_bno++; + +/* +* ...and the log, if it is allocated in the first allocation group. +* +* This can happens with filesystems that only have a single
s/happens/happen/
Quoted 23 lines
fs/xfs/libxfs/xfs_ialloc.c +19
-0+* allocation group, or very odd geometries created by old mkfs +* versions on very small filesystems. +*/ +if (mp->m_sb.sb_logstart && +XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart) ==0 ) + first_bno += mp->m_sb.sb_logblocks; + +/* +* Now round first_bno up to whatever allocation alignment is given +* by the filesystem or was passed in. +*/ +if (xfs_sb_version_hasdalign (&mp->m_sb) && igeo->ialloc_align >0 ) + first_bno =roundup (first_bno, sunit); +else if (xfs_sb_version_hasalign (&mp->m_sb) && + mp->m_sb.sb_inoalignmt >1 ) + first_bno =roundup (first_bno, mp->m_sb.sb_inoalignmt); + +return XFS_AGINO_TO_INO (mp,0 ,XFS_AGB_TO_AGINO (mp, first_bno)); +}fs/xfs/libxfs/xfs_ialloc.h +0
-0
...
Quoted 29 lines
fs/xfs/libxfs/xfs_ialloc.h +25
-0@@ -359,15 +359,55 @@ xfs_readsb(return error; } +/* +* If the sunit/swidth change would move the precomputed root inode value, we +* must reject the ondisk change because repair will stumble over that. +* However, we allow the mount to proceed because we never rejected this +* combination before. Returns true to update the sb, false otherwise. +*/ +static inline int +xfs_check_new_dalign ( +struct xfs_mount *mp, +int new_dalign, +bool *update_sb) +{ +struct xfs_sb *sbp = &mp->m_sb; +xfs_ino_t calc_ino; + + calc_ino =xfs_ialloc_calc_rootino (mp, new_dalign); +trace_xfs_check_new_dalign (mp, new_dalign, calc_ino); + +if (sbp->sb_rootino == calc_ino) { + *update_sb = true; +return 0 ; + } + +xfs_warn (mp, +"Cannot change stripe alignment; would require moving root inode." );
fs/xfs/libxfs/xfs_ialloc.h xfs_readsb( · line 396
Quoted 10 lines
fs/xfs/libxfs/xfs_ialloc.h +10
-0+ +/* +* XXX: Next time we add a new incompat feature, this should start +* returning -EINVAL to fail the mount. Until then, spit out a warning +* that we're ignoring the administrator's instructions. +*/ +xfs_warn (mp,"Skipping superblock stripe alignment update." ); + *update_sb = false; +return 0 ; +}
I ran a quick test changing swidth (not sunit) and otherwise using mkfs defaults:
[root@localhost ~]# mkfs.xfs -f /dev/test/scratch -dsunit=8,swidth=8
meta-data=/dev/test/scratch isize=512 agcount=16, agsize=245760 blks
= sectsz=512 attr=2, projid32bit=1
= crc=1 finobt=1, sparse=1, rmapbt=0
= reflink=1
data = bsize=4096 blocks=3932160, imaxpct=25
= sunit=1 swidth=1 blks
naming =version 2 bsize=4096 ascii-ci=0, ftype=1
log =internal log bsize=4096 blocks=2560, version=2
= sectsz=512 sunit=1 blks, lazy-count=1
realtime =none extsz=4096 blocks=0, rtextents=0[root@localhost ~]# mount /dev/test/scratch /mnt/ [root@localhost ~]# stat -c %i /mnt/
128
[root@localhost ~]# umount /mnt/
[root@localhost ~]# mount /dev/test/scratch /mnt/ -o sunit=8,swidth=16
I see the following trace output on the mount above, which suggests this would have moved rootino:
<...>-1007 [002] ...1 516.719543: xfs_check_new_dalign: dev 253:4 new_dalign 1 sb_rootino 128 calc_rootino 80
But if I start with that geometry, that's not what I see from mkfs:
[root@localhost ~]# mkfs.xfs -f /dev/test/scratch -dsunit=8,swidth=16
meta-data=/dev/test/scratch isize=512 agcount=16, agsize=245759 blks
= sectsz=512 attr=2, projid32bit=1
= crc=1 finobt=1, sparse=1, rmapbt=0
= reflink=1
data = bsize=4096 blocks=3932144, imaxpct=25
= sunit=1 swidth=2 blks
naming =version 2 bsize=4096 ascii-ci=0, ftype=1
log =internal log bsize=4096 blocks=2560, version=2
= sectsz=512 sunit=1 blks, lazy-count=1
realtime =none extsz=4096 blocks=0, rtextents=0[root@localhost ~]# mount /dev/test/scratch /mnt/
[root@localhost ~]# stat -c %i /mnt/
128
I did notice the AG size changes slightly in the second mkfs, but it doesn't seem to make a difference if I set it back to the original value. Hm?
BTW, given the subtle effect of this patch and potential for varying behavior, I wonder if we should have an fstest to format with some different alignments and make sure mount DTRT in various cases.
Brian
Quoted 132 lines
fs/xfs/libxfs/xfs_ialloc.h +34
-28+/* * Update alignment values based on mount options and sb values */ STATIC int -xfs_update_alignment (xfs_mount_t *mp) +xfs_update_alignment ( +struct xfs_mount *mp) { -xfs_sb_t *sbp = &(mp->m_sb); +struct xfs_sb *sbp = &mp->m_sb;if (mp->m_dalign) { +bool update_sb; +int error; +/* * If stripe unit and stripe width are not multiples * of the fs blocksize turn off alignment. @@ -398,28 +438,28 @@ xfs_update_alignment(xfs_mount_t *mp) } } -/* -* Update superblock with new values -* and log changes -*/ -if (xfs_sb_version_hasdalign (sbp)) { -if (sbp->sb_unit != mp->m_dalign) { - sbp->sb_unit = mp->m_dalign; - mp->m_update_sb = true; - } -if (sbp->sb_width != mp->m_swidth) { - sbp->sb_width = mp->m_swidth; - mp->m_update_sb = true; - } - }else { +/* Update superblock with new values and log changes. */ +if (!xfs_sb_version_hasdalign (sbp)) {xfs_warn (mp,"cannot change alignment: superblock does not support data alignment" );return -EINVAL ; } + +if (sbp->sb_unit == mp->m_dalign && + sbp->sb_width == mp->m_swidth) +return 0 ; + + error =xfs_check_new_dalign (mp, mp->m_dalign, &update_sb); +if (error || !update_sb) +return error; + + sbp->sb_unit = mp->m_dalign; + sbp->sb_width = mp->m_swidth; + mp->m_update_sb = true; }else if ((mp->m_flags &XFS_MOUNT_NOALIGN ) !=XFS_MOUNT_NOALIGN &&xfs_sb_version_hasdalign (&mp->m_sb)) { - mp->m_dalign = sbp->sb_unit; - mp->m_swidth = sbp->sb_width; + mp->m_dalign = sbp->sb_unit; + mp->m_swidth = sbp->sb_width; }return 0 ;@@ -647,16 +687,6 @@ xfs_mountfs( mp->m_update_sb = true; } -/* -* Check if sb_agblocks is aligned at stripe boundary -* If sb_agblocks is NOT aligned turn off m_dalign since -* allocator alignment is within an ag, therefore ag has -* to be aligned at stripe boundary. -*/ - error =xfs_update_alignment (mp); -if (error) - goto out; -xfs_alloc_compute_maxlevels (mp);xfs_bmap_compute_maxlevels (mp,XFS_DATA_FORK );xfs_bmap_compute_maxlevels (mp,XFS_ATTR_FORK );@@ -664,6 +694,17 @@ xfs_mountfs(xfs_rmapbt_compute_maxlevels (mp);xfs_refcountbt_compute_maxlevels (mp); +/* +* Check if sb_agblocks is aligned at stripe boundary. If sb_agblocks +* is NOT aligned turn off m_dalign since allocator alignment is within +* an ag, therefore ag has to be aligned at stripe boundary. Note that +* we must compute the free space and rmap btree geometry before doing +* this. +*/ + error =xfs_update_alignment (mp); +if (error) + goto out; +/* enable fail_at_unmount as default */ mp->m_fail_unmount = true;fs/xfs/xfs_trace.h +21
-0@@ -3573,6 +3573,27 @@ DEFINE_KMEM_EVENT(kmem_alloc_large);DEFINE_KMEM_EVENT (kmem_realloc);DEFINE_KMEM_EVENT (kmem_zone_alloc); +TRACE_EVENT (xfs_check_new_dalign, + TP_PROTO(struct xfs_mount *mp, int new_dalign, xfs_ino_t calc_rootino), +TP_ARGS (mp, new_dalign, calc_rootino), +TP_STRUCT__entry ( + __field(dev_t, dev) + __field(int, new_dalign) + __field(xfs_ino_t, sb_rootino) +__field (xfs_ino_t, calc_rootino) + ), +TP_fast_assign ( + __entry->dev = mp->m_super->s_dev; + __entry->new_dalign = new_dalign; + __entry->sb_rootino = mp->m_sb.sb_rootino; + __entry->calc_rootino = calc_rootino; + ), +TP_printk ("dev %d:%d new_dalign %d sb_rootino %llu calc_rootino %llu" , +MAJOR (__entry->dev),MINOR (__entry->dev), + __entry->new_dalign, __entry->sb_rootino, + __entry->calc_rootino) +) +#endif /* _TRACE_XFS_H */ #undef TRACE_INCLUDE_PATH
Quoted 87 lines · Brian Foster
Quoted 32 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Alex Lyakas reported[1] that mounting an xfs filesystem with new sunit and swidth values could cause
xfs_repairto fail loudly. The problem here is that repair calculates the where mkfs should have allocated the root inode, based on the superblock geometry. The allocation decisions depend on sunit, which means that we really can't go updating sunit if it would lead to a subsequent repair failure on an otherwise correct filesystem.Port the computation code from
xfs_repairand teach mount to avoid the ondisk update if it would cause problems for repair. We allow the mount to proceed (and new allocations will reflect this new geometry) because we've never screened this kind of thing before.Reported-by Alex Lyakas <[email protected]>Signed-off-by Darrick J. Wong <[email protected]>---
v3: actually check the alignment check function return value
v2: v2: refactor the agfl length calculations, clarify the fsgeometry ioctl behavior, fix a bunch of the comments and make it clearer how we compute the rootino location--- fs/xfs/libxfs/xfs_alloc.c | 18 ++++++-- fs/xfs/libxfs/xfs_ialloc.c | 70 +++++++++++++++++++++++++++++++ fs/xfs/libxfs/xfs_ialloc.h | 1 fs/xfs/xfs_mount.c | 99 +++++++++++++++++++++++++++++++------------- fs/xfs/xfs_trace.h | 21 +++++++++ 5 files changed, 175 insertions(+), 34 deletions(-)...
Quoted 53 lines
fs/xfs/libxfs/xfs_ialloc.c +45
-0@@ -2909,3 +2909,73 @@ xfs_ialloc_setup_geometry(else igeo->ialloc_align =0 ; } + +/* +* Compute the location of the root directory inode that is laid out by mkfs. +* The @sunit parameter will be copied from the superblock if it is negative. +*/ +xfs_ino_t +xfs_ialloc_calc_rootino ( +struct xfs_mount *mp, +int sunit) +{ +struct xfs_ino_geometry *igeo =M_IGEO (mp); +xfs_agblock_t first_bno; + +if (sunit <0 ) + sunit = mp->m_sb.sb_unit; + +/* +* Pre-calculate the geometry of AG 0. We know what it looks like +* because libxfs knows how to create allocation groups now. +* +* first_bno is the first block in which mkfs could possibly have +* allocated the root directory inode, once we factor in the metadata +* that mkfs formats before it. Namely, the four AG headers... +*/ + first_bno =howmany (4 * mp->m_sb.sb_sectsize, mp->m_sb.sb_blocksize); + +/* ...the two free space btree roots... */ + first_bno +=2 ; + +/* ...the inode btree root... */ + first_bno +=1 ; + +/* ...the initial AGFL... */ + first_bno +=xfs_alloc_min_freelist (mp,NULL ); + +/* ...the free inode btree root... */ +if (xfs_sb_version_hasfinobt (&mp->m_sb)) + first_bno++; + +/* ...the reverse mapping btree root... */ +if (xfs_sb_version_hasrmapbt (&mp->m_sb)) + first_bno++; + +/* ...the reference count btree... */ +if (xfs_sb_version_hasreflink (&mp->m_sb))
Quoted 8 lines
fs/xfs/libxfs/xfs_ialloc.c xfs_ialloc_setup_geometry( · line 2962
Quoted 6 lines
fs/xfs/libxfs/xfs_ialloc.c +6
-0+ first_bno++; + +/* +* ...and the log, if it is allocated in the first allocation group. +* +* This can happens with filesystems that only have a single s/happens/happen/
Fixed, thanks.
Quoted 102 lines
Quoted 23 lines
fs/xfs/libxfs/xfs_ialloc.c +19
-0+* allocation group, or very odd geometries created by old mkfs +* versions on very small filesystems. +*/ +if (mp->m_sb.sb_logstart && +XFS_FSB_TO_AGNO (mp, mp->m_sb.sb_logstart) ==0 ) + first_bno += mp->m_sb.sb_logblocks; + +/* +* Now round first_bno up to whatever allocation alignment is given +* by the filesystem or was passed in. +*/ +if (xfs_sb_version_hasdalign (&mp->m_sb) && igeo->ialloc_align >0 ) + first_bno =roundup (first_bno, sunit); +else if (xfs_sb_version_hasalign (&mp->m_sb) && + mp->m_sb.sb_inoalignmt >1 ) + first_bno =roundup (first_bno, mp->m_sb.sb_inoalignmt); + +return XFS_AGINO_TO_INO (mp,0 ,XFS_AGB_TO_AGINO (mp, first_bno)); +}fs/xfs/libxfs/xfs_ialloc.h +0
-0...
Quoted 29 lines
fs/xfs/libxfs/xfs_ialloc.h +25
-0@@ -359,15 +359,55 @@ xfs_readsb(return error; } +/* +* If the sunit/swidth change would move the precomputed root inode value, we +* must reject the ondisk change because repair will stumble over that. +* However, we allow the mount to proceed because we never rejected this +* combination before. Returns true to update the sb, false otherwise. +*/ +static inline int +xfs_check_new_dalign ( +struct xfs_mount *mp, +int new_dalign, +bool *update_sb) +{ +struct xfs_sb *sbp = &mp->m_sb; +xfs_ino_t calc_ino; + + calc_ino =xfs_ialloc_calc_rootino (mp, new_dalign); +trace_xfs_check_new_dalign (mp, new_dalign, calc_ino); + +if (sbp->sb_rootino == calc_ino) { + *update_sb = true; +return 0 ; + } + +xfs_warn (mp, +"Cannot change stripe alignment; would require moving root inode." );fs/xfs/libxfs/xfs_ialloc.h xfs_readsb( · line 396
Quoted 10 lines
fs/xfs/libxfs/xfs_ialloc.h +10
-0+ +/* +* XXX: Next time we add a new incompat feature, this should start +* returning -EINVAL to fail the mount. Until then, spit out a warning +* that we're ignoring the administrator's instructions. +*/ +xfs_warn (mp,"Skipping superblock stripe alignment update." ); + *update_sb = false; +return 0 ; +}I ran a quick test changing swidth (not sunit) and otherwise using mkfs defaults:
[root@localhost ~]# mkfs.xfs -f
/dev/test/scratch-dsunit=8,swidth=8meta-data=/dev/test/scratch isize=512 agcount=16, agsize=245760 blks = sectsz=512 attr=2, projid32bit=1 = crc=1 finobt=1, sparse=1, rmapbt=0 = reflink=1 data = bsize=4096 blocks=3932160, imaxpct=25 = sunit=1 swidth=1 blks naming =version 2 bsize=4096 ascii-ci=0, ftype=1 log =internal log bsize=4096 blocks=2560, version=2 = sectsz=512 sunit=1 blks, lazy-count=1 realtime =none extsz=4096 blocks=0, rtextents=0[root@localhost ~]# mount
/dev/test/scratch/mnt/[root@localhost ~]# stat -c %i/mnt/
128
[root@localhost ~]# umount/mnt/
[root@localhost ~]# mount/dev/test/scratch/mnt/-o sunit=8,swidth=16I see the following trace output on the mount above, which suggests this would have moved rootino:
<...>-1007 [002] ...1 516.719543:
xfs_check_new_dalign: dev 253:4new_dalign1sb_rootino128calc_rootino80But if I start with that geometry, that's not what I see from mkfs:
[root@localhost ~]# mkfs.xfs -f
/dev/test/scratch-dsunit=8,swidth=16meta-data=/dev/test/scratch isize=512 agcount=16, agsize=245759 blks = sectsz=512 attr=2, projid32bit=1 = crc=1 finobt=1, sparse=1, rmapbt=0 = reflink=1 data = bsize=4096 blocks=3932144, imaxpct=25 = sunit=1 swidth=2 blks naming =version 2 bsize=4096 ascii-ci=0, ftype=1 log =internal log bsize=4096 blocks=2560, version=2 = sectsz=512 sunit=1 blks, lazy-count=1 realtime =none extsz=4096 blocks=0, rtextents=0
Quoted 7 lines
[root@localhost ~]# mount
/dev/test/scratch/mnt/
[root@localhost ~]# stat -c %i/mnt/
128I did notice the AG size changes slightly in the second mkfs, but it doesn't seem to make a difference if I set it back to the original value. Hm?
Aha, I discovered a bug in this patch -- the sunit mount option value has to be converted from BB to FSB before setting up the ialloc geometry. If the fs was formatted with a stripe unit of 1FSB the incorrect units being and'd with inoalign_mask would cause the ialloc geometry computation to set ialloc_align to zero, which would then make the calc_rootino function output wrong values.
Quoted 3 lines
BTW, given the subtle effect of this patch and potential for varying behavior, I wonder if we should have an fstest to format with some different alignments and make sure mount DTRT in various cases.
I /do/ have an fstest, but it didn't cover the su=1fsb case. I'll update it and send both v4 patch and test once this goes through fstests.
--D
Quoted 135 lines
Brian
Quoted 132 lines
fs/xfs/libxfs/xfs_ialloc.h +34
-28+/* * Update alignment values based on mount options and sb values */ STATIC int -xfs_update_alignment (xfs_mount_t *mp) +xfs_update_alignment ( +struct xfs_mount *mp) { -xfs_sb_t *sbp = &(mp->m_sb); +struct xfs_sb *sbp = &mp->m_sb;if (mp->m_dalign) { +bool update_sb; +int error; +/* * If stripe unit and stripe width are not multiples * of the fs blocksize turn off alignment. @@ -398,28 +438,28 @@ xfs_update_alignment(xfs_mount_t *mp) } } -/* -* Update superblock with new values -* and log changes -*/ -if (xfs_sb_version_hasdalign (sbp)) { -if (sbp->sb_unit != mp->m_dalign) { - sbp->sb_unit = mp->m_dalign; - mp->m_update_sb = true; - } -if (sbp->sb_width != mp->m_swidth) { - sbp->sb_width = mp->m_swidth; - mp->m_update_sb = true; - } - }else { +/* Update superblock with new values and log changes. */ +if (!xfs_sb_version_hasdalign (sbp)) {xfs_warn (mp,"cannot change alignment: superblock does not support data alignment" );return -EINVAL ; } + +if (sbp->sb_unit == mp->m_dalign && + sbp->sb_width == mp->m_swidth) +return 0 ; + + error =xfs_check_new_dalign (mp, mp->m_dalign, &update_sb); +if (error || !update_sb) +return error; + + sbp->sb_unit = mp->m_dalign; + sbp->sb_width = mp->m_swidth; + mp->m_update_sb = true; }else if ((mp->m_flags &XFS_MOUNT_NOALIGN ) !=XFS_MOUNT_NOALIGN &&xfs_sb_version_hasdalign (&mp->m_sb)) { - mp->m_dalign = sbp->sb_unit; - mp->m_swidth = sbp->sb_width; + mp->m_dalign = sbp->sb_unit; + mp->m_swidth = sbp->sb_width; }return 0 ;@@ -647,16 +687,6 @@ xfs_mountfs( mp->m_update_sb = true; } -/* -* Check if sb_agblocks is aligned at stripe boundary -* If sb_agblocks is NOT aligned turn off m_dalign since -* allocator alignment is within an ag, therefore ag has -* to be aligned at stripe boundary. -*/ - error =xfs_update_alignment (mp); -if (error) - goto out; -xfs_alloc_compute_maxlevels (mp);xfs_bmap_compute_maxlevels (mp,XFS_DATA_FORK );xfs_bmap_compute_maxlevels (mp,XFS_ATTR_FORK );@@ -664,6 +694,17 @@ xfs_mountfs(xfs_rmapbt_compute_maxlevels (mp);xfs_refcountbt_compute_maxlevels (mp); +/* +* Check if sb_agblocks is aligned at stripe boundary. If sb_agblocks +* is NOT aligned turn off m_dalign since allocator alignment is within +* an ag, therefore ag has to be aligned at stripe boundary. Note that +* we must compute the free space and rmap btree geometry before doing +* this. +*/ + error =xfs_update_alignment (mp); +if (error) + goto out; +/* enable fail_at_unmount as default */ mp->m_fail_unmount = true;fs/xfs/xfs_trace.h +21
-0@@ -3573,6 +3573,27 @@ DEFINE_KMEM_EVENT(kmem_alloc_large);DEFINE_KMEM_EVENT (kmem_realloc);DEFINE_KMEM_EVENT (kmem_zone_alloc); +TRACE_EVENT (xfs_check_new_dalign, + TP_PROTO(struct xfs_mount *mp, int new_dalign, xfs_ino_t calc_rootino), +TP_ARGS (mp, new_dalign, calc_rootino), +TP_STRUCT__entry ( + __field(dev_t, dev) + __field(int, new_dalign) + __field(xfs_ino_t, sb_rootino) +__field (xfs_ino_t, calc_rootino) + ), +TP_fast_assign ( + __entry->dev = mp->m_super->s_dev; + __entry->new_dalign = new_dalign; + __entry->sb_rootino = mp->m_sb.sb_rootino; + __entry->calc_rootino = calc_rootino; + ), +TP_printk ("dev %d:%d new_dalign %d sb_rootino %llu calc_rootino %llu" , +MAJOR (__entry->dev),MINOR (__entry->dev), + __entry->new_dalign, __entry->sb_rootino, + __entry->calc_rootino) +) +#endif /* _TRACE_XFS_H */ #undef TRACE_INCLUDE_PATH