Message ID | 20210219013734.428396-1-hsiangkao@redhat.com (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
Series | None | expand |
On 2/18/21 7:37 PM, Gao Xiang wrote: > Check stripe numbers in calc_stripe_factors() by using > xfs_validate_stripe_geometry(). > > Signed-off-by: Gao Xiang <hsiangkao@redhat.com> I think this is good to go now, thank you. Reviewed-by: Eric Sandeen <sandeen@redhat.com> -Eric > --- > changes since v6: > - fix dsu round-down issue (the related print message has also > been turned into bytes to avoid round-down issue); > - rebase on for-next. > > libxfs/libxfs_api_defs.h | 1 + > mkfs/xfs_mkfs.c | 35 +++++++++++++++-------------------- > 2 files changed, 16 insertions(+), 20 deletions(-) > > diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h > index 9a00ce66..e4192e1b 100644 > --- a/libxfs/libxfs_api_defs.h > +++ b/libxfs/libxfs_api_defs.h > @@ -192,6 +192,7 @@ > #define xfs_trans_roll libxfs_trans_roll > #define xfs_trim_extent libxfs_trim_extent > > +#define xfs_validate_stripe_geometry libxfs_validate_stripe_geometry > #define xfs_verify_agbno libxfs_verify_agbno > #define xfs_verify_agino libxfs_verify_agino > #define xfs_verify_cksum libxfs_verify_cksum > diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c > index d72d21ef..dcdd5262 100644 > --- a/mkfs/xfs_mkfs.c > +++ b/mkfs/xfs_mkfs.c > @@ -2361,28 +2361,22 @@ _("both data su and data sw options must be specified\n")); > usage(); > } > > - if (dsu % cfg->sectorsize) { > + big_dswidth = (long long int)dsu * dsw; > + if (BTOBBT(big_dswidth) > INT_MAX) { > fprintf(stderr, > -_("data su must be a multiple of the sector size (%d)\n"), cfg->sectorsize); > +_("data stripe width (%lld) is too large of a multiple of the data stripe unit (%d)\n"), > + big_dswidth, dsu); > usage(); > } > > - dsunit = (int)BTOBBT(dsu); > - big_dswidth = (long long int)dsunit * dsw; > - if (big_dswidth > INT_MAX) { > - fprintf(stderr, > -_("data stripe width (%lld) is too large of a multiple of the data stripe unit (%d)\n"), > - big_dswidth, dsunit); > + if (!libxfs_validate_stripe_geometry(NULL, dsu, big_dswidth, > + cfg->sectorsize, false)) > usage(); > - } > - 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); > + dsunit = BTOBBT(dsu); > + dswidth = BTOBBT(big_dswidth); > + } else if (!libxfs_validate_stripe_geometry(NULL, BBTOB(dsunit), > + BBTOB(dswidth), cfg->sectorsize, false)) { > usage(); > } > > @@ -2400,11 +2394,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_geometry(NULL, BBTOB(ft->dsunit), > + BBTOB(ft->dswidth), 0, true)) { > 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 { >
On Tue, Feb 23, 2021 at 06:10:45PM -0600, Eric Sandeen wrote: > On 2/18/21 7:37 PM, Gao Xiang wrote: > > Check stripe numbers in calc_stripe_factors() by using > > xfs_validate_stripe_geometry(). > > > > Signed-off-by: Gao Xiang <hsiangkao@redhat.com> > > I think this is good to go now, thank you. > Sorry for my careless mistake at that time and thanks for your review! Thanks, Gao Xiang
diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index 9a00ce66..e4192e1b 100644 --- a/libxfs/libxfs_api_defs.h +++ b/libxfs/libxfs_api_defs.h @@ -192,6 +192,7 @@ #define xfs_trans_roll libxfs_trans_roll #define xfs_trim_extent libxfs_trim_extent +#define xfs_validate_stripe_geometry libxfs_validate_stripe_geometry #define xfs_verify_agbno libxfs_verify_agbno #define xfs_verify_agino libxfs_verify_agino #define xfs_verify_cksum libxfs_verify_cksum diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index d72d21ef..dcdd5262 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2361,28 +2361,22 @@ _("both data su and data sw options must be specified\n")); usage(); } - if (dsu % cfg->sectorsize) { + big_dswidth = (long long int)dsu * dsw; + if (BTOBBT(big_dswidth) > INT_MAX) { fprintf(stderr, -_("data su must be a multiple of the sector size (%d)\n"), cfg->sectorsize); +_("data stripe width (%lld) is too large of a multiple of the data stripe unit (%d)\n"), + big_dswidth, dsu); usage(); } - dsunit = (int)BTOBBT(dsu); - big_dswidth = (long long int)dsunit * dsw; - if (big_dswidth > INT_MAX) { - fprintf(stderr, -_("data stripe width (%lld) is too large of a multiple of the data stripe unit (%d)\n"), - big_dswidth, dsunit); + if (!libxfs_validate_stripe_geometry(NULL, dsu, big_dswidth, + cfg->sectorsize, false)) usage(); - } - 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); + dsunit = BTOBBT(dsu); + dswidth = BTOBBT(big_dswidth); + } else if (!libxfs_validate_stripe_geometry(NULL, BBTOB(dsunit), + BBTOB(dswidth), cfg->sectorsize, false)) { usage(); } @@ -2400,11 +2394,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_geometry(NULL, BBTOB(ft->dsunit), + BBTOB(ft->dswidth), 0, true)) { 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 {
Check stripe numbers in calc_stripe_factors() by using xfs_validate_stripe_geometry(). Signed-off-by: Gao Xiang <hsiangkao@redhat.com> --- changes since v6: - fix dsu round-down issue (the related print message has also been turned into bytes to avoid round-down issue); - rebase on for-next. libxfs/libxfs_api_defs.h | 1 + mkfs/xfs_mkfs.c | 35 +++++++++++++++-------------------- 2 files changed, 16 insertions(+), 20 deletions(-)