Commit 2d290f02 authored by Marcelo Cerri's avatar Marcelo Cerri Committed by Herbert Xu

crypto: nx - fix limits to sg lists for AES-CBC

This patch updates the nx-aes-cbc implementation to perform several
hyper calls if needed in order to always respect the length limits for
scatter/gather lists.

Two different limits are considered:

 - "ibm,max-sg-len": maximum number of bytes of each scatter/gather
   list.

 - "ibm,max-sync-cop":
    - The total number of bytes that a scatter/gather list can hold.
    - The maximum number of elements that a scatter/gather list can have.
Reviewed-by: default avatarJoy Latten <jmlatten@linux.vnet.ibm.com>
Signed-off-by: default avatarMarcelo Cerri <mhcerri@linux.vnet.ibm.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ab741759
...@@ -71,39 +71,49 @@ static int cbc_aes_nx_crypt(struct blkcipher_desc *desc, ...@@ -71,39 +71,49 @@ static int cbc_aes_nx_crypt(struct blkcipher_desc *desc,
struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm); struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm);
struct nx_csbcpb *csbcpb = nx_ctx->csbcpb; struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
unsigned long irq_flags; unsigned long irq_flags;
unsigned int processed = 0, to_process;
u32 max_sg_len;
int rc; int rc;
spin_lock_irqsave(&nx_ctx->lock, irq_flags); spin_lock_irqsave(&nx_ctx->lock, irq_flags);
if (nbytes > nx_ctx->ap->databytelen) { max_sg_len = min_t(u32, nx_driver.of.max_sg_len/sizeof(struct nx_sg),
rc = -EINVAL; nx_ctx->ap->sglen);
goto out;
}
if (enc) if (enc)
NX_CPB_FDM(csbcpb) |= NX_FDM_ENDE_ENCRYPT; NX_CPB_FDM(csbcpb) |= NX_FDM_ENDE_ENCRYPT;
else else
NX_CPB_FDM(csbcpb) &= ~NX_FDM_ENDE_ENCRYPT; NX_CPB_FDM(csbcpb) &= ~NX_FDM_ENDE_ENCRYPT;
rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes, 0, do {
csbcpb->cpb.aes_cbc.iv); to_process = min_t(u64, nbytes - processed,
if (rc) nx_ctx->ap->databytelen);
goto out; to_process = min_t(u64, to_process,
NX_PAGE_SIZE * (max_sg_len - 1));
if (!nx_ctx->op.inlen || !nx_ctx->op.outlen) { to_process = to_process & ~(AES_BLOCK_SIZE - 1);
rc = -EINVAL;
goto out; rc = nx_build_sg_lists(nx_ctx, desc, dst, src, to_process,
} processed, csbcpb->cpb.aes_cbc.iv);
if (rc)
rc = nx_hcall_sync(nx_ctx, &nx_ctx->op, goto out;
desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP);
if (rc) if (!nx_ctx->op.inlen || !nx_ctx->op.outlen) {
goto out; rc = -EINVAL;
goto out;
memcpy(desc->info, csbcpb->cpb.aes_cbc.cv, AES_BLOCK_SIZE); }
atomic_inc(&(nx_ctx->stats->aes_ops));
atomic64_add(csbcpb->csb.processed_byte_count, rc = nx_hcall_sync(nx_ctx, &nx_ctx->op,
&(nx_ctx->stats->aes_bytes)); desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP);
if (rc)
goto out;
memcpy(desc->info, csbcpb->cpb.aes_cbc.cv, AES_BLOCK_SIZE);
atomic_inc(&(nx_ctx->stats->aes_ops));
atomic64_add(csbcpb->csb.processed_byte_count,
&(nx_ctx->stats->aes_bytes));
processed += to_process;
} while (processed < nbytes);
out: out:
spin_unlock_irqrestore(&nx_ctx->lock, irq_flags); spin_unlock_irqrestore(&nx_ctx->lock, irq_flags);
return rc; return rc;
......
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