From: "Dāvis Mosāns" <davispuh@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: "Dāvis Mosāns" <davispuh@gmail.com>
Subject: [PATCH] btrfs-progs: Fix checksum output for "checksum verify failed"
Date: Sat, 27 Feb 2021 22:07:02 +0200 [thread overview]
Message-ID: <20210227200702.11977-1-davispuh@gmail.com> (raw)
Currently only single checksum byte is outputted.
This fixes it so that full checksum is outputted.
Signed-off-by: Dāvis Mosāns <davispuh@gmail.com>
---
kernel-shared/disk-io.c | 47 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 42 insertions(+), 5 deletions(-)
diff --git a/kernel-shared/disk-io.c b/kernel-shared/disk-io.c
index 6f584986..8773eed7 100644
--- a/kernel-shared/disk-io.c
+++ b/kernel-shared/disk-io.c
@@ -160,10 +160,45 @@ int btrfs_csum_data(u16 csum_type, const u8 *data, u8 *out, size_t len)
return -1;
}
+int btrfs_format_csum(u16 csum_type, const char *data, char *output)
+{
+ int i;
+ int csum_len = 0;
+ int position = 0;
+ int direction = 1;
+ switch (csum_type) {
+ case BTRFS_CSUM_TYPE_CRC32:
+ csum_len = 4;
+ position = csum_len - 1;
+ direction = -1;
+ break;
+ case BTRFS_CSUM_TYPE_XXHASH:
+ csum_len = 8;
+ position = csum_len - 1;
+ direction = -1;
+ break;
+ case BTRFS_CSUM_TYPE_SHA256:
+ case BTRFS_CSUM_TYPE_BLAKE2:
+ csum_len = 32;
+ break;
+ default:
+ fprintf(stderr, "ERROR: unknown csum type: %d\n", csum_type);
+ ASSERT(0);
+ }
+
+ for (i = 0; i < csum_len; i++) {
+ sprintf(output + i*2, "%02X", data[position + i*direction] & 0xFF);
+ }
+
+ return csum_len;
+}
+
static int __csum_tree_block_size(struct extent_buffer *buf, u16 csum_size,
int verify, int silent, u16 csum_type)
{
u8 result[BTRFS_CSUM_SIZE];
+ char found[BTRFS_CSUM_SIZE * 2 + 1]; // 2 hex chars for each byte + null
+ char expected[BTRFS_CSUM_SIZE * 2 + 1];
u32 len;
len = buf->len - BTRFS_CSUM_SIZE;
@@ -172,12 +207,14 @@ static int __csum_tree_block_size(struct extent_buffer *buf, u16 csum_size,
if (verify) {
if (memcmp_extent_buffer(buf, result, 0, csum_size)) {
- /* FIXME: format */
- if (!silent)
- printk("checksum verify failed on %llu found %08X wanted %08X\n",
+ if (!silent) {
+ btrfs_format_csum(csum_type, (char *)result, found);
+ btrfs_format_csum(csum_type, buf->data, expected);
+ printk("checksum verify failed on %llu found %s wanted %s\n",
(unsigned long long)buf->start,
- result[0],
- buf->data[0]);
+ found,
+ expected);
+ }
return 1;
}
} else {
--
2.30.1
next reply other threads:[~2021-02-27 20:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-27 20:07 Dāvis Mosāns [this message]
2021-03-02 14:17 ` [PATCH] btrfs-progs: Fix checksum output for "checksum verify failed" David Sterba
2021-03-03 19:39 ` Dāvis Mosāns
2021-03-05 16:10 ` David Sterba
2021-03-03 19:18 ` [PATCH v2] " Dāvis Mosāns
2021-03-05 16:30 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210227200702.11977-1-davispuh@gmail.com \
--to=davispuh@gmail.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).