| Message ID | 20220824155852.12671-1-ap420073@gmail.com |
|---|---|
| Headers | show |
| Series | crypto: aria: add ARIA AES-NI/AVX/x86_64 implementation | expand |
Hi Elliott, Robert Thank you so much for your review! On 8/25/22 04:35, Elliott, Robert (Servers) wrote: >> -----Original Message----- >> From: Taehee Yoo <ap420073@gmail.com> >> Sent: Wednesday, August 24, 2022 10:59 AM >> Subject: [PATCH 2/3] crypto: aria-avx: add AES-NI/AVX/x86_64 assembler >> implementation of aria cipher >> > ... > >> +#include "ecb_cbc_helpers.h" >> + >> +asmlinkage void aria_aesni_avx_crypt_16way(const u32 *rk, u8 *dst, >> + const u8 *src, int rounds); >> + >> +static int ecb_do_encrypt(struct skcipher_request *req, const u32 *rkey) >> +{ >> + struct aria_ctx *ctx = >> crypto_skcipher_ctx(crypto_skcipher_reqtfm(req)); >> + struct skcipher_walk walk; >> + unsigned int nbytes; >> + int err; >> + >> + err = skcipher_walk_virt(&walk, req, false); >> + >> + while ((nbytes = walk.nbytes) > 0) { >> + const u8 *src = walk.src.virt.addr; >> + u8 *dst = walk.dst.virt.addr; >> + >> + kernel_fpu_begin(); >> + while (nbytes >= ARIA_AVX_BLOCK_SIZE) { >> + aria_aesni_avx_crypt_16way(rkey, dst, src, ctx->rounds); >> + dst += ARIA_AVX_BLOCK_SIZE; >> + src += ARIA_AVX_BLOCK_SIZE; >> + nbytes -= ARIA_AVX_BLOCK_SIZE; >> + } >> + while (nbytes >= ARIA_BLOCK_SIZE) { >> + aria_encrypt(ctx, dst, src); >> + dst += ARIA_BLOCK_SIZE; >> + src += ARIA_BLOCK_SIZE; >> + nbytes -= ARIA_BLOCK_SIZE; >> + } >> + kernel_fpu_end(); > > Is aria_encrypt() an FPU function that belongs between kernel_fpu_begin() > and kernel_fpu_end()? > > Several drivers (camellia, serpent, twofish, cast5, cast6) use ECB_WALK_START, > ECB_BLOCK, and ECB_WALK_END macros for these loops. Those macros do only call > kernel_fpu_end() at the very end. That requires the functions to be structured > with (ctx, dst, src) arguments, not (rkey, dst, src, rounds). > aria_{encrypt | decrypt}() are not FPU functions. I think if it uses the ECB macro, aria_{encrypt | decrypt}() will be still in the FPU context. So, I will get them out of the kernel FPU context. Thank you so much! Taehee Yoo
The purpose of this patchset is to support the implementation of ARIA-AVX. Many of the ideas in this implementation are from Camellia-avx, especially byte slicing. Like Camellia, ARIA also uses a 16way strategy. ARIA cipher algorithm is similar to AES. There are four s-boxes in the ARIA spec and the first and second s-boxes are the same as AES's s-boxes. Almost functions are based on aria-generic code except for s-box related function. The aria-avx doesn't implement the key expanding function. it only support encrypt() and decrypt(). Encryption and Decryption logic is actually the same but it should use separated keys(encryption key and decryption key). En/Decryption steps are like below: 1. Add-Round-Key 2. S-box. 3. Diffusion Layer. There is no special thing in the Add-Round-Key step. There are some notable things in s-box step. Like Camellia, it doesn't use a lookup table, instead, it uses aes-ni. To calculate the first s-box, it just uses the aesenclast and then inverts shift_row. No more process is needed for this job because the first s-box is the same as the AES encryption s-box. To calculate a second s-box(invert of s1), it just uses the aesdeclast and then inverts shift_row. No more process is needed for this job because the second s-box is the same as the AES decryption s-box. To calculate a third and fourth s-boxes, it uses the aesenclast, then inverts shift_row, and affine transformation. The aria-generic implementation is based on a 32-bit implementation, not an 8-bit implementation. The aria-avx Diffusion Layer implementation is based on aria-generic implementation because 8-bit implementation is not fit for parallel implementation but 32-bit is fit for this. The first patch in this series is to export functions for aria-avx. The aria-avx uses existing functions in the aria-generic code. The second patch is to implement aria-avx. The last patch is to add async test for aria. Benchmarks: The tcrypt is used. cpu: i3-12100 How to test: modprobe aria-generic tcrypt mode=610 num_mb=8192 Result: testing speed of multibuffer ecb(aria) (ecb(aria-generic)) encryption test 0 (128 bit key, 16 byte blocks): 1 operation in 534 cycles test 2 (128 bit key, 128 byte blocks): 1 operation in 2006 cycles test 3 (128 bit key, 256 byte blocks): 1 operation in 3674 cycles test 6 (128 bit key, 4096 byte blocks): 1 operation in 52374 cycles test 7 (256 bit key, 16 byte blocks): 1 operation in 608 cycles test 9 (256 bit key, 128 byte blocks): 1 operation in 2586 cycles test 10 (256 bit key, 256 byte blocks): 1 operation in 4707 cycles test 13 (256 bit key, 4096 byte blocks): 1 operation in 69794 cycles testing speed of multibuffer ecb(aria) (ecb(aria-generic)) decryption test 0 (128 bit key, 16 byte blocks): 1 operation in 545 cycles test 2 (128 bit key, 128 byte blocks): 1 operation in 1995 cycles test 3 (128 bit key, 256 byte blocks): 1 operation in 3673 cycles test 6 (128 bit key, 4096 byte blocks): 1 operation in 52359 cycles test 7 (256 bit key, 16 byte blocks): 1 operation in 615 cycles test 9 (256 bit key, 128 byte blocks): 1 operation in 2588 cycles test 10 (256 bit key, 256 byte blocks): 1 operation in 4712 cycles test 13 (256 bit key, 4096 byte blocks): 1 operation in 69916 cycles How to test: modprobe aria tcrypt mode=610 num_mb=8192 Result: testing speed of multibuffer ecb(aria) (ecb-aria-avx) encryption test 0 (128 bit key, 16 byte blocks): 1 operation in 727 cycles test 2 (128 bit key, 128 byte blocks): 1 operation in 2040 cycles test 3 (128 bit key, 256 byte blocks): 1 operation in 1399 cycles test 6 (128 bit key, 4096 byte blocks): 1 operation in 14758 cycles test 7 (256 bit key, 16 byte blocks): 1 operation in 702 cycles test 9 (256 bit key, 128 byte blocks): 1 operation in 2615 cycles test 10 (256 bit key, 256 byte blocks): 1 operation in 1677 cycles test 13 (256 bit key, 4096 byte blocks): 1 operation in 19454 cycles testing speed of multibuffer ecb(aria) (ecb-aria-avx) decryption test 0 (128 bit key, 16 byte blocks): 1 operation in 638 cycles test 2 (128 bit key, 128 byte blocks): 1 operation in 2090 cycles test 3 (128 bit key, 256 byte blocks): 1 operation in 1394 cycles test 6 (128 bit key, 4096 byte blocks): 1 operation in 14824 cycles test 7 (256 bit key, 16 byte blocks): 1 operation in 719 cycles test 9 (256 bit key, 128 byte blocks): 1 operation in 2633 cycles test 10 (256 bit key, 256 byte blocks): 1 operation in 1684 cycles test 13 (256 bit key, 4096 byte blocks): 1 operation in 19457 cycles Taehee Yoo (3): crypto: aria: prepare generic module for optimized implementations crypto: aria-avx: add AES-NI/AVX/x86_64 assembler implementation of aria cipher crypto: tcrypt: add async speed test for aria cipher arch/x86/crypto/Makefile | 3 + arch/x86/crypto/aria-aesni-avx-asm_64.S | 648 ++++++++++++++++++++++++ arch/x86/crypto/aria_aesni_avx_glue.c | 165 ++++++ crypto/Kconfig | 21 + crypto/Makefile | 2 +- crypto/{aria.c => aria_generic.c} | 39 +- crypto/tcrypt.c | 13 + include/crypto/aria.h | 14 +- 8 files changed, 889 insertions(+), 16 deletions(-) create mode 100644 arch/x86/crypto/aria-aesni-avx-asm_64.S create mode 100644 arch/x86/crypto/aria_aesni_avx_glue.c rename crypto/{aria.c => aria_generic.c} (86%)