: generic scatterwalk
PATCH 2/2 : generic scatterwalk
This patch removes cipher.c/crypt in favour of a more generic function, scatterwalk_walk, which can process an unlimited number of scatterlists in parallel.
For a more in-depth description see the comments in front of scatterwalk_walk and scatterwalk_info_init.
Changes since last patch: rewritten the comments, moved scatterwalk_info_endtag to scatterwalk.c
Andrew, I think this patch is ready to be merged.
crypto/cipher.c +187 -145
@@ -22,7 +22,7 @@typedef void (cryptfn_t )(void *,u8 *,const u8 *);typedef void (procfn_t )(struct crypto_tfm *,u8 *, -u8 *,cryptfn_t ,int enc,void *,int ); +u8 *,cryptfn_t ,int enc,void *,int );static inline void xor_64 (u8 *a,const u8 *b) {
@@ -38,177 +38,219 @@ ((u32 *)a)[3 ] ^= ((u32 *)b)[3 ]; } +static int setkey (struct crypto_tfm *tfm,const u8 *key,unsigned int keylen) +{ +struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher; + +if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize) { + tfm->crt_flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +return -EINVAL ; + }else +return cia->cia_setkey (crypto_tfm_ctx (tfm), key, keylen, + &tfm->crt_flags); +}/* -* Generic encrypt/decrypt wrapper for ciphers, handles operations across -* multiple page boundaries by using temporary blocks. In user context, -* the kernel is given a chance to schedule us once per block. +* Electronic Code Book (ECB) mode implementation */ -static int crypt (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src, -unsigned int nbytes,cryptfn_t crfn, -procfn_t prfn,int enc,void *info) -{ -struct scatter_walk walk_in, walk_out; -const unsigned int bsize =crypto_tfm_alg_blocksize (tfm); -u8 tmp_src[bsize]; -u8 tmp_dst[bsize]; + +struct ecb_process_priv { +struct crypto_tfm *tfm; +cryptfn_t *crfn; +}; + +static int ecb_process_gw (void *priv,int nsg,void **buf) +{ +struct ecb_process_priv *ecb_priv = priv; + ecb_priv->crfn (crypto_tfm_ctx (ecb_priv->tfm), buf[0 ], buf[1 ]); +return 0 ; +} + +static inline int ecb_template (struct crypto_tfm *tfm, +struct scatterlist *dst, +struct scatterlist *src,unsigned int nbytes,cryptfn_t crfn) +{ +int bsize =crypto_tfm_alg_blocksize (tfm); + +struct ecb_process_priv priv = { + .tfm = tfm, + .crfn = crfn, + }; + +struct walk_info ecb_info[3 ]; + +scatterwalk_info_init (ecb_info+0 , dst, bsize, (char [bsize]){}, +SCATTERWALK_IO_OUTPUT ); +scatterwalk_info_init (ecb_info+1 , src, bsize, (char [bsize]){}, +SCATTERWALK_IO_INPUT ); +scatterwalk_info_endtag (ecb_info+2 );if (!nbytes)return 0 ; -if (nbytes % bsize) { tfm->crt_flags |=CRYPTO_TFM_RES_BAD_BLOCK_LEN ;return -EINVAL ; } -scatterwalk_start (&walk_in, src); -scatterwalk_start (&walk_out, dst); - -for (;;) { -u8 *src_p, *dst_p; -int in_place; - -scatterwalk_map (&walk_in,0 ); -scatterwalk_map (&walk_out,1 ); - src_p =scatterwalk_whichbuf (&walk_in, bsize, tmp_src); - dst_p =scatterwalk_whichbuf (&walk_out, bsize, tmp_dst); - in_place =scatterwalk_samebuf (&walk_in, &walk_out, - src_p, dst_p); - - nbytes -= bsize; - -scatterwalk_copychunks (src_p, &walk_in, bsize,0 ); - -prfn (tfm, dst_p, src_p, crfn, enc, info, in_place); - -scatterwalk_done (&walk_in,0 , nbytes); - -scatterwalk_copychunks (dst_p, &walk_out, bsize,1 ); -scatterwalk_done (&walk_out,1 , nbytes); - -if (!nbytes) -return 0 ; +return scatterwalk_walk (ecb_process_gw, &priv, nbytes/bsize, ecb_info); +} -crypto_yield (tfm); - } +static int ecb_encrypt (struct crypto_tfm *tfm, +struct scatterlist *dst, +struct scatterlist *src, +unsigned int nbytes) +{ +return ecb_template (tfm,dst,src,nbytes,tfm->__crt_alg->cra_cipher.cia_encrypt); } -static void cbc_process (struct crypto_tfm *tfm,u8 *dst,u8 *src, -cryptfn_t fn,int enc,void *info,int in_place) +static int ecb_decrypt (struct crypto_tfm *tfm, +struct scatterlist *dst, +struct scatterlist *src, +unsigned int nbytes) { -u8 *iv = info; +return ecb_template (tfm,dst,src,nbytes,tfm->__crt_alg->cra_cipher.cia_decrypt); +} + +/* Cipher Block Chaining (CBC) mode implementation */ + +struct cbc_process_priv { +struct crypto_tfm *tfm; +int enc; +cryptfn_t *crfn; +u8 *curr_iv; +u8 *next_iv; +}; + +static int cbc_process_gw (void *priv,int nsg,void **buf) +{ +struct cbc_process_priv *cbc_priv = priv; +u8 *iv = cbc_priv->curr_iv; +struct crypto_tfm *tfm = cbc_priv->tfm; +int bsize =crypto_tfm_alg_blocksize (tfm); +u8 *dst = buf[0 ]; +u8 *src = buf[1 ];/* Null encryption */ if (!iv) -return ; - -if (enc) { +return 0 ; + +if (cbc_priv->enc ==CRYPTO_DIR_ENCRYPT ) { +/* Encryption can be done in place */ tfm->crt_u.cipher.cit_xor_block (iv, src); -fn (crypto_tfm_ctx (tfm), dst, iv); -memcpy (iv, dst,crypto_tfm_alg_blocksize (tfm)); + cbc_priv->crfn (crypto_tfm_ctx (tfm), dst, iv); +memcpy (iv, dst, bsize); }else { -u8 stack[in_place ?crypto_tfm_alg_blocksize (tfm) :0 ]; -u8 *buf = in_place ? stack : dst; - -fn (crypto_tfm_ctx (tfm), buf, src); - tfm->crt_u.cipher.cit_xor_block (buf, iv); -memcpy (iv, src,crypto_tfm_alg_blocksize (tfm)); -if (buf != dst) -memcpy (dst, buf,crypto_tfm_alg_blocksize (tfm)); +/* Current cipher text in "src" needs to be saved, as +* it's going to be the next iv, exchange IV buffers +* after processing +*/ +memcpy (cbc_priv->next_iv,src,bsize); + cbc_priv->crfn (crypto_tfm_ctx (tfm), dst, src); + tfm->crt_u.cipher.cit_xor_block (dst, iv); + cbc_priv->curr_iv = cbc_priv->next_iv; + cbc_priv->next_iv = iv; } +return 0 ; } -static void ecb_process (struct crypto_tfm *tfm,u8 *dst,u8 *src, -cryptfn_t fn,int enc,void *info,int in_place) -{ -fn (crypto_tfm_ctx (tfm), dst, src); -} -static int setkey (struct crypto_tfm *tfm,const u8 *key,unsigned int keylen) -{ -struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher; - -if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize) { - tfm->crt_flags |=CRYPTO_TFM_RES_BAD_KEY_LEN ; +static int cbc_encrypt_iv (struct crypto_tfm *tfm, +struct scatterlist *dst, +struct scatterlist *src, +unsigned int nbytes,u8 *iv) +{ +int bsize =crypto_tfm_alg_blocksize (tfm); + +struct cbc_process_priv priv = { + .tfm = tfm, + .enc =CRYPTO_DIR_ENCRYPT , + .curr_iv = iv, + .crfn = tfm->__crt_alg->cra_cipher.cia_encrypt + }; + +struct walk_info cbc_info[3 ]; + +if (!nbytes) +return 0 ; +if (nbytes % bsize) { + tfm->crt_flags |=CRYPTO_TFM_RES_BAD_BLOCK_LEN ;return -EINVAL ; - }else -return cia->cia_setkey (crypto_tfm_ctx (tfm), key, keylen, - &tfm->crt_flags); -} + } -static int ecb_encrypt (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src,unsigned int nbytes) -{ -return crypt (tfm, dst, src, nbytes, - tfm->__crt_alg->cra_cipher.cia_encrypt, - ecb_process,1 ,NULL ); -} +scatterwalk_info_init (cbc_info+0 , dst, bsize, (char [bsize]){}, +SCATTERWALK_IO_OUTPUT ); +scatterwalk_info_init (cbc_info+1 , src, bsize, (char [bsize]){}, +SCATTERWALK_IO_INPUT ); +scatterwalk_info_endtag (cbc_info+2 ); -static int ecb_decrypt (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src, -unsigned int nbytes) -{ -return crypt (tfm, dst, src, nbytes, - tfm->__crt_alg->cra_cipher.cia_decrypt, - ecb_process,1 ,NULL ); +return scatterwalk_walk (cbc_process_gw, &priv, nbytes/bsize, cbc_info); } -static int cbc_encrypt (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src, -unsigned int nbytes) -{ -return crypt (tfm, dst, src, nbytes, - tfm->__crt_alg->cra_cipher.cia_encrypt, - cbc_process,1 , tfm->crt_cipher.cit_iv); -} +static int cbc_decrypt_iv (struct crypto_tfm *tfm, +struct scatterlist *dst, +struct scatterlist *src, +unsigned int nbytes,u8 *iv) +{ +int bsize =crypto_tfm_alg_blocksize (tfm); +int r = -EINVAL ; + +char scratch1[bsize]; + +struct cbc_process_priv priv = { + .tfm = tfm, + .enc =CRYPTO_DIR_DECRYPT , + .curr_iv = iv, + .next_iv = scratch1, + .crfn = tfm->__crt_alg->cra_cipher.cia_decrypt, + }; +struct walk_info cbc_info[3 ]; -static int cbc_encrypt_iv (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src, -unsigned int nbytes,u8 *iv) -{ -return crypt (tfm, dst, src, nbytes, - tfm->__crt_alg->cra_cipher.cia_encrypt, - cbc_process,1 , iv); +if (!nbytes) +return 0 ; +if (nbytes % bsize) { + tfm->crt_flags |=CRYPTO_TFM_RES_BAD_BLOCK_LEN ; +return -EINVAL ; + } + +scatterwalk_info_init (cbc_info+0 , dst, bsize, (char [bsize]){},SCATTERWALK_IO_OUTPUT ); +scatterwalk_info_init (cbc_info+1 , src, bsize, (char [bsize]){},SCATTERWALK_IO_INPUT ); +scatterwalk_info_endtag (cbc_info+2 ); + + r =scatterwalk_walk (cbc_process_gw, &priv, nbytes/bsize, cbc_info); + +if (priv.curr_iv != iv) +memcpy (iv,priv.curr_iv,bsize); +return r; }static int cbc_decrypt (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src, +struct scatterlist *dst, +struct scatterlist *src,unsigned int nbytes) { -return crypt (tfm, dst, src, nbytes, - tfm->__crt_alg->cra_cipher.cia_decrypt, - cbc_process,0 , tfm->crt_cipher.cit_iv); +return cbc_decrypt_iv (tfm, dst, src, nbytes, tfm->crt_cipher.cit_iv); } -static int cbc_decrypt_iv (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src, -unsigned int nbytes,u8 *iv) -{ -return crypt (tfm, dst, src, nbytes, - tfm->__crt_alg->cra_cipher.cia_decrypt, - cbc_process,0 , iv); +static int cbc_encrypt (struct crypto_tfm *tfm, +struct scatterlist *dst, +struct scatterlist *src, +unsigned int nbytes) +{ +return cbc_encrypt_iv (tfm, dst, src, nbytes, tfm->crt_cipher.cit_iv); }static int nocrypt (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src, +struct scatterlist *dst, +struct scatterlist *src,unsigned int nbytes) {return -ENOSYS ; }static int nocrypt_iv (struct crypto_tfm *tfm, -struct scatterlist *dst, -struct scatterlist *src, -unsigned int nbytes,u8 *iv) +struct scatterlist *dst, +struct scatterlist *src, +unsigned int nbytes,u8 *iv) {return -ENOSYS ; }
@@ -263,26 +305,26 @@ }if (ops->cit_mode ==CRYPTO_TFM_MODE_CBC ) { - -switch (crypto_tfm_alg_blocksize (tfm)) { -case 8 : - ops->cit_xor_block = xor_64; -break ; - -case 16 : - ops->cit_xor_block = xor_128; -break ; - -default : -printk (KERN_WARNING "%s: block size %u not supported\n" , -crypto_tfm_alg_name (tfm), -crypto_tfm_alg_blocksize (tfm)); - ret = -EINVAL ; - goto out; - } - + +switch (crypto_tfm_alg_blocksize (tfm)) { +case 8 : + ops->cit_xor_block = xor_64; +break ; + +case 16 : + ops->cit_xor_block = xor_128; +break ; + +default : +printk (KERN_WARNING "%s: block size %u not supported\n" , +crypto_tfm_alg_name (tfm), +crypto_tfm_alg_blocksize (tfm)); + ret = -EINVAL ; + goto out; + } + ops->cit_ivsize =crypto_tfm_alg_blocksize (tfm); - ops->cit_iv =kmalloc (ops->cit_ivsize,GFP_KERNEL ); + ops->cit_iv =kmalloc (ops->cit_ivsize,GFP_KERNEL );if (ops->cit_iv ==NULL ) ret = -ENOMEM ; }
crypto/scatterwalk.h +22 -13
@@ -4,6 +4,7 @@* Copyright (c) 2002 James Morris <[email protected]> * Copyright (c) 2002 Adam J. Richter <[email protected]> * Copyright (c) 2004 Jean-Luc Cooke <[email protected]> +* Copyright (c) 2005 Clemens Fruhwirth <[email protected]> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free
@@ -16,6 +17,7 @@#define _CRYPTO_SCATTERWALK_H#include <linux/mm.h> #include <asm/scatterlist.h> +#include <linux/pagemap.h> struct scatter_walk {struct scatterlist *sg;
@@ -26,6 +28,16 @@unsigned int offset; }; +struct walk_info { +struct scatter_walk sw; +int stepsize; +int ioflag; +char *buf; +}; + +#define SCATTERWALK_IO_OUTPUT 1 +#define SCATTERWALK_IO_INPUT 0 +/* Define sg_next is an inline routine now in case we want to change scatterlist to a linked list later. */ static inline struct scatterlist *sg_next (struct scatterlist *sg)
@@ -33,19 +45,16 @@ return sg + 1; } -static inline int scatterwalk_samebuf (struct scatter_walk *walk_in, -struct scatter_walk *walk_out, -void *src_p,void *dst_p) -{ -return walk_in->page == walk_out->page && - walk_in->offset == walk_out->offset && - walk_in->data == src_p && walk_out->data == dst_p; -} +typedef int (*sw_proc_func_t )(void *priv,int length,void **buflist); + +/* If the following functions are ever going to be exported symbols, I +* request them to be GPL-only symbols. Thanks, -- [email protected] */ + +int scatterwalk_walk (sw_proc_func_t function,void *priv,int steps,struct walk_info *walk_info_l); + +void scatterwalk_info_endtag (struct walk_info *); + +void scatterwalk_info_init (struct walk_info *winfo,struct scatterlist *sg,int stepsize,void *buf,int io); -void *scatterwalk_whichbuf (struct scatter_walk *walk,unsigned int nbytes,void *scratch); -void scatterwalk_start (struct scatter_walk *walk,struct scatterlist *sg); -int scatterwalk_copychunks (void *buf,struct scatter_walk *walk,size_t nbytes,int out); -void scatterwalk_map (struct scatter_walk *walk,int out); -void scatterwalk_done (struct scatter_walk *walk,int out,int more);#endif /* _CRYPTO_SCATTERWALK_H */
crypto/scatterwalk.c +125 -36
203 lines not on this page · raw message