All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Thumshirn <jthumshirn@suse.de>
To: David Sterba <dsterba@suse.com>
Cc: Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>,
	Chris Mason <clm@fb.com>, Richard Weinberger <richard@nod.at>,
	David Gstir <david@sigma-star.at>,
	Nikolay Borisov <nborisov@suse.com>,
	Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH v4 07/13] btrfs: add common checksum type validation
Date: Mon,  3 Jun 2019 16:58:53 +0200	[thread overview]
Message-ID: <20190603145859.7176-8-jthumshirn@suse.de> (raw)
In-Reply-To: <20190603145859.7176-1-jthumshirn@suse.de>

Currently btrfs is only supporting CRC32C as checksumming algorithm. As
this is about to change provide a function to validate the checksum type in
the superblock against all possible algorithms.

This makes adding new algorithms easier as there are fewer places to adjust
when adding new algorithms.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>

---
Changes to v3:
- Fix callers of btrfs_supported_csum() (David)
Changes to v2:
- Only pass csum_type into btrfs_supported_csum() (David)
- Directly return in btrfs_check_super_csum() (David)
---
 fs/btrfs/disk-io.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 663efce22d98..c2aba3dc33c5 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -356,6 +356,16 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
 	return ret;
 }
 
+static bool btrfs_supported_super_csum(u16 csum_type)
+{
+	switch (csum_type) {
+	case BTRFS_CSUM_TYPE_CRC32:
+		return true;
+	default:
+		return false;
+	}
+}
+
 /*
  * Return 0 if the superblock checksum type matches the checksum value of that
  * algorithm. Pass the raw disk superblock data.
@@ -366,7 +376,12 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info,
 	struct btrfs_super_block *disk_sb =
 		(struct btrfs_super_block *)raw_disk_sb;
 	u16 csum_type = btrfs_super_csum_type(disk_sb);
-	int ret = 0;
+
+	if (!btrfs_supported_super_csum(csum_type)) {
+		btrfs_err(fs_info, "unsupported checksum algorithm %u",
+			  csum_type);
+		return 1;
+	}
 
 	if (csum_type == BTRFS_CSUM_TYPE_CRC32) {
 		u32 crc = ~(u32)0;
@@ -382,16 +397,10 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info,
 		btrfs_csum_final(crc, result);
 
 		if (memcmp(raw_disk_sb, result, sizeof(result)))
-			ret = 1;
+			return 1;
 	}
 
-	if (csum_type >= ARRAY_SIZE(btrfs_csum_sizes)) {
-		btrfs_err(fs_info, "unsupported checksum algorithm %u",
-				csum_type);
-		ret = 1;
-	}
-
-	return ret;
+	return 0;
 }
 
 int btrfs_verify_level_key(struct extent_buffer *eb, int level,
@@ -2577,7 +2586,7 @@ static int btrfs_validate_write_super(struct btrfs_fs_info *fs_info,
 	ret = validate_super(fs_info, sb, -1);
 	if (ret < 0)
 		goto out;
-	if (btrfs_super_csum_type(sb) != BTRFS_CSUM_TYPE_CRC32) {
+	if (!btrfs_supported_super_csum(btrfs_super_csum_type(sb))) {
 		ret = -EUCLEAN;
 		btrfs_err(fs_info, "invalid csum type, has %u want %u",
 			  btrfs_super_csum_type(sb), BTRFS_CSUM_TYPE_CRC32);
-- 
2.16.4


  parent reply	other threads:[~2019-06-03 14:59 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-03 14:58 [PATCH v4 00/13] Add support for other checksums Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 01/13] btrfs: use btrfs_csum_data() instead of directly calling crc32c Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 02/13] btrfs: resurrect btrfs_crc32c() Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 03/13] btrfs: use btrfs_crc32c{,_final}() in for free space cache Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 04/13] btrfs: don't assume ordered sums to be 4 bytes Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 05/13] btrfs: dont assume compressed_bio " Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 06/13] btrfs: format checksums according to type for printing Johannes Thumshirn
2019-06-03 16:13   ` David Sterba
2019-06-03 14:58 ` Johannes Thumshirn [this message]
2019-06-03 14:58 ` [PATCH v4 08/13] btrfs: check for supported superblock checksum type before checksum validation Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 09/13] btrfs: Simplify btrfs_check_super_csum() and get rid of size assumptions Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 10/13] btrfs: add boilerplate code for directly including the crypto framework Johannes Thumshirn
2019-06-03 16:42   ` David Sterba
2019-06-03 14:58 ` [PATCH v4 11/13] btrfs: directly call into crypto framework for checsumming Johannes Thumshirn
2019-06-03 16:50   ` David Sterba
2019-06-03 14:58 ` [PATCH v4 12/13] btrfs: remove assumption about csum type form btrfs_print_data_csum_error() Johannes Thumshirn
2019-06-03 14:58 ` [PATCH v4 13/13] btrfs: add sha256 as another checksum algorithm Johannes Thumshirn
2019-06-03 18:30 ` [PATCH v4 00/13] Add support for other checksums David Sterba
2019-06-03 19:27   ` John Dorminy
2019-06-04  7:37   ` Johannes Thumshirn
2019-06-04  9:15     ` David Sterba
2019-06-04  9:25     ` David Sterba
2019-06-03 19:56 ` waxhead
2019-06-04  7:41   ` Johannes Thumshirn
2019-06-04  9: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=20190603145859.7176-8-jthumshirn@suse.de \
    --to=jthumshirn@suse.de \
    --cc=clm@fb.com \
    --cc=david@sigma-star.at \
    --cc=dsterba@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=nborisov@suse.com \
    --cc=richard@nod.at \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.