Skip to contentSkip to conversation

xfs_scrub: don't use statvfs to collect filesystem summary counts

PATCH In review Darrick J. Wong 4 participants 6 messages Oct 5, 2020 – Oct 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 xfs_scrub: don't use statvfs to collect filesystem summary counts

From: Darrick J. Wong <[email protected]>

The function scrub_scan_estimate_blocks naïvely uses the statvfs counts to estimate the size and free blocks on the data volume. Unfortunately, it fails to account for the fact that statvfs can return the size and free counts for the realtime volume if the root directory has the rtinherit flag set, which leads to phase 7 reporting totally absurd quantities.

Eric pointed out a further problem with statvfs, which is that the file counts are clamped to the current user's project quota inode limits. Therefore, we must not use statvfs for querying the filesystem summary counts.

The XFS_IOC_FSCOUNTS ioctl returns all the data we need, so use that instead.

Fixes 604dd3345f35 ("xfs_scrub: filesystem counter collection functions")

---
v2: drop statvfs entirely

---
 scrub/fscounters.c |   27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)
scrub/fscounters.c +4 -23
index f9d64f8c008f..e9901fcdf6df 100644
@@ -130,38 +130,19 @@ scrub_scan_estimate_blocks(
 	unsigned long long		*f_free)
 {
 	struct xfs_fsop_counts		fc;
-	struct xfs_fsop_resblks		rb;
-	struct statvfs			sfs;
 	int				error;
 
-	/* Grab the fstatvfs counters, since it has to report accurately. */
-	error = fstatvfs(ctx->mnt.fd, &sfs);
-	if (error)
-		return errno;
-
 	/* Fetch the filesystem counters. */
 	error = ioctl(ctx->mnt.fd, XFS_IOC_FSCOUNTS, &fc);
 	if (error)
 		return errno;
 
-	/*
-	 * XFS reserves some blocks to prevent hard ENOSPC, so add those
-	 * blocks back to the free data counts.
-	 */
-	error = ioctl(ctx->mnt.fd, XFS_IOC_GET_RESBLKS, &rb);
-	if (error)
-		return errno;
-
-	sfs.f_bfree += rb.resblks_avail;
-
-	*d_blocks = sfs.f_blocks;
-	if (ctx->mnt.fsgeom.logstart > 0)
-		*d_blocks += ctx->mnt.fsgeom.logblocks;
-	*d_bfree = sfs.f_bfree;
+	*d_blocks = ctx->mnt.fsgeom.datablocks;
+	*d_bfree = fc.freedata;
 	*r_blocks = ctx->mnt.fsgeom.rtblocks;
 	*r_bfree = fc.freertx;
-	*f_files = sfs.f_files;
-	*f_free = sfs.f_ffree;
+	*f_files = fc.allocino;
+	*f_free = fc.freeino;
 
 	return 0;
 }
#1 lore raw
Quoted 14 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

The function scrub_scan_estimate_blocks naïvely uses the statvfs counts to estimate the size and free blocks on the data volume. Unfortunately, it fails to account for the fact that statvfs can return the size and free counts for the realtime volume if the root directory has the rtinherit flag set, which leads to phase 7 reporting totally absurd quantities.

Eric pointed out a further problem with statvfs, which is that the file counts are clamped to the current user's project quota inode limits. Therefore, we must not use statvfs for querying the filesystem summary counts.

Quoted 8 lines

The XFS_IOC_FSCOUNTS ioctl returns all the data we need, so use that instead.

Fixes 604dd3345f35 ("xfs_scrub: filesystem counter collection functions")

---
v2: drop statvfs entirely
---

This doesn't seem to apply to for-next..?

Brian

Quoted 51 lines
 scrub/fscounters.c |   27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)
