From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 25/37] target/arm: Use aesenc_SB_SR_AK
Date: Sun, 9 Jul 2023 14:59:33 +0100 [thread overview]
Message-ID: <20230709135945.250311-26-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230709135945.250311-1-richard.henderson@linaro.org>
This implements the AESE instruction.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/tcg/crypto_helper.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/target/arm/tcg/crypto_helper.c b/target/arm/tcg/crypto_helper.c
index 75882d9ea3..00f3b21507 100644
--- a/target/arm/tcg/crypto_helper.c
+++ b/target/arm/tcg/crypto_helper.c
@@ -15,6 +15,7 @@
#include "exec/helper-proto.h"
#include "tcg/tcg-gvec-desc.h"
#include "crypto/aes.h"
+#include "crypto/aes-round.h"
#include "crypto/sm4.h"
#include "vec_internal.h"
@@ -45,6 +46,8 @@ static void clear_tail_16(void *vd, uint32_t desc)
clear_tail(vd, opr_sz, max_sz);
}
+static const AESState aes_zero = { };
+
static void do_crypto_aese(uint64_t *rd, uint64_t *rn, uint64_t *rm,
const uint8_t *sbox, const uint8_t *shift)
{
@@ -70,7 +73,26 @@ void HELPER(crypto_aese)(void *vd, void *vn, void *vm, uint32_t desc)
intptr_t i, opr_sz = simd_oprsz(desc);
for (i = 0; i < opr_sz; i += 16) {
- do_crypto_aese(vd + i, vn + i, vm + i, AES_sbox, AES_shifts);
+ AESState *ad = (AESState *)(vd + i);
+ AESState *st = (AESState *)(vn + i);
+ AESState *rk = (AESState *)(vm + i);
+ AESState t;
+
+ /*
+ * Our uint64_t are in the wrong order for big-endian.
+ * The Arm AddRoundKey comes first, while the API AddRoundKey
+ * comes last: perform the xor here, and provide zero to API.
+ */
+ if (HOST_BIG_ENDIAN) {
+ t.d[0] = st->d[1] ^ rk->d[1];
+ t.d[1] = st->d[0] ^ rk->d[0];
+ aesenc_SB_SR_AK(&t, &t, &aes_zero, false);
+ ad->d[0] = t.d[1];
+ ad->d[1] = t.d[0];
+ } else {
+ t.v = st->v ^ rk->v;
+ aesenc_SB_SR_AK(ad, &t, &aes_zero, false);
+ }
}
clear_tail(vd, opr_sz, simd_maxsz(desc));
}
--
2.34.1
next prev parent reply other threads:[~2023-07-09 14:05 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-09 13:59 [PULL 00/37] crypto: Provide aes-round.h and host accel Richard Henderson
2023-07-09 13:59 ` [PULL 01/37] util: Add cpuinfo-ppc.c Richard Henderson
2023-07-09 13:59 ` [PULL 02/37] tests/multiarch: Add test-aes Richard Henderson
2023-07-09 13:59 ` [PULL 03/37] target/arm: Move aesmc and aesimc tables to crypto/aes.c Richard Henderson
2023-07-09 13:59 ` [PULL 04/37] crypto/aes: Add AES_SH, AES_ISH macros Richard Henderson
2023-07-09 13:59 ` [PULL 05/37] crypto: Add aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 06/37] crypto: Add aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 07/37] crypto: Add aesenc_MC Richard Henderson
2023-07-09 13:59 ` [PULL 08/37] crypto: Add aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 09/37] crypto: Add aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 10/37] crypto: Add aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 11/37] crypto: Add aesdec_ISB_ISR_AK_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 12/37] host/include/i386: Implement aes-round.h Richard Henderson
2023-07-09 13:59 ` [PULL 13/37] host/include/aarch64: " Richard Henderson
2023-07-09 13:59 ` [PULL 14/37] host/include/ppc: " Richard Henderson
2023-07-09 13:59 ` [PULL 15/37] target/ppc: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 16/37] target/ppc: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 17/37] target/ppc: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 18/37] target/ppc: Use aesdec_ISB_ISR_AK_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 19/37] target/i386: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 20/37] target/i386: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 21/37] target/i386: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 22/37] target/i386: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 23/37] target/i386: Use aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 24/37] target/arm: Demultiplex AESE and AESMC Richard Henderson
2023-07-09 13:59 ` Richard Henderson [this message]
2023-07-09 13:59 ` [PULL 26/37] target/arm: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 27/37] target/arm: Use aesenc_MC Richard Henderson
2023-07-09 13:59 ` [PULL 28/37] target/arm: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 29/37] target/riscv: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 30/37] target/riscv: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 31/37] target/riscv: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 32/37] target/riscv: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 33/37] target/riscv: Use aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 34/37] crypto: Remove AES_shifts, AES_ishifts Richard Henderson
2023-07-09 13:59 ` [PULL 35/37] crypto: Implement aesdec_IMC with AES_imc_rot Richard Henderson
2023-07-09 13:59 ` [PULL 36/37] crypto: Remove AES_imc Richard Henderson
2023-07-09 13:59 ` [PULL 37/37] crypto: Unexport AES_*_rot, AES_TeN, AES_TdN Richard Henderson
2023-07-09 17:30 ` [PULL 00/37] crypto: Provide aes-round.h and host accel Richard Henderson
-- strict thread matches above, loose matches on Subject: below --
2023-07-09 18:28 [PATCH 00/45] linux-user: patch roundup Richard Henderson
2023-07-09 18:29 ` [PULL 25/37] target/arm: Use aesenc_SB_SR_AK Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230709135945.250311-26-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).