Commit a216f8d5 authored by Corentin Labbe's avatar Corentin Labbe Committed by Herbert Xu
Browse files

crypto: sun8i-ce - move iv data to request context 



Instead of storing IV data in the channel context, store them in the
request context.
Storing them in the channel structure was conceptualy wrong since they
are per request related.

Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 87f34260

drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c

+13 −14
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) 
	struct scatterlist *sg;

	unsigned int todo, len, offset, ivsize;

	dma_addr_t addr_iv = 0, addr_key = 0;

	void *backup_iv = NULL;

	u32 common, sym;

	int flow, i;

	int nr_sgs = 0;
@@ -151,24 +150,24 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) 


	ivsize = crypto_skcipher_ivsize(tfm);

	if (areq->iv && crypto_skcipher_ivsize(tfm) > 0) {

		chan->ivlen = ivsize;

		chan->bounce_iv = kzalloc(ivsize, GFP_KERNEL | GFP_DMA);

		if (!chan->bounce_iv) {

		rctx->ivlen = ivsize;

		rctx->bounce_iv = kzalloc(ivsize, GFP_KERNEL | GFP_DMA);

		if (!rctx->bounce_iv) {

			err = -ENOMEM;

			goto theend_key;

		}

		if (rctx->op_dir & CE_DECRYPTION) {

			backup_iv = kzalloc(ivsize, GFP_KERNEL);

			if (!backup_iv) {

			rctx->backup_iv = kzalloc(ivsize, GFP_KERNEL);

			if (!rctx->backup_iv) {

				err = -ENOMEM;

				goto theend_key;

			}

			offset = areq->cryptlen - ivsize;

			scatterwalk_map_and_copy(backup_iv, areq->src, offset,

						 ivsize, 0);

			scatterwalk_map_and_copy(rctx->backup_iv, areq->src,

						 offset, ivsize, 0);

		}

		memcpy(chan->bounce_iv, areq->iv, ivsize);

		addr_iv = dma_map_single(ce->dev, chan->bounce_iv, chan->ivlen,

		memcpy(rctx->bounce_iv, areq->iv, ivsize);

		addr_iv = dma_map_single(ce->dev, rctx->bounce_iv, rctx->ivlen,

					 DMA_TO_DEVICE);

		cet->t_iv = cpu_to_le32(addr_iv);

		if (dma_mapping_error(ce->dev, addr_iv)) {
@@ -249,17 +248,17 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) 
theend_iv:

	if (areq->iv && ivsize > 0) {

		if (addr_iv)

			dma_unmap_single(ce->dev, addr_iv, chan->ivlen,

			dma_unmap_single(ce->dev, addr_iv, rctx->ivlen,

					 DMA_TO_DEVICE);

		offset = areq->cryptlen - ivsize;

		if (rctx->op_dir & CE_DECRYPTION) {

			memcpy(areq->iv, backup_iv, ivsize);

			kfree_sensitive(backup_iv);

			memcpy(areq->iv, rctx->backup_iv, ivsize);

			kfree_sensitive(rctx->backup_iv);

		} else {

			scatterwalk_map_and_copy(areq->iv, areq->dst, offset,

						 ivsize, 0);

		}

		kfree(chan->bounce_iv);

		kfree(rctx->bounce_iv);

	}



theend_key:

drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h

+6 −4
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ struct ce_task { 
/*

 * struct sun8i_ce_flow - Information used by each flow

 * @engine:	ptr to the crypto_engine for this flow

 * @bounce_iv:	buffer which contain the IV

 * @ivlen:	size of bounce_iv

 * @complete:	completion for the current task on this flow

 * @status:	set to 1 by interrupt if task is done

 * @t_phy:	Physical address of task
@@ -139,8 +137,6 @@ struct ce_task { 
 */

struct sun8i_ce_flow {

	struct crypto_engine *engine;

	void *bounce_iv;

	unsigned int ivlen;

	struct completion complete;

	int status;

	dma_addr_t t_phy;
@@ -183,11 +179,17 @@ struct sun8i_ce_dev { 
 * struct sun8i_cipher_req_ctx - context for a skcipher request

 * @op_dir:		direction (encrypt vs decrypt) for this request

 * @flow:		the flow to use for this request

 * @backup_iv:		buffer which contain the next IV to store

 * @bounce_iv:		buffer which contain the IV

 * @ivlen:		size of bounce_iv

 * @fallback_req:	request struct for invoking the fallback skcipher TFM

 */

struct sun8i_cipher_req_ctx {

	u32 op_dir;

	int flow;

	void *backup_iv;

	void *bounce_iv;

	unsigned int ivlen;

	struct skcipher_request fallback_req;   // keep at the end

};