scrub/fscounters.c +4 -23
index f9d64f8c008f..e9901fcdf6df 100644
@@ -130,38 +130,19 @@ scrub_scan_estimate_blocks(
 	unsigned long long		*f_free)
 {
 	struct xfs_fsop_counts		fc;
-	struct xfs_fsop_resblks		rb;
-	struct statvfs			sfs;
 	int				error;
 
-	/* Grab the fstatvfs counters, since it has to report accurately. */
-	error = fstatvfs(ctx->mnt.fd, &sfs);
-	if (error)
-		return errno;
-
 	/* Fetch the filesystem counters. */
 	error = ioctl(ctx->mnt.fd, XFS_IOC_FSCOUNTS, &fc);
 	if (error)
 		return errno;
 
-	/*
-	 * XFS reserves some blocks to prevent hard ENOSPC, so add those
-	 * blocks back to the free data counts.
-	 */
-	error = ioctl(ctx->mnt.fd, XFS_IOC_GET_RESBLKS, &rb);
-	if (error)
-		return errno;
-
-	sfs.f_bfree += rb.resblks_avail;
-
-	*d_blocks = sfs.f_blocks;
-	if (ctx->mnt.fsgeom.logstart > 0)
-		*d_blocks += ctx->mnt.fsgeom.logblocks;
-	*d_bfree = sfs.f_bfree;
+	*d_blocks = ctx->mnt.fsgeom.datablocks;
+	*d_bfree = fc.freedata;
 	*r_blocks = ctx->mnt.fsgeom.rtblocks;
 	*r_bfree = fc.freertx;
-	*f_files = sfs.f_files;
-	*f_free = sfs.f_ffree;
+	*f_files = fc.allocino;
+	*f_free = fc.freeino;
 
 	return 0;
 }
#2 lore raw
Quoted 18 lines · Brian Foster
Quoted 17 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

The function scrub_scan_estimate_blocks naïvely uses the statvfs counts to estimate the size and free blocks on the data volume. Unfortunately, it fails to account for the fact that statvfs can return the size and free counts for the realtime volume if the root directory has the rtinherit flag set, which leads to phase 7 reporting totally absurd quantities.

Eric pointed out a further problem with statvfs, which is that the file counts are clamped to the current user's project quota inode limits. Therefore, we must not use statvfs for querying the filesystem summary counts.

The XFS_IOC_FSCOUNTS ioctl returns all the data we need, so use that instead.

Quoted 8 lines
Quoted 5 lines
Fixes 604dd3345f35 ("xfs_scrub: filesystem counter collection functions")

---
v2: drop statvfs entirely
---

This doesn't seem to apply to for-next..?

Oops, never mind. Wrong tree...

Quoted 42 lines

Brian

Quoted 40 lines
 scrub/fscounters.c |   27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)
