[block-cache] Add check_raw() to bcache::validator

block-cache/block_cache.h

@@ -26,12 +26,14 @@ namespace bcache {
 		virtual ~validator() {}
 
 		virtual void check(void const *data, block_address location) const = 0;
+		virtual bool check_raw(void const *data) const = 0;
 		virtual void prepare(void *data, block_address location) const = 0;
 	};
 
 	class noop_validator : public validator {
 	public:
 		void check(void const *data, block_address location) const {}
+		bool check_raw(void const *data) const {return true;}
 		void prepare(void *data, block_address location) const {}
 	};
 

caching/superblock.cc

@@ -292,6 +292,15 @@ namespace validator {
 				throw checksum_error("bad checksum in superblock");
 		}
 
+		virtual bool check_raw(void const *raw) const {
+			superblock_disk const *sbd = reinterpret_cast<superblock_disk const *>(raw);
+			crc32c sum(SUPERBLOCK_CSUM_SEED);
+			sum.append(&sbd->flags, MD_BLOCK_SIZE - sizeof(uint32_t));
+			if (sum.get_sum() != to_cpu<uint32_t>(sbd->csum))
+				return false;
+			return true;
+		}
+
 		virtual void prepare(void *raw, block_address location) const {
 			superblock_disk *sbd = reinterpret_cast<superblock_disk *>(raw);
 			crc32c sum(SUPERBLOCK_CSUM_SEED);

era/superblock.cc

@@ -219,6 +219,15 @@ namespace era_validator {
 				throw checksum_error("bad checksum in superblock");
 		}
 
+		virtual bool check_raw(void const *raw) const {
+			superblock_disk const *sbd = reinterpret_cast<superblock_disk const *>(raw);
+			crc32c sum(SUPERBLOCK_CSUM_SEED);
+			sum.append(&sbd->flags, MD_BLOCK_SIZE - sizeof(uint32_t));
+			if (sum.get_sum() != to_cpu<uint32_t>(sbd->csum))
+				return false;
+			return true;
+		}
+
 		virtual void prepare(void *raw, block_address location) const {
 			superblock_disk *sbd = reinterpret_cast<superblock_disk *>(raw);
 			crc32c sum(SUPERBLOCK_CSUM_SEED);

persistent-data/data-structures/array.h

@@ -43,6 +43,15 @@ namespace persistent_data {
 					throw checksum_error("bad block nr in array block");
 			}
 
+			virtual bool check_raw(void const *raw) const {
+				array_block_disk const *data = reinterpret_cast<array_block_disk const *>(raw);
+				crc32c sum(ARRAY_CSUM_XOR);
+				sum.append(&data->max_entries, MD_BLOCK_SIZE - sizeof(uint32_t));
+				if (sum.get_sum() != to_cpu<uint32_t>(data->csum))
+					return false;
+				return true;
+			}
+
 			virtual void prepare(void *raw, block_address location) const {
 				array_block_disk *data = reinterpret_cast<array_block_disk *>(raw);
 				data->blocknr = to_disk<base::le64, uint64_t>(location);

persistent-data/data-structures/btree.tcc

@@ -32,7 +32,6 @@ namespace {
 	using namespace persistent_data;
 	using namespace btree_detail;
 	using namespace std;
-
 }
 
 //----------------------------------------------------------------

persistent-data/space-maps/disk.cc

@@ -50,6 +50,15 @@ namespace {
 				throw checksum_error("bad block nr in space map bitmap");
 		}
 
+		virtual bool check_raw(void const *raw) const {
+			bitmap_header const *data = reinterpret_cast<bitmap_header const *>(raw);
+			crc32c sum(BITMAP_CSUM_XOR);
+			sum.append(&data->not_used, MD_BLOCK_SIZE - sizeof(uint32_t));
+			if (sum.get_sum() != to_cpu<uint32_t>(data->csum))
+				return false;
+			return true;
+		}
+
 		virtual void prepare(void *raw, block_address location) const {
 			bitmap_header *data = reinterpret_cast<bitmap_header *>(raw);
 			data->blocknr = to_disk<base::le64, uint64_t>(location);
@@ -77,6 +86,15 @@ namespace {
 				throw checksum_error("bad block nr in metadata index block");
 		}
 
+		virtual bool check_raw(void const *raw) const {
+			metadata_index const *mi = reinterpret_cast<metadata_index const *>(raw);
+			crc32c sum(INDEX_CSUM_XOR);
+			sum.append(&mi->padding_, MD_BLOCK_SIZE - sizeof(uint32_t));
+			if (sum.get_sum() != to_cpu<uint32_t>(mi->csum_))
+				return false;
+			return true;
+		}
+
 		virtual void prepare(void *raw, block_address location) const {
 			metadata_index *mi = reinterpret_cast<metadata_index *>(raw);
 			mi->blocknr_ = to_disk<base::le64, uint64_t>(location);

persistent-data/validators.cc

@@ -31,6 +31,16 @@ namespace {
 			}
 		}
 
+		virtual bool check_raw(void const *raw) const {
+			disk_node const *data = reinterpret_cast<disk_node const *>(raw);
+			node_header const *n = &data->header;
+			crc32c sum(BTREE_CSUM_XOR);
+			sum.append(&n->flags, MD_BLOCK_SIZE - sizeof(uint32_t));
+			if (sum.get_sum() != to_cpu<uint32_t>(n->csum))
+				return false;
+			return true;
+		}
+
 		virtual void prepare(void *raw, block_address location) const {
 			disk_node *data = reinterpret_cast<disk_node *>(raw);
 			node_header *n = &data->header;

thin-provisioning/superblock.cc

@@ -98,6 +98,15 @@ namespace {
 			}
 		}
 
+		virtual bool check_raw(void const *raw) const {
+			superblock_disk const *sbd = reinterpret_cast<superblock_disk const *>(raw);
+			crc32c sum(SUPERBLOCK_CSUM_SEED);
+			sum.append(&sbd->flags_, MD_BLOCK_SIZE - sizeof(uint32_t));
+			if (sum.get_sum() != to_cpu<uint32_t>(sbd->csum_))
+				return false;
+			return true;
+		}
+
 		virtual void prepare(void *raw, block_address location) const {
 			superblock_disk *sbd = reinterpret_cast<superblock_disk *>(raw);
 			crc32c sum(SUPERBLOCK_CSUM_SEED);

unit-tests/block_t.cc

@@ -44,6 +44,14 @@ namespace {
  					throw runtime_error("validator check zero");
 		}
 
+		virtual bool check_raw(void const *raw) const {
+			unsigned char const *data = reinterpret_cast<unsigned char const *>(raw);
+			for (unsigned b = 0; b < BlockSize; b++)
+				if (data[b] != 0)
+					return false;
+			return true;
+		}
+
 		virtual void prepare(void *raw, block_address location) const {
 			unsigned char *data = reinterpret_cast<unsigned char *>(raw);
 			for (unsigned b = 0; b < BlockSize; b++)