xfsprogs: consolidate stripe validation
v5 cover xfsprogs: consolidate stripe validation
v4: https://lore.kernel.org/r/[email protected]
Hi,
This is another approach suggested by Eric in the reply of v3 (if I understand correctly), which also attempts to use i18n-enabled xfsprogs xfs_notice() to error out sanity check failure suggested by Dave on IRC.
kernel side of [PATCH 2/3]
https://lore.kernel.org/r/[email protected]
Thanks,
Gao Xiang
Changes since v4:
- [2/3] stretch columns for commit message (Darrick);
- [2/3] add a comment to hasdalign check (Darrick);
- [2/3] break old sunit / swidth != 0 check into two
seperate checks (Darrick);
- [2/3] update an error message description (Darrick);
- [2/3] use bytes for sunit / swidth representation, so users can see values in the unique unit.
- [3/3] introduce a userspace wrapper libxfs_validate_stripe_factors (Darrick).
Gao Xiang (3):
libxfs: allow i18n to xfs printk
xfs: introduce xfs_validate_stripe_factors()
mkfs: make use of xfs_validate_stripe_factors()
libxfs/libxfs_api_defs.h | 1 + libxfs/libxfs_priv.h | 8 ++--- libxfs/xfs_sb.c | 65 +++++++++++++++++++++++++++++++++------- libxfs/xfs_sb.h | 3 ++ mkfs/xfs_mkfs.c | 23 +++++--------- 5 files changed, 69 insertions(+), 31 deletions(-)
Signature · 1 line
2.18.1
PATCH v5 1/3 libxfs: allow i18n to xfs printk
In preparation to a common stripe validation helper, allow i18n to xfs_{notice,warn,err,alert} so xfsprogs can share code with kernel.
--- libxfs/libxfs_priv.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
libxfs/libxfs_priv.h +4 -4
@@ -121,10 +121,10 @@ extern char *progname;extern void cmn_err (int ,char *, ...);enum ce {CE_DEBUG ,CE_CONT ,CE_NOTE ,CE_WARN ,CE_ALERT ,CE_PANIC }; -#define xfs_notice(mp,fmt,args...) cmn_err(CE_NOTE,fmt, ## args) -#define xfs_warn(mp,fmt,args...) cmn_err(CE_WARN,fmt, ## args) -#define xfs_err(mp,fmt,args...) cmn_err(CE_ALERT,fmt, ## args) -#define xfs_alert(mp,fmt,args...) cmn_err(CE_ALERT,fmt, ## args) +#define xfs_notice(mp,fmt,args...) cmn_err(CE_NOTE, _(fmt), ## args) +#define xfs_warn(mp,fmt,args...) cmn_err(CE_WARN, _(fmt), ## args) +#define xfs_err(mp,fmt,args...) cmn_err(CE_ALERT, _(fmt), ## args) +#define xfs_alert(mp,fmt,args...) cmn_err(CE_ALERT, _(fmt), ## args)#define xfs_buf_ioerror_alert (bp,f) ((void) 0);
Signature · 1 line
2.18.1
PATCH v5 2/3 xfs: introduce xfs_validate_stripe_factors()
In reply to Gao XiangIntroduce a common helper to consolidate stripe validation process. Also make kernel code xfs_validate_sb_common() use it first.
--- libxfs/xfs_sb.c | 65 ++++++++++++++++++++++++++++++++++++++++--------- libxfs/xfs_sb.h | 3 +++ 2 files changed, 57 insertions(+), 11 deletions(-)
libxfs/xfs_sb.c +54 -11
@@ -357,21 +357,18 @@ xfs_validate_sb_common( } } -if (sbp->sb_unit) { -if (!xfs_sb_version_hasdalign (sbp) || - sbp->sb_unit > sbp->sb_width || - (sbp->sb_width % sbp->sb_unit) !=0 ) { -xfs_notice (mp,"SB stripe unit sanity check failed" ); -return -EFSCORRUPTED ; - } - }else if (xfs_sb_version_hasdalign (sbp)) { +/* +* Either (sb_unit and !hasdalign) or (!sb_unit and hasdalign) +* would imply the image is corrupted. +*/ +if (!sbp->sb_unit ^ !xfs_sb_version_hasdalign (sbp)) {xfs_notice (mp,"SB stripe alignment sanity check failed" );return -EFSCORRUPTED ; - }else if (sbp->sb_width) { -xfs_notice (mp,"SB stripe width sanity check failed" ); -return -EFSCORRUPTED ; } +if (!xfs_validate_stripe_factors (mp,XFS_FSB_TO_B (mp, sbp->sb_unit), +XFS_FSB_TO_B (mp, sbp->sb_width),0 )) +return -EFSCORRUPTED ;if (xfs_sb_version_hascrc (&mp->m_sb) && sbp->sb_blocksize <XFS_MIN_CRC_BLOCKSIZE ) {
@@ -1208,3 +1205,49 @@ xfs_sb_get_secondary( *bpp = bp;return 0 ; } + +/* +* sunit, swidth, sectorsize(optional with 0) should be all in bytes, +* so users won't be confused by values in error messages. +*/ +bool +xfs_validate_stripe_factors ( +struct xfs_mount *mp, +__s64 sunit, +__s64 swidth, +int sectorsize) +{ +if (sectorsize && sunit % sectorsize) { +xfs_notice (mp, +"stripe unit (%lld) must be a multiple of the sector size (%d)" , + sunit, sectorsize); +return false; + } + +if (sunit && !swidth) { +xfs_notice (mp, +"invalid stripe unit (%lld) and stripe width of 0" , sunit); +return false; + } + +if (!sunit && swidth) { +xfs_notice (mp, +"invalid stripe width (%lld) and stripe unit of 0" , swidth); +return false; + } + +if (sunit > swidth) { +xfs_notice (mp, +"stripe unit (%lld) is larger than the stripe width (%lld)" , sunit, swidth); +return false; + } + +if (sunit && (swidth % sunit)) { +xfs_notice (mp, +"stripe width (%lld) must be a multiple of the stripe unit (%lld)" , + swidth, sunit); +return false; + } +return true; +} +
libxfs/xfs_sb.h +3 -0
@@ -42,4 +42,7 @@ extern int xfs_sb_get_secondary(struct xfs_mount *mp, struct xfs_trans *tp, xfs_agnumber_t agno, struct xfs_buf **bpp); +extern bool xfs_validate_stripe_factors (struct xfs_mount *mp, +__s64 sunit,__s64 swidth,int sectorsize); +#endif /* __XFS_SB_H__ */
Signature · 1 line
2.18.1
PATCH v5 3/3 mkfs: make use of xfs_validate_stripe_factors()
In reply to Gao XiangCheck stripe numbers in calc_stripe_factors() by using xfs_validate_stripe_factors().
--- libxfs/libxfs_api_defs.h | 1 + mkfs/xfs_mkfs.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-)
libxfs/libxfs_api_defs.h +1 -0
@@ -188,6 +188,7 @@#define xfs_trans_roll_inode libxfs_trans_roll_inode#define xfs_trans_roll libxfs_trans_roll +#define xfs_validate_stripe_factors libxfs_validate_stripe_factors#define xfs_verify_agbno libxfs_verify_agbno#define xfs_verify_agino libxfs_verify_agino#define xfs_verify_cksum libxfs_verify_cksum
mkfs/xfs_mkfs.c +7 -16
@@ -2305,12 +2305,6 @@ _("both data su and data sw options must be specified\n"));usage (); } -if (dsu % cfg->sectorsize) { -fprintf (stderr, -_ ("data su must be a multiple of the sector size (%d)\n" ), cfg->sectorsize); -usage (); - } - dsunit = (int )BTOBBT (dsu); big_dswidth = (long long int )dsunit * dsw;if (big_dswidth >INT_MAX ) {
@@ -2322,13 +2316,9 @@ _("data stripe width (%lld) is too large of a multiple of the data stripe unit ( dswidth = big_dswidth; } -if ((dsunit && !dswidth) || (!dsunit && dswidth) || - (dsunit && (dswidth % dsunit !=0 ))) { -fprintf (stderr, -_ ("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n" ), - dswidth, dsunit); +if (!libxfs_validate_stripe_factors (NULL ,BBTOB (dsunit),BBTOB (dswidth), + cfg->sectorsize))usage (); - }/* If sunit & swidth were manually specified as 0, same as noalign */ if ((cli_opt_set(&dopts, D_SUNIT) || cli_opt_set(&dopts, D_SU)) &&
@@ -2344,11 +2334,12 @@ _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"),/* if no stripe config set, use the device default */ if (!dsunit) { -/* Ignore nonsense from device. XXX add more validation */ -if (ft->dsunit && ft->dswidth ==0 ) { +/* Ignore nonsense from device report. */ +if (!libxfs_validate_stripe_factors (NULL ,BBTOB (ft->dsunit), +BBTOB (ft->dswidth),0 )) {fprintf (stderr, -_ ("%s: Volume reports stripe unit of %d bytes and stripe width of 0, ignoring.\n" ), - progname,BBTOB (ft->dsunit)); +_ ("%s: Volume reports invalid stripe unit (%d) and stripe width (%d), ignoring.\n" ), + progname,BBTOB (ft->dsunit),BBTOB (ft->dswidth)); ft->dsunit =0 ; ft->dswidth =0 ; }else {
Signature · 1 line
2.18.1
Re: [PATCH v5 3/3] mkfs: make use of xfs_validate_stripe_factors()
Quoted 9 lines · Gao Xiang
Check stripe numbers in
calc_stripe_factors()by usingxfs_validate_stripe_factors().Signed-off-by Gao Xiang <[email protected]>--- libxfs/libxfs_api_defs.h | 1 + mkfs/xfs_mkfs.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-)
...
mkfs/xfs_mkfs.c _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"), · line 2339
Quoted 9 lines
mkfs/xfs_mkfs.c +3
-2@@ -2344,11 +2334,12 @@ _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"),/* if no stripe config set, use the device default */ if (!dsunit) { -/* Ignore nonsense from device. XXX add more validation */ -if (ft->dsunit && ft->dswidth ==0 ) { +/* Ignore nonsense from device report. */ +if (!libxfs_validate_stripe_factors (NULL ,BBTOB (ft->dsunit), +BBTOB (ft->dswidth),0 )) {
The logic seems fine and from the previous comment it sounds like we're lacking validation in this particular scenario, but do we want to print more error noise from the validation helper in scenarios where failure is not a fatal error?
Brian
Quoted 11 lines
mkfs/xfs_mkfs.c +2
-2fprintf (stderr, -_ ("%s: Volume reports stripe unit of %d bytes and stripe width of 0, ignoring.\n" ), - progname,BBTOB (ft->dsunit)); +_ ("%s: Volume reports invalid stripe unit (%d) and stripe width (%d), ignoring.\n" ), + progname,BBTOB (ft->dsunit),BBTOB (ft->dswidth)); ft->dsunit =0 ; ft->dswidth =0 ; }else {Signature · 1 line
2.18.1
Re: [PATCH v5 3/3] mkfs: make use of xfs_validate_stripe_factors()
Hi Brian,
Quoted 13 lines · Brian Foster
Quoted 9 lines · Gao Xiang
Check stripe numbers in
calc_stripe_factors()by usingxfs_validate_stripe_factors().Signed-off-by Gao Xiang <[email protected]>--- libxfs/libxfs_api_defs.h | 1 + mkfs/xfs_mkfs.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-)...
Quoted 2 lines
(quoted diff) +0
-0@@ -2344,11 +2334,12 @@ _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"),
Quoted 12 lines
mkfs/xfs_mkfs.c _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"), · line 2339
Quoted 7 lines
mkfs/xfs_mkfs.c +3
-2/* if no stripe config set, use the device default */ if (!dsunit) { -/* Ignore nonsense from device. XXX add more validation */ -if (ft->dsunit && ft->dswidth ==0 ) { +/* Ignore nonsense from device report. */ +if (!libxfs_validate_stripe_factors (NULL ,BBTOB (ft->dsunit), +BBTOB (ft->dswidth),0 )) {The logic seems fine and from the previous comment it sounds like we're lacking validation in this particular scenario, but do we want to print more error noise from the validation helper in scenarios where failure is not a fatal error?
Yeah, If I understand correctly, I think that is an open question here, so I think you suggested that we could silence for this case by passing a "bool silent" argument? or some better idea for this?
Thanks,
Gao Xiang
Quoted 15 lines
Brian
Quoted 11 lines
mkfs/xfs_mkfs.c +2
-2fprintf (stderr, -_ ("%s: Volume reports stripe unit of %d bytes and stripe width of 0, ignoring.\n" ), - progname,BBTOB (ft->dsunit)); +_ ("%s: Volume reports invalid stripe unit (%d) and stripe width (%d), ignoring.\n" ), + progname,BBTOB (ft->dsunit),BBTOB (ft->dswidth)); ft->dsunit =0 ; ft->dswidth =0 ; }else {Signature · 1 line
2.18.1
Re: [PATCH v5 3/3] mkfs: make use of xfs_validate_stripe_factors()
Quoted 29 lines · Gao Xiang
Hi Brian,
Quoted 13 lines · Brian Foster
Quoted 9 lines · Gao Xiang
Check stripe numbers in
calc_stripe_factors()by usingxfs_validate_stripe_factors().Signed-off-by Gao Xiang <[email protected]>--- libxfs/libxfs_api_defs.h | 1 + mkfs/xfs_mkfs.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-)...
Quoted 2 lines
(quoted diff) +0
-0@@ -2344,11 +2334,12 @@ _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"),Quoted 12 lines
mkfs/xfs_mkfs.c _("data stripe width (%d) must be a multiple of the data stripe unit (%d)\n"), · line 2339
Quoted 7 lines
mkfs/xfs_mkfs.c +3
-2/* if no stripe config set, use the device default */ if (!dsunit) { -/* Ignore nonsense from device. XXX add more validation */ -if (ft->dsunit && ft->dswidth ==0 ) { +/* Ignore nonsense from device report. */ +if (!libxfs_validate_stripe_factors (NULL ,BBTOB (ft->dsunit), +BBTOB (ft->dswidth),0 )) {The logic seems fine and from the previous comment it sounds like we're lacking validation in this particular scenario, but do we want to print more error noise from the validation helper in scenarios where failure is not a fatal error?
Quoted 4 lines
Yeah, If I understand correctly, I think that is an open question here, so I think you suggested that we could silence for this case by passing a "bool silent" argument? or some better idea for this?
Sure, that seems reasonable to me. Maybe others have thoughts. My concern was primarily based on usability in terms of not potentially confusing users with spurious error messages.
Brian
Quoted 19 lines
Thanks,
Gao XiangQuoted 15 lines
Brian
Quoted 11 lines
mkfs/xfs_mkfs.c +2
-2fprintf (stderr, -_ ("%s: Volume reports stripe unit of %d bytes and stripe width of 0, ignoring.\n" ), - progname,BBTOB (ft->dsunit)); +_ ("%s: Volume reports invalid stripe unit (%d) and stripe width (%d), ignoring.\n" ), + progname,BBTOB (ft->dsunit),BBTOB (ft->dswidth)); ft->dsunit =0 ; ft->dswidth =0 ; }else {Signature · 1 line
2.18.1