Skip to contentSkip to conversation

xfs_logprint: Fix super block buffer interpretation issue

PATCH Superseded Chi Zhiling 3 participants 4 messages Oct 11, 2024 – Oct 12, 2024

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 xfs_logprint: Fix super block buffer interpretation issue

From: Chi Zhiling <[email protected]>

When using xfs_logprint to interpret the buffer of the super block, the icount will always be 6360863066640355328 (0x5846534200001000). This is because the offset of icount is incorrect, causing xfs_logprint to misinterpret the MAGIC number as icount.
This patch fixes the offset value of the SB counters in xfs_logprint.

Before this patch:
icount: 6360863066640355328 ifree: 5242880 fdblks: 0 frext: 0

After this patch:
icount: 10240 ifree: 4906 fdblks: 37 frext: 0

---
 logprint/log_misc.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
logprint/log_misc.c +5 -12
index 8e86ac34..0da92744 100644
@@ -282,22 +282,15 @@ xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops)
 		if (be32_to_cpu(head->oh_len) < 4*8) {
 			printf(_("Out of space\n"));
 		} else {
-			__be64		 a, b;
+			struct xfs_dsb *dsb = (struct xfs_dsb *) *ptr;
 
 			printf("\n");
-			/*
-			 * memmove because *ptr may not be 8-byte aligned
-			 */
-			memmove(&a, *ptr, sizeof(__be64));
-			memmove(&b, *ptr+8, sizeof(__be64));
 			printf(_("icount: %llu  ifree: %llu  "),
-			       (unsigned long long) be64_to_cpu(a),
-			       (unsigned long long) be64_to_cpu(b));
-			memmove(&a, *ptr+16, sizeof(__be64));
-			memmove(&b, *ptr+24, sizeof(__be64));
+			       (unsigned long long) be64_to_cpu(dsb->sb_icount),
+			       (unsigned long long) be64_to_cpu(dsb->sb_ifree));
 			printf(_("fdblks: %llu  frext: %llu\n"),
-			       (unsigned long long) be64_to_cpu(a),
-			       (unsigned long long) be64_to_cpu(b));
+			       (unsigned long long) be64_to_cpu(dsb->sb_fdblocks),
+			       (unsigned long long) be64_to_cpu(dsb->sb_frextents));
 		}
 		super_block = 0;
 	} else if (be32_to_cpu(*(__be32 *)(*ptr)) == XFS_AGI_MAGIC) {
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#2 lore raw
In reply to Chi Zhiling
Quoted 25 lines · Chi Zhiling

From: Chi Zhiling <[email protected]>

When using xfs_logprint to interpret the buffer of the super block, the icount will always be 6360863066640355328 (0x5846534200001000). This is because the offset of icount is incorrect, causing xfs_logprint to misinterpret the MAGIC number as icount.
This patch fixes the offset value of the SB counters in xfs_logprint.

Before this patch:
icount: 6360863066640355328 ifree: 5242880 fdblks: 0 frext: 0

After this patch:
icount: 10240 ifree: 4906 fdblks: 37 frext: 0

---
 logprint/log_misc.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)
logprint/log_misc.c +0 -0
index 8e86ac34..0da92744 100644

logprint/log_misc.c xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops) · line 285

Quoted 5 lines
logprint/log_misc.c +1 -1
@@ -282,22 +282,15 @@ xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops)
 		if (be32_to_cpu(head->oh_len) < 4*8) {
 			printf(_("Out of space\n"));
 		} else {
-			__be64		 a, b;
+			struct xfs_dsb *dsb = (struct xfs_dsb *) *ptr;

Nit: tab between type and variable ^ name

With that fixed,

--D

Quoted 26 lines
logprint/log_misc.c +4 -11
 			printf("\n");
-			/*
-			 * memmove because *ptr may not be 8-byte aligned
-			 */
-			memmove(&a, *ptr, sizeof(__be64));
-			memmove(&b, *ptr+8, sizeof(__be64));
 			printf(_("icount: %llu  ifree: %llu  "),
-			       (unsigned long long) be64_to_cpu(a),
-			       (unsigned long long) be64_to_cpu(b));
-			memmove(&a, *ptr+16, sizeof(__be64));
-			memmove(&b, *ptr+24, sizeof(__be64));
+			       (unsigned long long) be64_to_cpu(dsb->sb_icount),
+			       (unsigned long long) be64_to_cpu(dsb->sb_ifree));
 			printf(_("fdblks: %llu  frext: %llu\n"),
-			       (unsigned long long) be64_to_cpu(a),
-			       (unsigned long long) be64_to_cpu(b));
+			       (unsigned long long) be64_to_cpu(dsb->sb_fdblocks),
+			       (unsigned long long) be64_to_cpu(dsb->sb_frextents));
 		}
 		super_block = 0;
 	} else if (be32_to_cpu(*(__be32 *)(*ptr)) == XFS_AGI_MAGIC) {
Signature · 1 line
2.43.0
#3 lore raw
Quoted 21 lines · Darrick J. Wong
Quoted 20 lines · Chi Zhiling

From: Chi Zhiling <[email protected]>

When using xfs_logprint to interpret the buffer of the super block, the icount will always be 6360863066640355328 (0x5846534200001000). This is because the offset of icount is incorrect, causing xfs_logprint to misinterpret the MAGIC number as icount.
This patch fixes the offset value of the SB counters in xfs_logprint.

Before this patch:
icount: 6360863066640355328 ifree: 5242880 fdblks: 0 frext: 0

After this patch:
icount: 10240 ifree: 4906 fdblks: 37 frext: 0

---
  logprint/log_misc.c | 17 +++++------------
  1 file changed, 5 insertions(+), 12 deletions(-)
Quoted 11 lines

logprint/log_misc.c xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops) · line 285

Quoted 10 lines
logprint/log_misc.c +1 -1
index 8e86ac34..0da92744 100644
@@ -282,22 +282,15 @@ xlog_print_trans_buffer(char **ptr, int len, int *i, int num_ops)
  		if (be32_to_cpu(head->oh_len) < 4*8) {
  			printf(_("Out of space\n"));
  		} else {
-			__be64		 a, b;
+			struct xfs_dsb *dsb = (struct xfs_dsb *) *ptr;

Nit: tab between type and variable ^ name

Thank you, I will fix it soon

chi

Quoted 32 lines

With that fixed,

--D

Quoted 26 lines
logprint/log_misc.c +4 -11
  			printf("\n");
-			/*
-			 * memmove because *ptr may not be 8-byte aligned
-			 */
-			memmove(&a, *ptr, sizeof(__be64));
-			memmove(&b, *ptr+8, sizeof(__be64));
  			printf(_("icount: %llu  ifree: %llu  "),
-			       (unsigned long long) be64_to_cpu(a),
-			       (unsigned long long) be64_to_cpu(b));
-			memmove(&a, *ptr+16, sizeof(__be64));
-			memmove(&b, *ptr+24, sizeof(__be64));
+			       (unsigned long long) be64_to_cpu(dsb->sb_icount),
+			       (unsigned long long) be64_to_cpu(dsb->sb_ifree));
  			printf(_("fdblks: %llu  frext: %llu\n"),
-			       (unsigned long long) be64_to_cpu(a),
-			       (unsigned long long) be64_to_cpu(b));
+			       (unsigned long long) be64_to_cpu(dsb->sb_fdblocks),
+			       (unsigned long long) be64_to_cpu(dsb->sb_frextents));
  		}
  		super_block = 0;
  	} else if (be32_to_cpu(*(__be32 *)(*ptr)) == XFS_AGI_MAGIC) {
Signature · 1 line
2.43.0