dm-crypt: switch to using the crc32 library
Subsystems (2)
PATCH 1/1 dm-crypt: switch to using the crc32 library
From: Eric Biggers <[email protected]>
Now that the crc32() library function takes advantage of architecture-specific optimizations, it is unnecessary to go through the crypto API. Just use crc32(). This is much simpler, and it improves performance due to eliminating the crypto API overhead. (However, this only affects the TCW IV mode of dm-crypt, which is a compatibility mode that is rarely used compared to other dm-crypt modes.)
--- drivers/md/Kconfig | 1 + drivers/md/dm-crypt.c | 41 ++++++++++------------------------------- 2 files changed, 11 insertions(+), 31 deletions(-)
drivers/md/Kconfig +1 -0
@@ -265,10 +265,11 @@ config DM_UNSTRIPED config DM_CRYPT tristate "Crypt target support" depends on BLK_DEV_DM depends on (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n) depends on (TRUSTED_KEYS || TRUSTED_KEYS=n) + select CRC32 select CRYPTO select CRYPTO_CBC select CRYPTO_ESSIV help This device-mapper target allows you to create a device that
drivers/md/dm-crypt.c +10 -31
147 lines not on this page · raw message
base-commit: 805ba04cb7ccfc7d72e834ebd796e043142156ba
Signature · 1 line
2.48.1
Quoted 8 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Now that the
crc32()library function takes advantage of architecture-specific optimizations, it is unnecessary to go through the crypto API. Just usecrc32(). This is much simpler, and it improves performance due to eliminating the crypto API overhead. (However, this only affects the TCW IV mode of dm-crypt, which is a compatibility mode that is rarely used compared to other dm-crypt modes.)
Yes, these are only used to be compatible with old TrueCrypt CBC images (except chained ciphers requiring modified CBC mode).
I would like to keep this for the ability to access legacy images, but it should not be used by anything else.
I tested the patch below with the images we have in the cryptsetup testsuite, and it works ok.
So if you want, add
Milan
Quoted 181 lines
Signed-off-by Eric Biggers <[email protected]>--- drivers/md/Kconfig | 1 + drivers/md/dm-crypt.c | 41 ++++++++++------------------------------- 2 files changed, 11 insertions(+), 31 deletions(-)drivers/md/Kconfig +1
-0@@ -265,10 +265,11 @@ config DM_UNSTRIPED config DM_CRYPT tristate "Crypt target support" depends on BLK_DEV_DM depends on (ENCRYPTED_KEYS || ENCRYPTED_KEYS=n) depends on (TRUSTED_KEYS || TRUSTED_KEYS=n) + select CRC32 select CRYPTO select CRYPTO_CBC select CRYPTO_ESSIV help This device-mapper target allows you to create a device thatdrivers/md/dm-crypt.c +10
-31@@ -15,10 +15,11 @@#include <linux/kernel.h> #include <linux/key.h> #include <linux/bio.h> #include <linux/blkdev.h> #include <linux/blk-integrity.h> +#include <linux/crc32.h> #include <linux/mempool.h> #include <linux/slab.h> #include <linux/crypto.h> #include <linux/workqueue.h> #include <linux/kthread.h> @@ -122,11 +123,10 @@ struct iv_lmk_private {u8 *seed; };#define TCW_WHITENING_SIZE 16struct iv_tcw_private { -struct crypto_shash *crc32_tfm;u8 *iv_seed;u8 *whitening; };#define ELEPHANT_MAX_KEY_SIZE 32@@ -604,14 +604,10 @@ static void crypt_iv_tcw_dtr(struct crypt_config *cc)kfree_sensitive (tcw->iv_seed); tcw->iv_seed =NULL ;kfree_sensitive (tcw->whitening); tcw->whitening =NULL ; - -if (tcw->crc32_tfm && !IS_ERR (tcw->crc32_tfm)) -crypto_free_shash (tcw->crc32_tfm); - tcw->crc32_tfm =NULL ; }static int crypt_iv_tcw_ctr (struct crypt_config *cc,struct dm_target *ti,const char *opts) {@@ -625,17 +621,10 @@ static int crypt_iv_tcw_ctr(struct crypt_config *cc, struct dm_target *ti,if (cc->key_size <= (cc->iv_size +TCW_WHITENING_SIZE )) { ti->error ="Wrong key size for TCW" ;return -EINVAL ; } - tcw->crc32_tfm =crypto_alloc_shash ("crc32" ,0 , -CRYPTO_ALG_ALLOCATES_MEMORY ); -if (IS_ERR (tcw->crc32_tfm)) { - ti->error ="Error initializing CRC32 in TCW" ; -return PTR_ERR (tcw->crc32_tfm); - } - tcw->iv_seed =kzalloc (cc->iv_size,GFP_KERNEL ); tcw->whitening =kzalloc (TCW_WHITENING_SIZE ,GFP_KERNEL );if (!tcw->iv_seed || !tcw->whitening) {crypt_iv_tcw_dtr (cc); ti->error ="Error allocating seed storage in TCW" ;@@ -665,85 +654,75 @@ static int crypt_iv_tcw_wipe(struct crypt_config *cc)memset (tcw->whitening,0 ,TCW_WHITENING_SIZE );return 0 ; } -static int crypt_iv_tcw_whitening (struct crypt_config *cc, -struct dm_crypt_request *dmreq, -u8 *data) +static void crypt_iv_tcw_whitening (struct crypt_config *cc, +struct dm_crypt_request *dmreq,u8 *data) {struct iv_tcw_private *tcw = &cc->iv_gen_private.tcw;__le64 sector =cpu_to_le64 (dmreq->iv_sector);u8 buf[TCW_WHITENING_SIZE ]; -SHASH_DESC_ON_STACK (desc, tcw->crc32_tfm); -int i, r; +int i;/* xor whitening with sector number */ crypto_xor_cpy (buf, tcw->whitening, (u8 *)§or,8 );crypto_xor_cpy (&buf[8 ], tcw->whitening +8 , (u8 *)§or,8 );/* calculate crc32 for every 32bit part and xor it */ - desc->tfm = tcw->crc32_tfm; -for (i =0 ; i <4 ; i++) { - r =crypto_shash_digest (desc, &buf[i *4 ],4 , &buf[i *4 ]); -if (r) - goto out; - } +for (i =0 ; i <4 ; i++) +put_unaligned_le32 (crc32 (0 , &buf[i *4 ],4 ), &buf[i *4 ]);crypto_xor (&buf[0 ], &buf[12 ],4 );crypto_xor (&buf[4 ], &buf[8 ],4 );/* apply whitening (8 bytes) to whole sector */ for (i =0 ; i < ((1 <<SECTOR_SHIFT ) /8 ); i++)crypto_xor (data + i *8 , buf,8 ); -out:memzero_explicit (buf,sizeof (buf)); -return r; }static int crypt_iv_tcw_gen (struct crypt_config *cc,u8 *iv,struct dm_crypt_request *dmreq) {struct scatterlist *sg;struct iv_tcw_private *tcw = &cc->iv_gen_private.tcw;__le64 sector =cpu_to_le64 (dmreq->iv_sector);u8 *src; -int r =0 ;/* Remove whitening from ciphertext */ if (bio_data_dir (dmreq->ctx->bio_in) !=WRITE ) { sg =crypt_get_sg_data (cc, dmreq->sg_in); src =kmap_local_page (sg_page (sg)); - r =crypt_iv_tcw_whitening (cc, dmreq, src + sg->offset); +crypt_iv_tcw_whitening (cc, dmreq, src + sg->offset);kunmap_local (src); }/* Calculate IV */ crypto_xor_cpy (iv, tcw->iv_seed, (u8 *)§or,8 );if (cc->iv_size >8 )crypto_xor_cpy (&iv[8 ], tcw->iv_seed +8 , (u8 *)§or, cc->iv_size -8 ); -return r; +return 0 ; }static int crypt_iv_tcw_post (struct crypt_config *cc,u8 *iv,struct dm_crypt_request *dmreq) {struct scatterlist *sg;u8 *dst; -int r;if (bio_data_dir (dmreq->ctx->bio_in) !=WRITE )return 0 ;/* Apply whitening on ciphertext */ sg =crypt_get_sg_data (cc, dmreq->sg_out); dst =kmap_local_page (sg_page (sg)); - r =crypt_iv_tcw_whitening (cc, dmreq, dst + sg->offset); +crypt_iv_tcw_whitening (cc, dmreq, dst + sg->offset);kunmap_local (dst); -return r; +return 0 ; }static int crypt_iv_random_gen (struct crypt_config *cc,u8 *iv,struct dm_crypt_request *dmreq) {base-commit:
805ba04cb7ccfc7d72e834ebd796e043142156ba