| From e8962b5bf9a55d64d150d09a99d5da30bbf13e31 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com> |
| Date: Tue, 30 Jul 2019 08:48:33 +0300 |
| Subject: [PATCH] crypto: caam - fix concurrency issue in givencrypt descriptor |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 48f89d2a2920166c35b1c0b69917dbb0390ebec7 upstream. |
| |
| IV transfer from ofifo to class2 (set up at [29][30]) is not guaranteed |
| to be scheduled before the data transfer from ofifo to external memory |
| (set up at [38]: |
| |
| [29] 10FA0004 ld: ind-nfifo (len=4) imm |
| [30] 81F00010 <nfifo_entry: ofifo->class2 type=msg len=16> |
| [31] 14820004 ld: ccb2-datasz len=4 offs=0 imm |
| [32] 00000010 data:0x00000010 |
| [33] 8210010D operation: cls1-op aes cbc init-final enc |
| [34] A8080B04 math: (seqin + math0)->vseqout len=4 |
| [35] 28000010 seqfifold: skip len=16 |
| [36] A8080A04 math: (seqin + math0)->vseqin len=4 |
| [37] 2F1E0000 seqfifold: both msg1->2-last2-last1 len=vseqinsz |
| [38] 69300000 seqfifostr: msg len=vseqoutsz |
| [39] 5C20000C seqstr: ccb2 ctx len=12 offs=0 |
| |
| If ofifo -> external memory transfer happens first, DECO will hang |
| (issuing a Watchdog Timeout error, if WDOG is enabled) waiting for |
| data availability in ofifo for the ofifo -> c2 ififo transfer. |
| |
| Make sure IV transfer happens first by waiting for all CAAM internal |
| transfers to end before starting payload transfer. |
| |
| New descriptor with jump command inserted at [37]: |
| |
| [..] |
| [36] A8080A04 math: (seqin + math0)->vseqin len=4 |
| [37] A1000401 jump: jsl1 all-match[!nfifopend] offset=[01] local->[38] |
| [38] 2F1E0000 seqfifold: both msg1->2-last2-last1 len=vseqinsz |
| [39] 69300000 seqfifostr: msg len=vseqoutsz |
| [40] 5C20000C seqstr: ccb2 ctx len=12 offs=0 |
| |
| [Note: the issue is present in the descriptor from the very beginning |
| (cf. Fixes tag). However I've marked it v4.19+ since it's the oldest |
| maintained kernel that the patch applies clean against.] |
| |
| Cc: <stable@vger.kernel.org> # v4.19+ |
| Fixes: 1acebad3d8db8 ("crypto: caam - faster aead implementation") |
| Signed-off-by: Horia Geantă <horia.geanta@nxp.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/crypto/caam/caamalg_desc.c b/drivers/crypto/caam/caamalg_desc.c |
| index 1e1a376edc2f..bb47ae5dca38 100644 |
| --- a/drivers/crypto/caam/caamalg_desc.c |
| +++ b/drivers/crypto/caam/caamalg_desc.c |
| @@ -510,6 +510,7 @@ void cnstr_shdsc_aead_givencap(u32 * const desc, struct alginfo *cdata, |
| const bool is_qi, int era) |
| { |
| u32 geniv, moveiv; |
| + u32 *wait_cmd; |
| |
| /* Note: Context registers are saved. */ |
| init_sh_desc_key_aead(desc, cdata, adata, is_rfc3686, nonce, era); |
| @@ -605,6 +606,14 @@ void cnstr_shdsc_aead_givencap(u32 * const desc, struct alginfo *cdata, |
| |
| /* Will read cryptlen */ |
| append_math_add(desc, VARSEQINLEN, SEQINLEN, REG0, CAAM_CMD_SZ); |
| + |
| + /* |
| + * Wait for IV transfer (ofifo -> class2) to finish before starting |
| + * ciphertext transfer (ofifo -> external memory). |
| + */ |
| + wait_cmd = append_jump(desc, JUMP_JSL | JUMP_TEST_ALL | JUMP_COND_NIFP); |
| + set_jump_tgt_here(desc, wait_cmd); |
| + |
| append_seq_fifo_load(desc, 0, FIFOLD_CLASS_BOTH | KEY_VLF | |
| FIFOLD_TYPE_MSG1OUT2 | FIFOLD_TYPE_LASTBOTH); |
| append_seq_fifo_store(desc, 0, FIFOST_TYPE_MESSAGE_DATA | KEY_VLF); |
| diff --git a/drivers/crypto/caam/caamalg_desc.h b/drivers/crypto/caam/caamalg_desc.h |
| index d5ca42ff961a..2af96128ffd5 100644 |
| --- a/drivers/crypto/caam/caamalg_desc.h |
| +++ b/drivers/crypto/caam/caamalg_desc.h |
| @@ -12,7 +12,7 @@ |
| #define DESC_AEAD_BASE (4 * CAAM_CMD_SZ) |
| #define DESC_AEAD_ENC_LEN (DESC_AEAD_BASE + 11 * CAAM_CMD_SZ) |
| #define DESC_AEAD_DEC_LEN (DESC_AEAD_BASE + 15 * CAAM_CMD_SZ) |
| -#define DESC_AEAD_GIVENC_LEN (DESC_AEAD_ENC_LEN + 7 * CAAM_CMD_SZ) |
| +#define DESC_AEAD_GIVENC_LEN (DESC_AEAD_ENC_LEN + 8 * CAAM_CMD_SZ) |
| #define DESC_QI_AEAD_ENC_LEN (DESC_AEAD_ENC_LEN + 3 * CAAM_CMD_SZ) |
| #define DESC_QI_AEAD_DEC_LEN (DESC_AEAD_DEC_LEN + 3 * CAAM_CMD_SZ) |
| #define DESC_QI_AEAD_GIVENC_LEN (DESC_AEAD_GIVENC_LEN + 3 * CAAM_CMD_SZ) |
| -- |
| 2.7.4 |
| |