| Message ID | 20170222180015.27573-1-pfsmorigo@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Herbert Xu |
| Headers | show |
Hi Paulo. On Wed, Feb 22, 2017 at 03:00:15PM -0300, Paulo Flabiano Smorigo wrote: > Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com> > --- > drivers/crypto/vmx/aes_cbc.c | 41 ++++++++++++++++++++--------------------- > 1 file changed, 20 insertions(+), 21 deletions(-) > > diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c > index 94ad5c0..5aa70997 100644 > --- a/drivers/crypto/vmx/aes_cbc.c > +++ b/drivers/crypto/vmx/aes_cbc.c > @@ -27,11 +27,12 @@ > #include <asm/switch_to.h> > #include <crypto/aes.h> > #include <crypto/scatterwalk.h> > +#include <crypto/internal/skcipher.h> Isn't crypto/skcipher.h enough? > > #include "aesp8-ppc.h" > > struct p8_aes_cbc_ctx { > - struct crypto_blkcipher *fallback; > + struct crypto_skcipher *fallback; > struct aes_key enc_key; > struct aes_key dec_key; > }; > @@ -39,7 +40,7 @@ struct p8_aes_cbc_ctx { > static int p8_aes_cbc_init(struct crypto_tfm *tfm) > { > const char *alg; > - struct crypto_blkcipher *fallback; > + struct crypto_skcipher *fallback; > struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm); > > if (!(alg = crypto_tfm_alg_name(tfm))) { > @@ -48,7 +49,7 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm) > } > > fallback = > - crypto_alloc_blkcipher(alg, 0, CRYPTO_ALG_NEED_FALLBACK); > + crypto_alloc_skcipher(alg, 0, CRYPTO_ALG_NEED_FALLBACK); > if (IS_ERR(fallback)) { > printk(KERN_ERR > "Failed to allocate transformation for '%s': %ld\n", > @@ -58,9 +59,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm) > printk(KERN_INFO "Using '%s' as fallback implementation.\n", > crypto_tfm_alg_driver_name((struct crypto_tfm *) fallback)); > > - crypto_blkcipher_set_flags( > + crypto_skcipher_set_flags( > fallback, > - crypto_blkcipher_get_flags((struct crypto_blkcipher *)tfm)); > + crypto_skcipher_get_flags((struct crypto_skcipher *)tfm)); > ctx->fallback = fallback; > > return 0; > @@ -71,7 +72,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm) > struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm); > > if (ctx->fallback) { > - crypto_free_blkcipher(ctx->fallback); > + crypto_free_skcipher(ctx->fallback); > ctx->fallback = NULL; > } > } > @@ -91,7 +92,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key, > pagefault_enable(); > preempt_enable(); > > - ret += crypto_blkcipher_setkey(ctx->fallback, key, keylen); > + ret += crypto_skcipher_setkey(ctx->fallback, key, keylen); > return ret; > } > > @@ -103,15 +104,14 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, > struct blkcipher_walk walk; > struct p8_aes_cbc_ctx *ctx = > crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm)); > - struct blkcipher_desc fallback_desc = { > - .tfm = ctx->fallback, > - .info = desc->info, > - .flags = desc->flags > - }; > > if (in_interrupt()) { > - ret = crypto_blkcipher_encrypt(&fallback_desc, dst, src, > - nbytes); > + SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); > + skcipher_request_set_tfm(req, ctx->fallback); > + skcipher_request_set_callback(req, desc->flags, NULL, NULL); > + skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); > + ret = crypto_skcipher_encrypt(req); > + skcipher_request_zero(req); Probably you have to wait for the completion here before proceeding. Check Documentation/crypto/api-samples.rst > } else { > preempt_disable(); > pagefault_disable(); > @@ -144,15 +144,14 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc, > struct blkcipher_walk walk; > struct p8_aes_cbc_ctx *ctx = > crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm)); > - struct blkcipher_desc fallback_desc = { > - .tfm = ctx->fallback, > - .info = desc->info, > - .flags = desc->flags > - }; > > if (in_interrupt()) { > - ret = crypto_blkcipher_decrypt(&fallback_desc, dst, src, > - nbytes); > + SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); > + skcipher_request_set_tfm(req, ctx->fallback); > + skcipher_request_set_callback(req, desc->flags, NULL, NULL); > + skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); > + ret = crypto_skcipher_decrypt(req); > + skcipher_request_zero(req); Same here. > } else { > preempt_disable(); > pagefault_disable(); > -- > 2.9.3 >
Hi Hebert, On Wed, Feb 22, 2017 at 04:18:19PM -0300, Marcelo Cerri wrote: > Hi Paulo. > > On Wed, Feb 22, 2017 at 03:00:15PM -0300, Paulo Flabiano Smorigo wrote: > > > > if (in_interrupt()) { > > - ret = crypto_blkcipher_encrypt(&fallback_desc, dst, src, > > - nbytes); > > + SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); > > + skcipher_request_set_tfm(req, ctx->fallback); > > + skcipher_request_set_callback(req, desc->flags, NULL, NULL); > > + skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); > > + ret = crypto_skcipher_encrypt(req); > > + skcipher_request_zero(req); > > Probably you have to wait for the completion here before proceeding. > > Check Documentation/crypto/api-samples.rst > I noticed you used a similar approach in arch/s390/crypto/aes_s390.c (commit 64e2680). How do you ensure the skcipher operation will not be asynchronous?
Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com> wrote: > > fallback = > - crypto_alloc_blkcipher(alg, 0, CRYPTO_ALG_NEED_FALLBACK); > + crypto_alloc_skcipher(alg, 0, CRYPTO_ALG_NEED_FALLBACK); You need to add CRYPTO_ALG_ASYNC to the mask in order to ensure that you get a sync algorithm. Thanks,
Marcelo Cerri <marcelo.cerri@canonical.com> wrote: > > I noticed you used a similar approach in arch/s390/crypto/aes_s390.c > (commit 64e2680). > > How do you ensure the skcipher operation will not be asynchronous? You need to set the bit CRYPTO_ALG_ASYNC in the mask field when allocating the algorithm to ensure that it's synchronous. Cheers,
It makes sense. Thanks for the clarification, Herbert. One more question: are you planning to convert the ctr template to skcipher?
On Thu, Feb 23, 2017 at 10:42:04AM -0300, Marcelo Cerri wrote: > It makes sense. Thanks for the clarification, Herbert. > > One more question: are you planning to convert the ctr template to > skcipher? Yes everything will be converted. Cheers,
diff --git a/drivers/crypto/vmx/aes_cbc.c b/drivers/crypto/vmx/aes_cbc.c index 94ad5c0..5aa70997 100644 --- a/drivers/crypto/vmx/aes_cbc.c +++ b/drivers/crypto/vmx/aes_cbc.c @@ -27,11 +27,12 @@ #include <asm/switch_to.h> #include <crypto/aes.h> #include <crypto/scatterwalk.h> +#include <crypto/internal/skcipher.h> #include "aesp8-ppc.h" struct p8_aes_cbc_ctx { - struct crypto_blkcipher *fallback; + struct crypto_skcipher *fallback; struct aes_key enc_key; struct aes_key dec_key; }; @@ -39,7 +40,7 @@ struct p8_aes_cbc_ctx { static int p8_aes_cbc_init(struct crypto_tfm *tfm) { const char *alg; - struct crypto_blkcipher *fallback; + struct crypto_skcipher *fallback; struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm); if (!(alg = crypto_tfm_alg_name(tfm))) { @@ -48,7 +49,7 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm) } fallback = - crypto_alloc_blkcipher(alg, 0, CRYPTO_ALG_NEED_FALLBACK); + crypto_alloc_skcipher(alg, 0, CRYPTO_ALG_NEED_FALLBACK); if (IS_ERR(fallback)) { printk(KERN_ERR "Failed to allocate transformation for '%s': %ld\n", @@ -58,9 +59,9 @@ static int p8_aes_cbc_init(struct crypto_tfm *tfm) printk(KERN_INFO "Using '%s' as fallback implementation.\n", crypto_tfm_alg_driver_name((struct crypto_tfm *) fallback)); - crypto_blkcipher_set_flags( + crypto_skcipher_set_flags( fallback, - crypto_blkcipher_get_flags((struct crypto_blkcipher *)tfm)); + crypto_skcipher_get_flags((struct crypto_skcipher *)tfm)); ctx->fallback = fallback; return 0; @@ -71,7 +72,7 @@ static void p8_aes_cbc_exit(struct crypto_tfm *tfm) struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(tfm); if (ctx->fallback) { - crypto_free_blkcipher(ctx->fallback); + crypto_free_skcipher(ctx->fallback); ctx->fallback = NULL; } } @@ -91,7 +92,7 @@ static int p8_aes_cbc_setkey(struct crypto_tfm *tfm, const u8 *key, pagefault_enable(); preempt_enable(); - ret += crypto_blkcipher_setkey(ctx->fallback, key, keylen); + ret += crypto_skcipher_setkey(ctx->fallback, key, keylen); return ret; } @@ -103,15 +104,14 @@ static int p8_aes_cbc_encrypt(struct blkcipher_desc *desc, struct blkcipher_walk walk; struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm)); - struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - }; if (in_interrupt()) { - ret = crypto_blkcipher_encrypt(&fallback_desc, dst, src, - nbytes); + SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); + skcipher_request_set_tfm(req, ctx->fallback); + skcipher_request_set_callback(req, desc->flags, NULL, NULL); + skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); + ret = crypto_skcipher_encrypt(req); + skcipher_request_zero(req); } else { preempt_disable(); pagefault_disable(); @@ -144,15 +144,14 @@ static int p8_aes_cbc_decrypt(struct blkcipher_desc *desc, struct blkcipher_walk walk; struct p8_aes_cbc_ctx *ctx = crypto_tfm_ctx(crypto_blkcipher_tfm(desc->tfm)); - struct blkcipher_desc fallback_desc = { - .tfm = ctx->fallback, - .info = desc->info, - .flags = desc->flags - }; if (in_interrupt()) { - ret = crypto_blkcipher_decrypt(&fallback_desc, dst, src, - nbytes); + SKCIPHER_REQUEST_ON_STACK(req, ctx->fallback); + skcipher_request_set_tfm(req, ctx->fallback); + skcipher_request_set_callback(req, desc->flags, NULL, NULL); + skcipher_request_set_crypt(req, src, dst, nbytes, desc->info); + ret = crypto_skcipher_decrypt(req); + skcipher_request_zero(req); } else { preempt_disable(); pagefault_disable();
Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com> --- drivers/crypto/vmx/aes_cbc.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-)