* [PATCH v2] xfs_logprint: Fix super block buffer interpretation issue
@ 2024-10-11 7:52 Chi Zhiling
2024-10-11 8:50 ` Christoph Hellwig
2024-10-11 16:36 ` Darrick J. Wong
0 siblings, 2 replies; 4+ messages in thread
From: Chi Zhiling @ 2024-10-11 7:52 UTC (permalink / raw)
To: cem, djwong; +Cc: linux-xfs, linux-kernel, Chi Zhiling
From: Chi Zhiling <chizhiling@kylinos.cn>
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
Suggested-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chi Zhiling <chizhiling@kylinos.cn>
---
logprint/log_misc.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index 8e86ac34..0da92744 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -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) {
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] xfs_logprint: Fix super block buffer interpretation issue
2024-10-11 7:52 [PATCH v2] xfs_logprint: Fix super block buffer interpretation issue Chi Zhiling
@ 2024-10-11 8:50 ` Christoph Hellwig
2024-10-11 16:36 ` Darrick J. Wong
1 sibling, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2024-10-11 8:50 UTC (permalink / raw)
To: Chi Zhiling; +Cc: cem, djwong, linux-xfs, linux-kernel, Chi Zhiling
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] xfs_logprint: Fix super block buffer interpretation issue
2024-10-11 7:52 [PATCH v2] xfs_logprint: Fix super block buffer interpretation issue Chi Zhiling
2024-10-11 8:50 ` Christoph Hellwig
@ 2024-10-11 16:36 ` Darrick J. Wong
2024-10-12 1:13 ` Chi Zhiling
1 sibling, 1 reply; 4+ messages in thread
From: Darrick J. Wong @ 2024-10-11 16:36 UTC (permalink / raw)
To: Chi Zhiling; +Cc: cem, linux-xfs, linux-kernel, Chi Zhiling
On Fri, Oct 11, 2024 at 03:52:53PM +0800, Chi Zhiling wrote:
> From: Chi Zhiling <chizhiling@kylinos.cn>
>
> 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
>
> Suggested-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Chi Zhiling <chizhiling@kylinos.cn>
> ---
> logprint/log_misc.c | 17 +++++------------
> 1 file changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/logprint/log_misc.c b/logprint/log_misc.c
> index 8e86ac34..0da92744 100644
> --- a/logprint/log_misc.c
> +++ b/logprint/log_misc.c
> @@ -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,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
>
> 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) {
> --
> 2.43.0
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] xfs_logprint: Fix super block buffer interpretation issue
2024-10-11 16:36 ` Darrick J. Wong
@ 2024-10-12 1:13 ` Chi Zhiling
0 siblings, 0 replies; 4+ messages in thread
From: Chi Zhiling @ 2024-10-12 1:13 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: cem, linux-xfs, linux-kernel, Chi Zhiling
On 2024/10/12 00:36, Darrick J. Wong wrote:
> On Fri, Oct 11, 2024 at 03:52:53PM +0800, Chi Zhiling wrote:
>> From: Chi Zhiling <chizhiling@kylinos.cn>
>>
>> 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
>>
>> Suggested-by: Darrick J. Wong <djwong@kernel.org>
>> Signed-off-by: Chi Zhiling <chizhiling@kylinos.cn>
>> ---
>> logprint/log_misc.c | 17 +++++------------
>> 1 file changed, 5 insertions(+), 12 deletions(-)
>>
>> diff --git a/logprint/log_misc.c b/logprint/log_misc.c
>> index 8e86ac34..0da92744 100644
>> --- a/logprint/log_misc.c
>> +++ b/logprint/log_misc.c
>> @@ -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
>
> With that fixed,
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
>
> --D
>
>>
>> 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) {
>> --
>> 2.43.0
>>
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-12 1:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-11 7:52 [PATCH v2] xfs_logprint: Fix super block buffer interpretation issue Chi Zhiling
2024-10-11 8:50 ` Christoph Hellwig
2024-10-11 16:36 ` Darrick J. Wong
2024-10-12 1:13 ` Chi Zhiling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox