Commit 93322498 authored by Xin Zeng's avatar Xin Zeng Committed by Herbert Xu

crypto: qat - remove spin_lock in qat_ablkcipher_setkey

Remove unnecessary spin lock in qat_ablkcipher_setkey.
Reviewed-by: default avatarConor Mcloughlin <conor.mcloughlin@intel.com>
Tested-by: default avatarSergey Portnoy <sergey.portnoy@intel.com>
Signed-off-by: default avatarXin Zeng <xin.zeng@intel.com>
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a188339c
...@@ -131,7 +131,6 @@ struct qat_alg_ablkcipher_ctx { ...@@ -131,7 +131,6 @@ struct qat_alg_ablkcipher_ctx {
struct icp_qat_fw_la_bulk_req dec_fw_req; struct icp_qat_fw_la_bulk_req dec_fw_req;
struct qat_crypto_instance *inst; struct qat_crypto_instance *inst;
struct crypto_tfm *tfm; struct crypto_tfm *tfm;
spinlock_t lock; /* protects qat_alg_ablkcipher_ctx struct */
}; };
static int qat_get_inter_state_size(enum icp_qat_hw_auth_algo qat_hash_alg) static int qat_get_inter_state_size(enum icp_qat_hw_auth_algo qat_hash_alg)
...@@ -912,7 +911,6 @@ static int qat_alg_ablkcipher_setkey(struct crypto_ablkcipher *tfm, ...@@ -912,7 +911,6 @@ static int qat_alg_ablkcipher_setkey(struct crypto_ablkcipher *tfm,
struct qat_alg_ablkcipher_ctx *ctx = crypto_ablkcipher_ctx(tfm); struct qat_alg_ablkcipher_ctx *ctx = crypto_ablkcipher_ctx(tfm);
struct device *dev; struct device *dev;
spin_lock(&ctx->lock);
if (ctx->enc_cd) { if (ctx->enc_cd) {
/* rekeying */ /* rekeying */
dev = &GET_DEV(ctx->inst->accel_dev); dev = &GET_DEV(ctx->inst->accel_dev);
...@@ -925,29 +923,22 @@ static int qat_alg_ablkcipher_setkey(struct crypto_ablkcipher *tfm, ...@@ -925,29 +923,22 @@ static int qat_alg_ablkcipher_setkey(struct crypto_ablkcipher *tfm,
int node = get_current_node(); int node = get_current_node();
struct qat_crypto_instance *inst = struct qat_crypto_instance *inst =
qat_crypto_get_instance_node(node); qat_crypto_get_instance_node(node);
if (!inst) { if (!inst)
spin_unlock(&ctx->lock);
return -EINVAL; return -EINVAL;
}
dev = &GET_DEV(inst->accel_dev); dev = &GET_DEV(inst->accel_dev);
ctx->inst = inst; ctx->inst = inst;
ctx->enc_cd = dma_alloc_coherent(dev, sizeof(*ctx->enc_cd), ctx->enc_cd = dma_alloc_coherent(dev, sizeof(*ctx->enc_cd),
&ctx->enc_cd_paddr, &ctx->enc_cd_paddr,
GFP_ATOMIC); GFP_ATOMIC);
if (!ctx->enc_cd) { if (!ctx->enc_cd)
spin_unlock(&ctx->lock);
return -ENOMEM; return -ENOMEM;
}
ctx->dec_cd = dma_alloc_coherent(dev, sizeof(*ctx->dec_cd), ctx->dec_cd = dma_alloc_coherent(dev, sizeof(*ctx->dec_cd),
&ctx->dec_cd_paddr, &ctx->dec_cd_paddr,
GFP_ATOMIC); GFP_ATOMIC);
if (!ctx->dec_cd) { if (!ctx->dec_cd)
spin_unlock(&ctx->lock);
goto out_free_enc; goto out_free_enc;
}
} }
spin_unlock(&ctx->lock);
if (qat_alg_ablkcipher_init_sessions(ctx, key, keylen, mode)) if (qat_alg_ablkcipher_init_sessions(ctx, key, keylen, mode))
goto out_free_all; goto out_free_all;
...@@ -1119,7 +1110,6 @@ static int qat_alg_ablkcipher_init(struct crypto_tfm *tfm) ...@@ -1119,7 +1110,6 @@ static int qat_alg_ablkcipher_init(struct crypto_tfm *tfm)
{ {
struct qat_alg_ablkcipher_ctx *ctx = crypto_tfm_ctx(tfm); struct qat_alg_ablkcipher_ctx *ctx = crypto_tfm_ctx(tfm);
spin_lock_init(&ctx->lock);
tfm->crt_ablkcipher.reqsize = sizeof(struct qat_crypto_request); tfm->crt_ablkcipher.reqsize = sizeof(struct qat_crypto_request);
ctx->tfm = tfm; ctx->tfm = tfm;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment