Skip to contentSkip to conversation

xfs: introduce xfs_validate_stripe_factors()

PATCH In review Gao Xiang 2 participants 4 messages Oct 9, 2020 – Oct 12, 2020 XFS filesystem

lore
Share & tools
lore

Gao Xiang

author
#0 lore raw

PATCH 1/1 xfs: introduce xfs_validate_stripe_factors()

Introduce a common helper to consolidate stripe validation process. Also make kernel code xfs_validate_sb_common() use it first.

---

kernel side of:
https://lore.kernel.org/r/[email protected]
with update suggested by Darrick:
- stretch columns for commit message;
- add comments to hasdalign check;
- break old sunit / swidth != 0 check into two seperate checks;
- update an error message description.

also use bytes for sunit / swidth representation, so users can see values in the unique unit.

see
https://lore.kernel.org/r/[email protected]
for the background.

 fs/xfs/libxfs/xfs_sb.c | 65 +++++++++++++++++++++++++++++++++++-------
 fs/xfs/libxfs/xfs_sb.h |  3 ++
 2 files changed, 57 insertions(+), 11 deletions(-)
fs/xfs/libxfs/xfs_sb.c +54 -11
index 5aeafa59ed27..cb2a7aa0ad51 100644
@@ -360,21 +360,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) {
@@ -1233,3 +1230,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;
+}
+
fs/xfs/libxfs/xfs_sb.h +3 -0
index 92465a9a5162..2d3504eb9886 100644
@@ -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
#1 lore raw
Quoted 29 lines · Gao Xiang

Introduce a common helper to consolidate stripe validation process. Also make kernel code xfs_validate_sb_common() use it first.

---

kernel side of:
https://lore.kernel.org/r/[email protected]
with update suggested by Darrick:
- stretch columns for commit message;
- add comments to hasdalign check;
- break old sunit / swidth != 0 check into two seperate checks;
- update an error message description.

also use bytes for sunit / swidth representation, so users can see values in the unique unit.

see
https://lore.kernel.org/r/[email protected]
for the background.

 fs/xfs/libxfs/xfs_sb.c | 65 +++++++++++++++++++++++++++++++++++-------
 fs/xfs/libxfs/xfs_sb.h |  3 ++
 2 files changed, 57 insertions(+), 11 deletions(-)
fs/xfs/libxfs/xfs_sb.c +0 -0
index 5aeafa59ed27..cb2a7aa0ad51 100644

...

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1239

Quoted 11 lines
fs/xfs/libxfs/xfs_sb.c +7 -0
@@ -1233,3 +1230,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(

xfs_validate_stripe_geometry() perhaps?

Quoted 13 lines
fs/xfs/libxfs/xfs_sb.c +13 -0
+	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) {

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1262

Quoted 10 lines
fs/xfs/libxfs/xfs_sb.c +10 -0
+		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;
+	}

Seems like these two could be combined into one check that prints something like:

invalid stripe width (%lld) and stripe unit (%lld)

Quoted 6 lines
fs/xfs/libxfs/xfs_sb.c +6 -0
+
+	if (sunit > swidth) {
+		xfs_notice(mp,
+"stripe unit (%lld) is larger than the stripe width (%lld)", sunit, swidth);
+		return false;
+	}

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1278

Quoted 10 lines
fs/xfs/libxfs/xfs_sb.c +10 -0
+
+	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;
+}
+

Trailing whitespace here.

Otherwise looks reasonable outside of those nits.

Brian

Quoted 15 lines
fs/xfs/libxfs/xfs_sb.h +3 -0
index 92465a9a5162..2d3504eb9886 100644
@@ -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
author
#2 lore raw

Hi Brian,

Quoted 6 lines · Brian Foster
Quoted 5 lines · Gao Xiang

Introduce a common helper to consolidate stripe validation process. Also make kernel code xfs_validate_sb_common() use it first.

---

...

Quoted 5 lines
Quoted 4 lines
fs/xfs/libxfs/xfs_sb.c +0 -0
index 5aeafa59ed27..cb2a7aa0ad51 100644

