Loading drivers/md/dm-integrity.c +199 −44 Original line number Diff line number Diff line Loading @@ -224,6 +224,7 @@ struct dm_integrity_c { int failed; struct crypto_shash *internal_shash; struct crypto_ahash *internal_ahash; unsigned int internal_hash_digestsize; struct dm_target *ti; Loading Loading @@ -279,6 +280,9 @@ struct dm_integrity_c { bool fix_hmac; bool legacy_recalculate; mempool_t ahash_req_pool; struct ahash_request *journal_ahash_req; struct alg_spec internal_hash_alg; struct alg_spec journal_crypt_alg; struct alg_spec journal_mac_alg; Loading Loading @@ -328,6 +332,8 @@ struct dm_integrity_io { unsigned payload_len; bool integrity_payload_from_mempool; bool integrity_range_locked; struct ahash_request *ahash_req; }; struct journal_completion { Loading @@ -354,6 +360,7 @@ struct bitmap_block_status { static struct kmem_cache *journal_io_cache; #define JOURNAL_IO_MEMPOOL 32 #define AHASH_MEMPOOL 32 #ifdef DEBUG_PRINT #define DEBUG_print(x, ...) printk(KERN_DEBUG x, ##__VA_ARGS__) Loading Loading @@ -1636,7 +1643,7 @@ static void integrity_end_io(struct bio *bio) dec_in_flight(dio); } static void integrity_sector_checksum(struct dm_integrity_c *ic, sector_t sector, static void integrity_sector_checksum_shash(struct dm_integrity_c *ic, sector_t sector, const char *data, unsigned offset, char *result) { __le64 sector_le = cpu_to_le64(sector); Loading Loading @@ -1689,13 +1696,89 @@ static void integrity_sector_checksum(struct dm_integrity_c *ic, sector_t sector get_random_bytes(result, ic->tag_size); } static void integrity_sector_checksum_ahash(struct dm_integrity_c *ic, struct ahash_request **ahash_req, sector_t sector, struct page *page, unsigned offset, char *result) { __le64 sector_le = cpu_to_le64(sector); struct ahash_request *req; DECLARE_CRYPTO_WAIT(wait); struct scatterlist sg[3], *s = sg; int r; unsigned int digest_size; unsigned int nbytes = 0; might_sleep(); req = *ahash_req; if (unlikely(!req)) { req = mempool_alloc(&ic->ahash_req_pool, GFP_NOIO); *ahash_req = req; } ahash_request_set_tfm(req, ic->internal_ahash); ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_SLEEP, crypto_req_done, &wait); if (ic->sb->flags & cpu_to_le32(SB_FLAG_FIXED_HMAC)) { sg_init_table(sg, 3); sg_set_buf(s, (const __u8 *)&ic->sb->salt, SALT_SIZE); nbytes += SALT_SIZE; s++; } else { sg_init_table(sg, 2); } if (likely(!is_vmalloc_addr(§or_le))) { sg_set_buf(s, §or_le, sizeof(sector_le)); } else { struct page *sec_page = vmalloc_to_page(§or_le); unsigned int sec_off = offset_in_page(§or_le); sg_set_page(s, sec_page, sizeof(sector_le), sec_off); } nbytes += sizeof(sector_le); s++; sg_set_page(s, page, ic->sectors_per_block << SECTOR_SHIFT, offset); nbytes += ic->sectors_per_block << SECTOR_SHIFT; ahash_request_set_crypt(req, sg, result, nbytes); r = crypto_wait_req(crypto_ahash_digest(req), &wait); if (unlikely(r)) { dm_integrity_io_error(ic, "crypto_ahash_digest", r); goto failed; } digest_size = ic->internal_hash_digestsize; if (unlikely(digest_size < ic->tag_size)) memset(result + digest_size, 0, ic->tag_size - digest_size); return; failed: /* this shouldn't happen anyway, the hash functions have no reason to fail */ get_random_bytes(result, ic->tag_size); } static void integrity_sector_checksum(struct dm_integrity_c *ic, struct ahash_request **ahash_req, sector_t sector, const char *data, unsigned offset, char *result) { if (likely(ic->internal_shash != NULL)) integrity_sector_checksum_shash(ic, sector, data, offset, result); else integrity_sector_checksum_ahash(ic, ahash_req, sector, (struct page *)data, offset, result); } static void *integrity_kmap(struct dm_integrity_c *ic, struct page *p) { if (likely(ic->internal_shash != NULL)) return kmap_local_page(p); else return p; } static void integrity_kunmap(struct dm_integrity_c *ic, const void *ptr) { if (likely(ic->internal_shash != NULL)) kunmap_local(ptr); } Loading @@ -1705,7 +1788,10 @@ static void *integrity_identity(struct dm_integrity_c *ic, void *data) BUG_ON(offset_in_page(data)); BUG_ON(!virt_addr_valid(data)); #endif if (likely(ic->internal_shash != NULL)) return data; else return virt_to_page(data); } static noinline void integrity_recheck(struct dm_integrity_io *dio, char *checksum) Loading Loading @@ -1759,7 +1845,7 @@ static noinline void integrity_recheck(struct dm_integrity_io *dio, char *checks goto free_ret; } integrity_sector_checksum(ic, logical_sector, integrity_identity(ic, buffer), buffer_offset, checksum); integrity_sector_checksum(ic, &dio->ahash_req, logical_sector, integrity_identity(ic, buffer), buffer_offset, checksum); r = dm_integrity_rw_tag(ic, checksum, &dio->metadata_block, &dio->metadata_offset, ic->tag_size, TAG_CMP); if (r) { Loading Loading @@ -1863,7 +1949,7 @@ static void integrity_metadata(struct work_struct *w) pos = 0; checksums_ptr = checksums; do { integrity_sector_checksum(ic, sector, mem, bv_copy.bv_offset + pos, checksums_ptr); integrity_sector_checksum(ic, &dio->ahash_req, sector, mem, bv_copy.bv_offset + pos, checksums_ptr); checksums_ptr += ic->tag_size; sectors_to_process -= ic->sectors_per_block; pos += ic->sectors_per_block << SECTOR_SHIFT; Loading Loading @@ -1971,6 +2057,7 @@ static int dm_integrity_map(struct dm_target *ti, struct bio *bio) dio->ic = ic; dio->bi_status = 0; dio->op = bio_op(bio); dio->ahash_req = NULL; if (ic->mode == 'I') { bio->bi_iter.bi_sector = dm_target_offset(ic->ti, bio->bi_iter.bi_sector); Loading Loading @@ -2140,10 +2227,10 @@ static bool __journal_read_write(struct dm_integrity_io *dio, struct bio *bio, if (unlikely(digest_size > ic->tag_size)) { char checksums_onstack[HASH_MAX_DIGESTSIZE]; integrity_sector_checksum(ic, logical_sector, js_page, js_offset, checksums_onstack); integrity_sector_checksum(ic, &dio->ahash_req, logical_sector, js_page, js_offset, checksums_onstack); memcpy(journal_entry_tag(ic, je), checksums_onstack, ic->tag_size); } else integrity_sector_checksum(ic, logical_sector, js_page, js_offset, journal_entry_tag(ic, je)); integrity_sector_checksum(ic, &dio->ahash_req, logical_sector, js_page, js_offset, journal_entry_tag(ic, je)); } journal_entry_set_sector(je, logical_sector); Loading Loading @@ -2519,7 +2606,7 @@ static int dm_integrity_map_inline(struct dm_integrity_io *dio, bool from_map) const char *mem = integrity_kmap(ic, bv.bv_page); if (ic->tag_size < ic->tuple_size) memset(dio->integrity_payload + pos + ic->tag_size, 0, ic->tuple_size - ic->tuple_size); integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, mem, bv.bv_offset, dio->integrity_payload + pos); integrity_sector_checksum(ic, &dio->ahash_req, dio->bio_details.bi_iter.bi_sector, mem, bv.bv_offset, dio->integrity_payload + pos); integrity_kunmap(ic, mem); pos += ic->tuple_size; bio_advance_iter_single(bio, &dio->bio_details.bi_iter, ic->sectors_per_block << SECTOR_SHIFT); Loading Loading @@ -2599,7 +2686,7 @@ static void dm_integrity_inline_recheck(struct work_struct *w) } bio_put(outgoing_bio); integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, integrity_identity(ic, outgoing_data), 0, digest); integrity_sector_checksum(ic, &dio->ahash_req, dio->bio_details.bi_iter.bi_sector, integrity_identity(ic, outgoing_data), 0, digest); if (unlikely(crypto_memneq(digest, dio->integrity_payload, min(ic->internal_hash_digestsize, ic->tag_size)))) { DMERR_LIMIT("%pg: Checksum failed at sector 0x%llx", ic->dev->bdev, dio->bio_details.bi_iter.bi_sector); Loading @@ -2623,39 +2710,67 @@ static void dm_integrity_inline_recheck(struct work_struct *w) bio_endio(bio); } static int dm_integrity_end_io(struct dm_target *ti, struct bio *bio, blk_status_t *status) static inline bool dm_integrity_check(struct dm_integrity_c *ic, struct dm_integrity_io *dio) { struct dm_integrity_c *ic = ti->private; if (ic->mode == 'I') { struct dm_integrity_io *dio = dm_per_bio_data(bio, sizeof(struct dm_integrity_io)); if (dio->op == REQ_OP_READ && likely(*status == BLK_STS_OK)) { struct bio *bio = dm_bio_from_per_bio_data(dio, sizeof(struct dm_integrity_io)); unsigned pos = 0; if (ic->sb->flags & cpu_to_le32(SB_FLAG_RECALCULATING) && unlikely(dio->integrity_range_locked)) goto skip_check; while (dio->bio_details.bi_iter.bi_size) { char digest[HASH_MAX_DIGESTSIZE]; struct bio_vec bv = bio_iter_iovec(bio, dio->bio_details.bi_iter); char *mem = integrity_kmap(ic, bv.bv_page); integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, mem, bv.bv_offset, digest); integrity_sector_checksum(ic, &dio->ahash_req, dio->bio_details.bi_iter.bi_sector, mem, bv.bv_offset, digest); if (unlikely(crypto_memneq(digest, dio->integrity_payload + pos, min(ic->internal_hash_digestsize, ic->tag_size)))) { integrity_kunmap(ic, mem); dm_integrity_free_payload(dio); INIT_WORK(&dio->work, dm_integrity_inline_recheck); queue_work(ic->offload_wq, &dio->work); return DM_ENDIO_INCOMPLETE; return false; } integrity_kunmap(ic, mem); pos += ic->tuple_size; bio_advance_iter_single(bio, &dio->bio_details.bi_iter, ic->sectors_per_block << SECTOR_SHIFT); } return true; } static void dm_integrity_inline_async_check(struct work_struct *w) { struct dm_integrity_io *dio = container_of(w, struct dm_integrity_io, work); struct dm_integrity_c *ic = dio->ic; struct bio *bio = dm_bio_from_per_bio_data(dio, sizeof(struct dm_integrity_io)); if (likely(dm_integrity_check(ic, dio))) bio_endio(bio); } static int dm_integrity_end_io(struct dm_target *ti, struct bio *bio, blk_status_t *status) { struct dm_integrity_c *ic = ti->private; struct dm_integrity_io *dio = dm_per_bio_data(bio, sizeof(struct dm_integrity_io)); if (ic->mode == 'I') { if (dio->op == REQ_OP_READ && likely(*status == BLK_STS_OK) && likely(dio->bio_details.bi_iter.bi_size != 0)) { if (ic->sb->flags & cpu_to_le32(SB_FLAG_RECALCULATING) && unlikely(dio->integrity_range_locked)) goto skip_check; if (likely(ic->internal_shash != NULL)) { if (unlikely(!dm_integrity_check(ic, dio))) return DM_ENDIO_INCOMPLETE; } else { INIT_WORK(&dio->work, dm_integrity_inline_async_check); queue_work(ic->offload_wq, &dio->work); return DM_ENDIO_INCOMPLETE; } } skip_check: dm_integrity_free_payload(dio); if (unlikely(dio->integrity_range_locked)) remove_range(ic, &dio->range); } if (unlikely(dio->ahash_req)) mempool_free(dio->ahash_req, &ic->ahash_req_pool); return DM_ENDIO_DONE; } Loading Loading @@ -2916,7 +3031,7 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned int write_start void *js_page = integrity_identity(ic, (char *)js - offset_in_page(js)); unsigned js_offset = offset_in_page(js); integrity_sector_checksum(ic, sec + ((l - j) << ic->sb->log2_sectors_per_block), integrity_sector_checksum(ic, &ic->journal_ahash_req, sec + ((l - j) << ic->sb->log2_sectors_per_block), js_page, js_offset, test_tag); if (unlikely(crypto_memneq(test_tag, journal_entry_tag(ic, je2), ic->tag_size))) { dm_integrity_io_error(ic, "tag mismatch when replaying journal", -EILSEQ); Loading Loading @@ -3000,6 +3115,7 @@ static void integrity_recalc(struct work_struct *w) size_t recalc_tags_size; u8 *recalc_buffer = NULL; u8 *recalc_tags = NULL; struct ahash_request *ahash_req = NULL; struct dm_integrity_range range; struct dm_io_request io_req; struct dm_io_region io_loc; Loading Loading @@ -3113,7 +3229,7 @@ static void integrity_recalc(struct work_struct *w) void *ptr = recalc_buffer + (i << SECTOR_SHIFT); void *ptr_page = integrity_identity(ic, (char *)ptr - offset_in_page(ptr)); unsigned ptr_offset = offset_in_page(ptr); integrity_sector_checksum(ic, logical_sector + i, ptr_page, ptr_offset, t); integrity_sector_checksum(ic, &ahash_req, logical_sector + i, ptr_page, ptr_offset, t); t += ic->tag_size; } Loading Loading @@ -3157,6 +3273,7 @@ static void integrity_recalc(struct work_struct *w) free_ret: kfree(recalc_buffer); kvfree(recalc_tags); mempool_free(ahash_req, &ic->ahash_req_pool); } static void integrity_recalc_inline(struct work_struct *w) Loading @@ -3165,6 +3282,7 @@ static void integrity_recalc_inline(struct work_struct *w) size_t recalc_tags_size; u8 *recalc_buffer = NULL; u8 *recalc_tags = NULL; struct ahash_request *ahash_req = NULL; struct dm_integrity_range range; struct bio *bio; struct bio_integrity_payload *bip; Loading Loading @@ -3237,7 +3355,7 @@ static void integrity_recalc_inline(struct work_struct *w) void *ptr_page = integrity_identity(ic, (char *)ptr - offset_in_page(ptr)); unsigned ptr_offset = offset_in_page(ptr); memset(t, 0, ic->tuple_size); integrity_sector_checksum(ic, range.logical_sector + i, ptr_page, ptr_offset, t); integrity_sector_checksum(ic, &ahash_req, range.logical_sector + i, ptr_page, ptr_offset, t); t += ic->tuple_size; } Loading Loading @@ -3289,6 +3407,7 @@ static void integrity_recalc_inline(struct work_struct *w) free_ret: kfree(recalc_buffer); kfree(recalc_tags); mempool_free(ahash_req, &ic->ahash_req_pool); } static void bitmap_block_work(struct work_struct *w) Loading Loading @@ -4229,27 +4348,49 @@ static int get_alg_and_key(const char *arg, struct alg_spec *a, char **error, ch return -ENOMEM; } static int get_mac(struct crypto_shash **hash, struct alg_spec *a, char **error, char *error_alg, char *error_key) static int get_mac(struct crypto_shash **shash, struct crypto_ahash **ahash, struct alg_spec *a, char **error, char *error_alg, char *error_key) { int r; if (a->alg_string) { *hash = crypto_alloc_shash(a->alg_string, 0, CRYPTO_ALG_ALLOCATES_MEMORY); if (IS_ERR(*hash)) { if (ahash) { *ahash = crypto_alloc_ahash(a->alg_string, 0, CRYPTO_ALG_ALLOCATES_MEMORY); if (IS_ERR(*ahash)) { *ahash = NULL; goto try_shash; } if (a->key) { r = crypto_ahash_setkey(*ahash, a->key, a->key_size); if (r) { *error = error_key; return r; } } else if (crypto_ahash_get_flags(*ahash) & CRYPTO_TFM_NEED_KEY) { *error = error_key; return -ENOKEY; } return 0; } try_shash: *shash = crypto_alloc_shash(a->alg_string, 0, CRYPTO_ALG_ALLOCATES_MEMORY); if (IS_ERR(*shash)) { *error = error_alg; r = PTR_ERR(*hash); *hash = NULL; r = PTR_ERR(*shash); *shash = NULL; return r; } if (a->key) { r = crypto_shash_setkey(*hash, a->key, a->key_size); r = crypto_shash_setkey(*shash, a->key, a->key_size); if (r) { *error = error_key; return r; } } else if (crypto_shash_get_flags(*hash) & CRYPTO_TFM_NEED_KEY) { } else if (crypto_shash_get_flags(*shash) & CRYPTO_TFM_NEED_KEY) { *error = error_key; return -ENOKEY; } Loading Loading @@ -4709,7 +4850,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv buffer_sectors = 1; ic->log2_buffer_sectors = min((int)__fls(buffer_sectors), 31 - SECTOR_SHIFT); r = get_mac(&ic->internal_shash, &ic->internal_hash_alg, &ti->error, r = get_mac(&ic->internal_shash, &ic->internal_ahash, &ic->internal_hash_alg, &ti->error, "Invalid internal hash", "Error setting internal hash key"); if (r) goto bad; Loading @@ -4717,8 +4858,18 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv ic->internal_hash = true; ic->internal_hash_digestsize = crypto_shash_digestsize(ic->internal_shash); } if (ic->internal_ahash) { ic->internal_hash = true; ic->internal_hash_digestsize = crypto_ahash_digestsize(ic->internal_ahash); r = mempool_init_kmalloc_pool(&ic->ahash_req_pool, AHASH_MEMPOOL, sizeof(struct ahash_request) + crypto_ahash_reqsize(ic->internal_ahash)); if (r) { ti->error = "Cannot allocate mempool"; goto bad; } } r = get_mac(&ic->journal_mac, &ic->journal_mac_alg, &ti->error, r = get_mac(&ic->journal_mac, NULL, &ic->journal_mac_alg, &ti->error, "Invalid journal mac", "Error setting journal mac key"); if (r) goto bad; Loading Loading @@ -5201,6 +5352,8 @@ static void dm_integrity_dtr(struct dm_target *ti) kvfree(ic->bbs); if (ic->bufio) dm_bufio_client_destroy(ic->bufio); mempool_free(ic->journal_ahash_req, &ic->ahash_req_pool); mempool_exit(&ic->ahash_req_pool); bioset_exit(&ic->recalc_bios); bioset_exit(&ic->recheck_bios); mempool_exit(&ic->recheck_pool); Loading Loading @@ -5240,6 +5393,8 @@ static void dm_integrity_dtr(struct dm_target *ti) if (ic->internal_shash) crypto_free_shash(ic->internal_shash); if (ic->internal_ahash) crypto_free_ahash(ic->internal_ahash); free_alg(&ic->internal_hash_alg); if (ic->journal_crypt) Loading @@ -5256,7 +5411,7 @@ static void dm_integrity_dtr(struct dm_target *ti) static struct target_type integrity_target = { .name = "integrity", .version = {1, 13, 0}, .version = {1, 14, 0}, .module = THIS_MODULE, .features = DM_TARGET_SINGLETON | DM_TARGET_INTEGRITY, .ctr = dm_integrity_ctr, Loading Loading
drivers/md/dm-integrity.c +199 −44 Original line number Diff line number Diff line Loading @@ -224,6 +224,7 @@ struct dm_integrity_c { int failed; struct crypto_shash *internal_shash; struct crypto_ahash *internal_ahash; unsigned int internal_hash_digestsize; struct dm_target *ti; Loading Loading @@ -279,6 +280,9 @@ struct dm_integrity_c { bool fix_hmac; bool legacy_recalculate; mempool_t ahash_req_pool; struct ahash_request *journal_ahash_req; struct alg_spec internal_hash_alg; struct alg_spec journal_crypt_alg; struct alg_spec journal_mac_alg; Loading Loading @@ -328,6 +332,8 @@ struct dm_integrity_io { unsigned payload_len; bool integrity_payload_from_mempool; bool integrity_range_locked; struct ahash_request *ahash_req; }; struct journal_completion { Loading @@ -354,6 +360,7 @@ struct bitmap_block_status { static struct kmem_cache *journal_io_cache; #define JOURNAL_IO_MEMPOOL 32 #define AHASH_MEMPOOL 32 #ifdef DEBUG_PRINT #define DEBUG_print(x, ...) printk(KERN_DEBUG x, ##__VA_ARGS__) Loading Loading @@ -1636,7 +1643,7 @@ static void integrity_end_io(struct bio *bio) dec_in_flight(dio); } static void integrity_sector_checksum(struct dm_integrity_c *ic, sector_t sector, static void integrity_sector_checksum_shash(struct dm_integrity_c *ic, sector_t sector, const char *data, unsigned offset, char *result) { __le64 sector_le = cpu_to_le64(sector); Loading Loading @@ -1689,13 +1696,89 @@ static void integrity_sector_checksum(struct dm_integrity_c *ic, sector_t sector get_random_bytes(result, ic->tag_size); } static void integrity_sector_checksum_ahash(struct dm_integrity_c *ic, struct ahash_request **ahash_req, sector_t sector, struct page *page, unsigned offset, char *result) { __le64 sector_le = cpu_to_le64(sector); struct ahash_request *req; DECLARE_CRYPTO_WAIT(wait); struct scatterlist sg[3], *s = sg; int r; unsigned int digest_size; unsigned int nbytes = 0; might_sleep(); req = *ahash_req; if (unlikely(!req)) { req = mempool_alloc(&ic->ahash_req_pool, GFP_NOIO); *ahash_req = req; } ahash_request_set_tfm(req, ic->internal_ahash); ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_SLEEP, crypto_req_done, &wait); if (ic->sb->flags & cpu_to_le32(SB_FLAG_FIXED_HMAC)) { sg_init_table(sg, 3); sg_set_buf(s, (const __u8 *)&ic->sb->salt, SALT_SIZE); nbytes += SALT_SIZE; s++; } else { sg_init_table(sg, 2); } if (likely(!is_vmalloc_addr(§or_le))) { sg_set_buf(s, §or_le, sizeof(sector_le)); } else { struct page *sec_page = vmalloc_to_page(§or_le); unsigned int sec_off = offset_in_page(§or_le); sg_set_page(s, sec_page, sizeof(sector_le), sec_off); } nbytes += sizeof(sector_le); s++; sg_set_page(s, page, ic->sectors_per_block << SECTOR_SHIFT, offset); nbytes += ic->sectors_per_block << SECTOR_SHIFT; ahash_request_set_crypt(req, sg, result, nbytes); r = crypto_wait_req(crypto_ahash_digest(req), &wait); if (unlikely(r)) { dm_integrity_io_error(ic, "crypto_ahash_digest", r); goto failed; } digest_size = ic->internal_hash_digestsize; if (unlikely(digest_size < ic->tag_size)) memset(result + digest_size, 0, ic->tag_size - digest_size); return; failed: /* this shouldn't happen anyway, the hash functions have no reason to fail */ get_random_bytes(result, ic->tag_size); } static void integrity_sector_checksum(struct dm_integrity_c *ic, struct ahash_request **ahash_req, sector_t sector, const char *data, unsigned offset, char *result) { if (likely(ic->internal_shash != NULL)) integrity_sector_checksum_shash(ic, sector, data, offset, result); else integrity_sector_checksum_ahash(ic, ahash_req, sector, (struct page *)data, offset, result); } static void *integrity_kmap(struct dm_integrity_c *ic, struct page *p) { if (likely(ic->internal_shash != NULL)) return kmap_local_page(p); else return p; } static void integrity_kunmap(struct dm_integrity_c *ic, const void *ptr) { if (likely(ic->internal_shash != NULL)) kunmap_local(ptr); } Loading @@ -1705,7 +1788,10 @@ static void *integrity_identity(struct dm_integrity_c *ic, void *data) BUG_ON(offset_in_page(data)); BUG_ON(!virt_addr_valid(data)); #endif if (likely(ic->internal_shash != NULL)) return data; else return virt_to_page(data); } static noinline void integrity_recheck(struct dm_integrity_io *dio, char *checksum) Loading Loading @@ -1759,7 +1845,7 @@ static noinline void integrity_recheck(struct dm_integrity_io *dio, char *checks goto free_ret; } integrity_sector_checksum(ic, logical_sector, integrity_identity(ic, buffer), buffer_offset, checksum); integrity_sector_checksum(ic, &dio->ahash_req, logical_sector, integrity_identity(ic, buffer), buffer_offset, checksum); r = dm_integrity_rw_tag(ic, checksum, &dio->metadata_block, &dio->metadata_offset, ic->tag_size, TAG_CMP); if (r) { Loading Loading @@ -1863,7 +1949,7 @@ static void integrity_metadata(struct work_struct *w) pos = 0; checksums_ptr = checksums; do { integrity_sector_checksum(ic, sector, mem, bv_copy.bv_offset + pos, checksums_ptr); integrity_sector_checksum(ic, &dio->ahash_req, sector, mem, bv_copy.bv_offset + pos, checksums_ptr); checksums_ptr += ic->tag_size; sectors_to_process -= ic->sectors_per_block; pos += ic->sectors_per_block << SECTOR_SHIFT; Loading Loading @@ -1971,6 +2057,7 @@ static int dm_integrity_map(struct dm_target *ti, struct bio *bio) dio->ic = ic; dio->bi_status = 0; dio->op = bio_op(bio); dio->ahash_req = NULL; if (ic->mode == 'I') { bio->bi_iter.bi_sector = dm_target_offset(ic->ti, bio->bi_iter.bi_sector); Loading Loading @@ -2140,10 +2227,10 @@ static bool __journal_read_write(struct dm_integrity_io *dio, struct bio *bio, if (unlikely(digest_size > ic->tag_size)) { char checksums_onstack[HASH_MAX_DIGESTSIZE]; integrity_sector_checksum(ic, logical_sector, js_page, js_offset, checksums_onstack); integrity_sector_checksum(ic, &dio->ahash_req, logical_sector, js_page, js_offset, checksums_onstack); memcpy(journal_entry_tag(ic, je), checksums_onstack, ic->tag_size); } else integrity_sector_checksum(ic, logical_sector, js_page, js_offset, journal_entry_tag(ic, je)); integrity_sector_checksum(ic, &dio->ahash_req, logical_sector, js_page, js_offset, journal_entry_tag(ic, je)); } journal_entry_set_sector(je, logical_sector); Loading Loading @@ -2519,7 +2606,7 @@ static int dm_integrity_map_inline(struct dm_integrity_io *dio, bool from_map) const char *mem = integrity_kmap(ic, bv.bv_page); if (ic->tag_size < ic->tuple_size) memset(dio->integrity_payload + pos + ic->tag_size, 0, ic->tuple_size - ic->tuple_size); integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, mem, bv.bv_offset, dio->integrity_payload + pos); integrity_sector_checksum(ic, &dio->ahash_req, dio->bio_details.bi_iter.bi_sector, mem, bv.bv_offset, dio->integrity_payload + pos); integrity_kunmap(ic, mem); pos += ic->tuple_size; bio_advance_iter_single(bio, &dio->bio_details.bi_iter, ic->sectors_per_block << SECTOR_SHIFT); Loading Loading @@ -2599,7 +2686,7 @@ static void dm_integrity_inline_recheck(struct work_struct *w) } bio_put(outgoing_bio); integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, integrity_identity(ic, outgoing_data), 0, digest); integrity_sector_checksum(ic, &dio->ahash_req, dio->bio_details.bi_iter.bi_sector, integrity_identity(ic, outgoing_data), 0, digest); if (unlikely(crypto_memneq(digest, dio->integrity_payload, min(ic->internal_hash_digestsize, ic->tag_size)))) { DMERR_LIMIT("%pg: Checksum failed at sector 0x%llx", ic->dev->bdev, dio->bio_details.bi_iter.bi_sector); Loading @@ -2623,39 +2710,67 @@ static void dm_integrity_inline_recheck(struct work_struct *w) bio_endio(bio); } static int dm_integrity_end_io(struct dm_target *ti, struct bio *bio, blk_status_t *status) static inline bool dm_integrity_check(struct dm_integrity_c *ic, struct dm_integrity_io *dio) { struct dm_integrity_c *ic = ti->private; if (ic->mode == 'I') { struct dm_integrity_io *dio = dm_per_bio_data(bio, sizeof(struct dm_integrity_io)); if (dio->op == REQ_OP_READ && likely(*status == BLK_STS_OK)) { struct bio *bio = dm_bio_from_per_bio_data(dio, sizeof(struct dm_integrity_io)); unsigned pos = 0; if (ic->sb->flags & cpu_to_le32(SB_FLAG_RECALCULATING) && unlikely(dio->integrity_range_locked)) goto skip_check; while (dio->bio_details.bi_iter.bi_size) { char digest[HASH_MAX_DIGESTSIZE]; struct bio_vec bv = bio_iter_iovec(bio, dio->bio_details.bi_iter); char *mem = integrity_kmap(ic, bv.bv_page); integrity_sector_checksum(ic, dio->bio_details.bi_iter.bi_sector, mem, bv.bv_offset, digest); integrity_sector_checksum(ic, &dio->ahash_req, dio->bio_details.bi_iter.bi_sector, mem, bv.bv_offset, digest); if (unlikely(crypto_memneq(digest, dio->integrity_payload + pos, min(ic->internal_hash_digestsize, ic->tag_size)))) { integrity_kunmap(ic, mem); dm_integrity_free_payload(dio); INIT_WORK(&dio->work, dm_integrity_inline_recheck); queue_work(ic->offload_wq, &dio->work); return DM_ENDIO_INCOMPLETE; return false; } integrity_kunmap(ic, mem); pos += ic->tuple_size; bio_advance_iter_single(bio, &dio->bio_details.bi_iter, ic->sectors_per_block << SECTOR_SHIFT); } return true; } static void dm_integrity_inline_async_check(struct work_struct *w) { struct dm_integrity_io *dio = container_of(w, struct dm_integrity_io, work); struct dm_integrity_c *ic = dio->ic; struct bio *bio = dm_bio_from_per_bio_data(dio, sizeof(struct dm_integrity_io)); if (likely(dm_integrity_check(ic, dio))) bio_endio(bio); } static int dm_integrity_end_io(struct dm_target *ti, struct bio *bio, blk_status_t *status) { struct dm_integrity_c *ic = ti->private; struct dm_integrity_io *dio = dm_per_bio_data(bio, sizeof(struct dm_integrity_io)); if (ic->mode == 'I') { if (dio->op == REQ_OP_READ && likely(*status == BLK_STS_OK) && likely(dio->bio_details.bi_iter.bi_size != 0)) { if (ic->sb->flags & cpu_to_le32(SB_FLAG_RECALCULATING) && unlikely(dio->integrity_range_locked)) goto skip_check; if (likely(ic->internal_shash != NULL)) { if (unlikely(!dm_integrity_check(ic, dio))) return DM_ENDIO_INCOMPLETE; } else { INIT_WORK(&dio->work, dm_integrity_inline_async_check); queue_work(ic->offload_wq, &dio->work); return DM_ENDIO_INCOMPLETE; } } skip_check: dm_integrity_free_payload(dio); if (unlikely(dio->integrity_range_locked)) remove_range(ic, &dio->range); } if (unlikely(dio->ahash_req)) mempool_free(dio->ahash_req, &ic->ahash_req_pool); return DM_ENDIO_DONE; } Loading Loading @@ -2916,7 +3031,7 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned int write_start void *js_page = integrity_identity(ic, (char *)js - offset_in_page(js)); unsigned js_offset = offset_in_page(js); integrity_sector_checksum(ic, sec + ((l - j) << ic->sb->log2_sectors_per_block), integrity_sector_checksum(ic, &ic->journal_ahash_req, sec + ((l - j) << ic->sb->log2_sectors_per_block), js_page, js_offset, test_tag); if (unlikely(crypto_memneq(test_tag, journal_entry_tag(ic, je2), ic->tag_size))) { dm_integrity_io_error(ic, "tag mismatch when replaying journal", -EILSEQ); Loading Loading @@ -3000,6 +3115,7 @@ static void integrity_recalc(struct work_struct *w) size_t recalc_tags_size; u8 *recalc_buffer = NULL; u8 *recalc_tags = NULL; struct ahash_request *ahash_req = NULL; struct dm_integrity_range range; struct dm_io_request io_req; struct dm_io_region io_loc; Loading Loading @@ -3113,7 +3229,7 @@ static void integrity_recalc(struct work_struct *w) void *ptr = recalc_buffer + (i << SECTOR_SHIFT); void *ptr_page = integrity_identity(ic, (char *)ptr - offset_in_page(ptr)); unsigned ptr_offset = offset_in_page(ptr); integrity_sector_checksum(ic, logical_sector + i, ptr_page, ptr_offset, t); integrity_sector_checksum(ic, &ahash_req, logical_sector + i, ptr_page, ptr_offset, t); t += ic->tag_size; } Loading Loading @@ -3157,6 +3273,7 @@ static void integrity_recalc(struct work_struct *w) free_ret: kfree(recalc_buffer); kvfree(recalc_tags); mempool_free(ahash_req, &ic->ahash_req_pool); } static void integrity_recalc_inline(struct work_struct *w) Loading @@ -3165,6 +3282,7 @@ static void integrity_recalc_inline(struct work_struct *w) size_t recalc_tags_size; u8 *recalc_buffer = NULL; u8 *recalc_tags = NULL; struct ahash_request *ahash_req = NULL; struct dm_integrity_range range; struct bio *bio; struct bio_integrity_payload *bip; Loading Loading @@ -3237,7 +3355,7 @@ static void integrity_recalc_inline(struct work_struct *w) void *ptr_page = integrity_identity(ic, (char *)ptr - offset_in_page(ptr)); unsigned ptr_offset = offset_in_page(ptr); memset(t, 0, ic->tuple_size); integrity_sector_checksum(ic, range.logical_sector + i, ptr_page, ptr_offset, t); integrity_sector_checksum(ic, &ahash_req, range.logical_sector + i, ptr_page, ptr_offset, t); t += ic->tuple_size; } Loading Loading @@ -3289,6 +3407,7 @@ static void integrity_recalc_inline(struct work_struct *w) free_ret: kfree(recalc_buffer); kfree(recalc_tags); mempool_free(ahash_req, &ic->ahash_req_pool); } static void bitmap_block_work(struct work_struct *w) Loading Loading @@ -4229,27 +4348,49 @@ static int get_alg_and_key(const char *arg, struct alg_spec *a, char **error, ch return -ENOMEM; } static int get_mac(struct crypto_shash **hash, struct alg_spec *a, char **error, char *error_alg, char *error_key) static int get_mac(struct crypto_shash **shash, struct crypto_ahash **ahash, struct alg_spec *a, char **error, char *error_alg, char *error_key) { int r; if (a->alg_string) { *hash = crypto_alloc_shash(a->alg_string, 0, CRYPTO_ALG_ALLOCATES_MEMORY); if (IS_ERR(*hash)) { if (ahash) { *ahash = crypto_alloc_ahash(a->alg_string, 0, CRYPTO_ALG_ALLOCATES_MEMORY); if (IS_ERR(*ahash)) { *ahash = NULL; goto try_shash; } if (a->key) { r = crypto_ahash_setkey(*ahash, a->key, a->key_size); if (r) { *error = error_key; return r; } } else if (crypto_ahash_get_flags(*ahash) & CRYPTO_TFM_NEED_KEY) { *error = error_key; return -ENOKEY; } return 0; } try_shash: *shash = crypto_alloc_shash(a->alg_string, 0, CRYPTO_ALG_ALLOCATES_MEMORY); if (IS_ERR(*shash)) { *error = error_alg; r = PTR_ERR(*hash); *hash = NULL; r = PTR_ERR(*shash); *shash = NULL; return r; } if (a->key) { r = crypto_shash_setkey(*hash, a->key, a->key_size); r = crypto_shash_setkey(*shash, a->key, a->key_size); if (r) { *error = error_key; return r; } } else if (crypto_shash_get_flags(*hash) & CRYPTO_TFM_NEED_KEY) { } else if (crypto_shash_get_flags(*shash) & CRYPTO_TFM_NEED_KEY) { *error = error_key; return -ENOKEY; } Loading Loading @@ -4709,7 +4850,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv buffer_sectors = 1; ic->log2_buffer_sectors = min((int)__fls(buffer_sectors), 31 - SECTOR_SHIFT); r = get_mac(&ic->internal_shash, &ic->internal_hash_alg, &ti->error, r = get_mac(&ic->internal_shash, &ic->internal_ahash, &ic->internal_hash_alg, &ti->error, "Invalid internal hash", "Error setting internal hash key"); if (r) goto bad; Loading @@ -4717,8 +4858,18 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned int argc, char **argv ic->internal_hash = true; ic->internal_hash_digestsize = crypto_shash_digestsize(ic->internal_shash); } if (ic->internal_ahash) { ic->internal_hash = true; ic->internal_hash_digestsize = crypto_ahash_digestsize(ic->internal_ahash); r = mempool_init_kmalloc_pool(&ic->ahash_req_pool, AHASH_MEMPOOL, sizeof(struct ahash_request) + crypto_ahash_reqsize(ic->internal_ahash)); if (r) { ti->error = "Cannot allocate mempool"; goto bad; } } r = get_mac(&ic->journal_mac, &ic->journal_mac_alg, &ti->error, r = get_mac(&ic->journal_mac, NULL, &ic->journal_mac_alg, &ti->error, "Invalid journal mac", "Error setting journal mac key"); if (r) goto bad; Loading Loading @@ -5201,6 +5352,8 @@ static void dm_integrity_dtr(struct dm_target *ti) kvfree(ic->bbs); if (ic->bufio) dm_bufio_client_destroy(ic->bufio); mempool_free(ic->journal_ahash_req, &ic->ahash_req_pool); mempool_exit(&ic->ahash_req_pool); bioset_exit(&ic->recalc_bios); bioset_exit(&ic->recheck_bios); mempool_exit(&ic->recheck_pool); Loading Loading @@ -5240,6 +5393,8 @@ static void dm_integrity_dtr(struct dm_target *ti) if (ic->internal_shash) crypto_free_shash(ic->internal_shash); if (ic->internal_ahash) crypto_free_ahash(ic->internal_ahash); free_alg(&ic->internal_hash_alg); if (ic->journal_crypt) Loading @@ -5256,7 +5411,7 @@ static void dm_integrity_dtr(struct dm_target *ti) static struct target_type integrity_target = { .name = "integrity", .version = {1, 13, 0}, .version = {1, 14, 0}, .module = THIS_MODULE, .features = DM_TARGET_SINGLETON | DM_TARGET_INTEGRITY, .ctr = dm_integrity_ctr, Loading