scrub/fscounters.c +1 -21
index f9d64f8c008f..e9901fcdf6df 100644
@@ -130,38 +130,19 @@ scrub_scan_estimate_blocks(
 	unsigned long long		*f_free)
 {
 	struct xfs_fsop_counts		fc;
-	struct xfs_fsop_resblks		rb;
-	struct statvfs			sfs;
 	int				error;
 
-	/* Grab the fstatvfs counters, since it has to report accurately. */
-	error = fstatvfs(ctx->mnt.fd, &sfs);
-	if (error)
-		return errno;
-
 	/* Fetch the filesystem counters. */
 	error = ioctl(ctx->mnt.fd, XFS_IOC_FSCOUNTS, &fc);
 	if (error)
 		return errno;
 
-	/*
-	 * XFS reserves some blocks to prevent hard ENOSPC, so add those
-	 * blocks back to the free data counts.
-	 */
-	error = ioctl(ctx->mnt.fd, XFS_IOC_GET_RESBLKS, &rb);
-	if (error)
-		return errno;
-
-	sfs.f_bfree += rb.resblks_avail;
-
-	*d_blocks = sfs.f_blocks;
-	if (ctx->mnt.fsgeom.logstart > 0)
-		*d_blocks += ctx->mnt.fsgeom.logblocks;
-	*d_bfree = sfs.f_bfree;
+	*d_blocks = ctx->mnt.fsgeom.datablocks;
Quoted 8 lines

scrub/fscounters.c scrub_scan_estimate_blocks( · line 146

Quoted 8 lines
scrub/fscounters.c +3 -2
+	*d_bfree = fc.freedata;
 	*r_blocks = ctx->mnt.fsgeom.rtblocks;
 	*r_bfree = fc.freertx;
-	*f_files = sfs.f_files;
-	*f_free = sfs.f_ffree;
+	*f_files = fc.allocino;
+	*f_free = fc.freeino;
 

Aren't the free inode counters semantically different between statvfs and this ioctl? I thought stat had some logic to effectively show free data blocks as free inodes, whereas the ioctl looks like it just reads our internal counter (which IIRC is a subset of physically allocated inode chunks). Do we care about that semantic here either way?

Brian

Quoted 4 lines
Quoted 3 lines
scrub/fscounters.c +0 -0
 	return 0;
 }
#3 lore raw
Quoted 77 lines · Brian Foster
Quoted 18 lines · Brian Foster
Quoted 17 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

The function scrub_scan_estimate_blocks naïvely uses the statvfs counts to estimate the size and free blocks on the data volume. Unfortunately, it fails to account for the fact that statvfs can return the size and free counts for the realtime volume if the root directory has the rtinherit flag set, which leads to phase 7 reporting totally absurd quantities.

Eric pointed out a further problem with statvfs, which is that the file counts are clamped to the current user's project quota inode limits. Therefore, we must not use statvfs for querying the filesystem summary counts.

The XFS_IOC_FSCOUNTS ioctl returns all the data we need, so use that instead.

Quoted 8 lines
Quoted 5 lines
Fixes 604dd3345f35 ("xfs_scrub: filesystem counter collection functions")

---
v2: drop statvfs entirely
---

This doesn't seem to apply to for-next..?

Oops, never mind. Wrong tree...

Quoted 46 lines

Brian

Quoted 44 lines
 scrub/fscounters.c |   27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)
scrub/fscounters.c +2 -22
index f9d64f8c008f..e9901fcdf6df 100644
@@ -130,38 +130,19 @@ scrub_scan_estimate_blocks(
 	unsigned long long		*f_free)
 {
 	struct xfs_fsop_counts		fc;
-	struct xfs_fsop_resblks		rb;
-	struct statvfs			sfs;
 	int				error;
 
-	/* Grab the fstatvfs counters, since it has to report accurately. */
-	error = fstatvfs(ctx->mnt.fd, &sfs);
-	if (error)
-		return errno;
-
 	/* Fetch the filesystem counters. */
 	error = ioctl(ctx->mnt.fd, XFS_IOC_FSCOUNTS, &fc);
 	if (error)
 		return errno;
 
-	/*
-	 * XFS reserves some blocks to prevent hard ENOSPC, so add those
-	 * blocks back to the free data counts.
-	 */
-	error = ioctl(ctx->mnt.fd, XFS_IOC_GET_RESBLKS, &rb);
-	if (error)
-		return errno;
-
-	sfs.f_bfree += rb.resblks_avail;
-
-	*d_blocks = sfs.f_blocks;
-	if (ctx->mnt.fsgeom.logstart > 0)
-		*d_blocks += ctx->mnt.fsgeom.logblocks;
-	*d_bfree = sfs.f_bfree;
+	*d_blocks = ctx->mnt.fsgeom.datablocks;
+	*d_bfree = fc.freedata;
 	*r_blocks = ctx->mnt.fsgeom.rtblocks;
 	*r_bfree = fc.freertx;
-	*f_files = sfs.f_files;
Quoted 8 lines
Quoted 4 lines

scrub/fscounters.c scrub_scan_estimate_blocks( · line 146

Quoted 4 lines
scrub/fscounters.c +2 -1
-	*f_free = sfs.f_ffree;
+	*f_files = fc.allocino;
+	*f_free = fc.freeino;
 

Aren't the free inode counters semantically different between statvfs and this ioctl? I thought stat had some logic to effectively show free data blocks as free inodes,

It does.

Quoted 3 lines

whereas the ioctl looks like it just reads
our internal counter (which IIRC is a subset of physically allocated inode chunks). Do we care about that semantic here either way?

Nope. The one caller that cares (scrub/phase7.c) only wants to know the number of inodes in use (f_free - f_files), which is unaffected by the logic in xfs_fs_statfs.

I suppose I could trim the parameter list even further to return only the file count...

--D

Quoted 7 lines

Brian

Quoted 4 lines
Quoted 3 lines
scrub/fscounters.c +0 -0
 	return 0;
 }
#4 lore raw
Quoted 10 lines · Darrick J. Wong
Quoted 3 lines

whereas the ioctl looks like it just reads
our internal counter (which IIRC is a subset of physically allocated inode chunks). Do we care about that semantic here either way?

Nope. The one caller that cares (scrub/phase7.c) only wants to know the number of inodes in use (f_free - f_files), which is unaffected by the logic in xfs_fs_statfs.

I suppose I could trim the parameter list even further to return only the file count...

Please do. Or just kill the helper entirely and open code the trivial ioctl call in the two callers.

Reviewed-by on v2 1/1
#5 lore raw
In reply to Darrick J. Wong
Quoted 14 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

The function scrub_scan_estimate_blocks naïvely uses the statvfs counts to estimate the size and free blocks on the data volume. Unfortunately, it fails to account for the fact that statvfs can return the size and free counts for the realtime volume if the root directory has the rtinherit flag set, which leads to phase 7 reporting totally absurd quantities.

Eric pointed out a further problem with statvfs, which is that the file counts are clamped to the current user's project quota inode limits. Therefore, we must not use statvfs for querying the filesystem summary counts.

Quoted 5 lines

The XFS_IOC_FSCOUNTS ioctl returns all the data we need, so use that instead.

Fixes 604dd3345f35 ("xfs_scrub: filesystem counter collection functions")
Quoted 54 lines

---
v2: drop statvfs entirely

---
 scrub/fscounters.c |   27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)
scrub/fscounters.c +4 -23
index f9d64f8c008f..e9901fcdf6df 100644
@@ -130,38 +130,19 @@ scrub_scan_estimate_blocks(
 	unsigned long long		*f_free)
 {
 	struct xfs_fsop_counts		fc;
-	struct xfs_fsop_resblks		rb;
-	struct statvfs			sfs;
 	int				error;
 
-	/* Grab the fstatvfs counters, since it has to report accurately. */
-	error = fstatvfs(ctx->mnt.fd, &sfs);
-	if (error)
-		return errno;
-
 	/* Fetch the filesystem counters. */
 	error = ioctl(ctx->mnt.fd, XFS_IOC_FSCOUNTS, &fc);
 	if (error)
 		return errno;
 
-	/*
-	 * XFS reserves some blocks to prevent hard ENOSPC, so add those
-	 * blocks back to the free data counts.
-	 */
-	error = ioctl(ctx->mnt.fd, XFS_IOC_GET_RESBLKS, &rb);
-	if (error)
-		return errno;
-
-	sfs.f_bfree += rb.resblks_avail;
-
-	*d_blocks = sfs.f_blocks;
-	if (ctx->mnt.fsgeom.logstart > 0)
-		*d_blocks += ctx->mnt.fsgeom.logblocks;
-	*d_bfree = sfs.f_bfree;
+	*d_blocks = ctx->mnt.fsgeom.datablocks;
+	*d_bfree = fc.freedata;
 	*r_blocks = ctx->mnt.fsgeom.rtblocks;
 	*r_bfree = fc.freertx;
-	*f_files = sfs.f_files;
-	*f_free = sfs.f_ffree;
+	*f_files = fc.allocino;
+	*f_free = fc.freeino;
 
 	return 0;
 }