...

Quoted 13 lines

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1239

Quoted 11 lines
fs/xfs/libxfs/xfs_sb.c +7 -0
@@ -1233,3 +1230,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(

xfs_validate_stripe_geometry() perhaps?

Thanks for the review!

Ok, I'm fine with the naming, since I had no better name about it at that time :)

Quoted 28 lines
Quoted 14 lines
fs/xfs/libxfs/xfs_sb.c +13 -0
+	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) {

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1262

Quoted 10 lines
fs/xfs/libxfs/xfs_sb.c +10 -0
+		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;
+	}

Seems like these two could be combined into one check that prints something like:

Quoted 1 line

invalid stripe width (%lld) and stripe unit (%lld)

Hmm, that was in response to Darrick's previous review... see,
https://lore.kernel.org/linux-xfs/20201007222942.GH6540@magnolia

so I'd like to know further direction of this...

Quoted 11 lines
Quoted 11 lines
fs/xfs/libxfs/xfs_sb.c +10 -0
+
+	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)",
Quoted 8 lines

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1278

Quoted 6 lines
fs/xfs/libxfs/xfs_sb.c +6 -0
+			   swidth, sunit);
+		return false;
+	}
+	return true;
+}
+

Trailing whitespace here.

That is trailing newline (I personally prefer that), yeah, I will remove it in the next version.

Thanks,
Gao Xiang

Quoted 4 lines

Otherwise looks reasonable outside of those nits.

Brian

#3 lore raw
Quoted 64 lines · Gao Xiang

Hi Brian,

Quoted 6 lines · Brian Foster
Quoted 5 lines · Gao Xiang

Introduce a common helper to consolidate stripe validation process. Also make kernel code xfs_validate_sb_common() use it first.

---

...

Quoted 5 lines
Quoted 4 lines
fs/xfs/libxfs/xfs_sb.c +0 -0
index 5aeafa59ed27..cb2a7aa0ad51 100644

...

Quoted 13 lines

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1239

Quoted 11 lines
fs/xfs/libxfs/xfs_sb.c +7 -0
@@ -1233,3 +1230,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(

xfs_validate_stripe_geometry() perhaps?

Thanks for the review!

Ok, I'm fine with the naming, since I had no better name about it at that time :)

Quoted 28 lines
Quoted 14 lines
fs/xfs/libxfs/xfs_sb.c +13 -0
+	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) {

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1262

Quoted 10 lines
fs/xfs/libxfs/xfs_sb.c +10 -0
+		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;
+	}

Seems like these two could be combined into one check that prints something like:

Quoted 7 lines
Quoted 1 line

invalid stripe width (%lld) and stripe unit (%lld)

Hmm, that was in response to Darrick's previous review... see,
https://lore.kernel.org/linux-xfs/20201007222942.GH6540@magnolia

so I'd like to know further direction of this...

Oh, Ok. No problem, I don't feel strongly about it. It just looked like a potential code reduction.

Quoted 20 lines
Quoted 11 lines
Quoted 11 lines
fs/xfs/libxfs/xfs_sb.c +10 -0
+
+	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)",
Quoted 8 lines

fs/xfs/libxfs/xfs_sb.c xfs_sb_get_secondary( · line 1278

Quoted 6 lines
fs/xfs/libxfs/xfs_sb.c +6 -0
+			   swidth, sunit);
+		return false;
+	}
+	return true;
+}
+

Trailing whitespace here.

Quoted 3 lines

That is trailing newline (I personally prefer that), yeah, I will remove it in the next version.

git (at least my configuration) tends to show this as a whitespace error. I.e., it's highlighted in red and stands out similar to other whitespace errors (such as tab after space, etc.). I thought that was a fairly common config and thus something we tried to avoid, but could be mistaken.

Brian

Quoted 8 lines

Thanks,
Gao Xiang

Quoted 4 lines

Otherwise looks reasonable outside of those nits.

Brian