#if !CONFIG_EXTENT_FULL
+static struct ext4_extent_header *ext_inode_hdr(struct ext4_inode *inode)
+{
+ return (struct ext4_extent_header *)inode->blocks;
+}
+
+static uint16_t ext_depth(struct ext4_inode *inode)
+{
+ return to_le16(ext_inode_hdr(inode)->depth);
+}
+
+static struct ext4_extent_tail *
+find_ext4_extent_tail(struct ext4_extent_header *eh)
+{
+ return (struct ext4_extent_tail *)(((char *)eh) +
+ EXT4_EXTENT_TAIL_OFFSET(eh));
+}
+
+#if CONFIG_META_CSUM_ENABLE
+static uint32_t ext4_ext_block_csum(struct ext4_inode_ref *inode_ref,
+ struct ext4_extent_header *eh)
+{
+ uint32_t checksum = 0;
+ struct ext4_sblock *sb = &inode_ref->fs->sb;
+
+ if (ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_METADATA_CSUM)) {
+ uint32_t ino_index = to_le32(inode_ref->index);
+ uint32_t ino_gen =
+ to_le32(ext4_inode_get_generation(inode_ref->inode));
+ /* First calculate crc32 checksum against fs uuid */
+ checksum = ext4_crc32c(EXT4_CRC32_INIT, sb->uuid,
+ sizeof(sb->uuid));
+ /* Then calculate crc32 checksum against inode number
+ * and inode generation */
+ checksum = ext4_crc32c(checksum, &ino_index,
+ sizeof(ino_index));
+ checksum = ext4_crc32c(checksum, &ino_gen,
+ sizeof(ino_gen));
+ /* Finally calculate crc32 checksum against
+ * the entire extent block up to the checksum field */
+ checksum = ext4_crc32c(checksum, eh,
+ EXT4_EXTENT_TAIL_OFFSET(eh));
+ }
+ return checksum;
+}
+#else
+#define ext4_ext_block_csum(...) 0
+#endif
+
+static void ext4_extent_block_csum_set(struct ext4_inode_ref *inode_ref,
+ struct ext4_extent_header *eh)
+{
+ struct ext4_extent_tail *tail;
+ if (!ext4_sb_feature_ro_com(&inode_ref->fs->sb,
+ EXT4_FRO_COM_METADATA_CSUM))
+ return;
+
+ if (to_le16(eh->depth) < ext_depth(inode_ref->inode)) {
+ tail = find_ext4_extent_tail(eh);
+ tail->et_checksum = to_le32(ext4_ext_block_csum(inode_ref, eh));
+ }
+}
+
+#if CONFIG_META_CSUM_ENABLE
+static bool
+ext4_extent_verify_block_csum(struct ext4_inode_ref *inode_ref,
+ struct ext4_block *block)
+{
+ struct ext4_extent_header *eh;
+ struct ext4_extent_tail *tail;
+ eh = (struct ext4_extent_header *)block->data;
+ if (!ext4_sb_feature_ro_com(&inode_ref->fs->sb,
+ EXT4_FRO_COM_METADATA_CSUM))
+ return true;
+
+ if (to_le16(eh->depth) < ext_depth(inode_ref->inode)) {
+ tail = find_ext4_extent_tail(eh);
+ return tail->et_checksum ==
+ to_le32(ext4_ext_block_csum(inode_ref, eh));
+ }
+
+ return true;
+}
+#else
+#define ext4_extent_verify_block_csum(...) true
+#endif
+
/**@brief Binary search in extent index node.
* @param header Extent header of index node
* @param index Output value - found index will be set here
*extent = l - 1;
}
-static uint32_t ext4_ext_block_csum(struct ext4_inode_ref *inode_ref,
- struct ext4_extent_header *eh)
-{
- uint32_t checksum = 0;
- struct ext4_sblock *sb = &inode_ref->fs->sb;
-
- if (ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_METADATA_CSUM)) {
- uint32_t ino_index = to_le32(inode_ref->index);
- uint32_t ino_gen =
- to_le32(ext4_inode_get_generation(inode_ref->inode));
- /* First calculate crc32 checksum against fs uuid */
- checksum = ext4_crc32c(~0, sb->uuid, sizeof(sb->uuid));
- /* Then calculate crc32 checksum against inode number
- * and inode generation */
- checksum = ext4_crc32c(checksum, &ino_index,
- sizeof(ino_index));
- checksum = ext4_crc32c(checksum, &ino_gen,
- sizeof(ino_gen));
- /* Finally calculate crc32 checksum against
- * the entire extent block up to the checksum field */
- checksum = ext4_crc32c(checksum, eh,
- EXT4_EXTENT_TAIL_OFFSET(eh));
- }
- return checksum;
-}
-
-static struct ext4_extent_header *ext_block_hdr(struct ext4_block *block)
-{
- return (struct ext4_extent_header *)block->data;
-}
-
-static struct ext4_extent_tail *
-find_ext4_extent_tail(struct ext4_extent_header *eh)
-{
- return (struct ext4_extent_tail *)(((char *)eh) +
- EXT4_EXTENT_TAIL_OFFSET(eh));
-}
-
-/*
- * BIG FAT NOTES:
- * Currently we do not verify the checksum of extent
- * (only the case in ext4_extent.c)
- */
-
-static void ext4_extent_block_csum_set(struct ext4_inode_ref *inode_ref,
- struct ext4_extent_header *eh)
-{
- struct ext4_extent_tail *tail;
-
- tail = find_ext4_extent_tail(eh);
- tail->et_checksum = to_le32(ext4_ext_block_csum(inode_ref, eh));
-}
-
/**@brief Get physical block in the extent tree by logical block number.
* There is no need to save path in the tree during this algorithm.
* @param inode_ref I-node to load block from
int rc = ext4_block_get(inode_ref->fs->bdev, &block, child);
if (rc != EOK)
return rc;
+ if (!ext4_extent_verify_block_csum(inode_ref,
+ &block)) {
+ ext4_dbg(DEBUG_EXTENT,
+ DBG_WARN "Extent block checksum failed."
+ "Blocknr: %" PRIu64"\n",
+ child);
+ }
header = (struct ext4_extent_header *)block.data;
}
if (rc != EOK)
goto cleanup;
+ if (!ext4_extent_verify_block_csum(inode_ref,
+ &block)) {
+ ext4_dbg(DEBUG_EXTENT,
+ DBG_WARN "Extent block checksum failed."
+ "Blocknr: %" PRIu64"\n",
+ fblock);
+ }
+
pos++;
eh = (struct ext4_extent_header *)block.data;
if (rc != EOK)
return rc;
+ if (!ext4_extent_verify_block_csum(inode_ref,
+ &block)) {
+ ext4_dbg(DEBUG_EXTENT,
+ DBG_WARN "Extent block checksum failed."
+ "Blocknr: %" PRIu64"\n",
+ fblock);
+ }
+
struct ext4_extent_header *header = (void *)block.data;
if (ext4_extent_header_get_depth(header)) {
}
ext4_extent_header_set_entries_count(path_ptr->header, entries);
- ext4_extent_block_csum_set(inode_ref, ext_block_hdr(&path_ptr->block));
+ ext4_extent_block_csum_set(inode_ref, path_ptr->header);
path_ptr->block.dirty = true;
/* If leaf node is empty, parent entry must be modified */
}
ext4_extent_header_set_entries_count(path_ptr->header, entries);
- ext4_extent_block_csum_set(inode_ref, ext_block_hdr(&path_ptr->block));
+ ext4_extent_block_csum_set(inode_ref, path_ptr->header);
path_ptr->block.dirty = true;
/* Free the node if it is empty */
struct ext4_block block;
rc =
- ext4_block_get(inode_ref->fs->bdev, &block, fblock);
+ ext4_block_get_noread(inode_ref->fs->bdev, &block, fblock);
if (rc != EOK) {
ext4_balloc_free_block(inode_ref, fblock);
return rc;
path_ptr->depth);
ext4_extent_header_set_generation(path_ptr->header, 0);
- ext4_extent_block_csum_set(inode_ref, ext_block_hdr(&path_ptr->block));
+ ext4_extent_block_csum_set(inode_ref, path_ptr->header);
path_ptr->block.dirty = true;
/* Jump to the preceding item */
ext4_extent_header_set_entries_count(path_ptr->header,
entries + 1);
- ext4_extent_block_csum_set(inode_ref, ext_block_hdr(&path_ptr->block));
+ ext4_extent_block_csum_set(inode_ref, path_ptr->header);
path_ptr->block.dirty = true;
/* No more splitting needed */
return rc;
struct ext4_block block;
- rc = ext4_block_get(inode_ref->fs->bdev, &block, new_fblock);
+ rc = ext4_block_get_noread(inode_ref->fs->bdev, &block, new_fblock);
if (rc != EOK)
return rc;
ext4_extent_header_set_max_entries_count(old_root->header,
limit);
- ext4_extent_block_csum_set(inode_ref, ext_block_hdr(&old_root->block));
+ ext4_extent_block_csum_set(inode_ref, old_root->header);
old_root->block.dirty = true;
/* Re-initialize new root metadata */
inode_ref->dirty = true;
}
- ext4_extent_block_csum_set(inode_ref, ext_block_hdr(&path_ptr->block));
+ ext4_extent_block_csum_set(inode_ref, path_ptr->header);
path_ptr->block.dirty = true;
goto finish;
inode_ref->dirty = true;
}
- ext4_extent_block_csum_set(inode_ref, ext_block_hdr(&path_ptr->block));
+ ext4_extent_block_csum_set(inode_ref, path_ptr->header);
path_ptr->block.dirty = true;
goto finish;
inode_ref->dirty = true;
}
- ext4_extent_block_csum_set(inode_ref, ext_block_hdr(&path_ptr->block));
+ ext4_extent_block_csum_set(inode_ref, path_ptr->header);
path_ptr->block.dirty = true;
finish: