[PATCH 00/20] Migrate x86 and RISC-V accelerated AES modes into library
From: Eric Biggers
Date: Mon Sep 21 2026 - 01:22:03 EST
This series applies to v7.3-rc3. It can also be retrieved from:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git aes-lib-x86-riscv-v1
Patch 1 is intended to be taken through libcrypto-fixes for 7.3.
Patches 2-20 are intended to be taken through libcrypto-next for 7.4.
This series migrates the x86 and RISC-V accelerated implementations of
the AES modes ECB, CBC, CTS, CTR, XCTR, and XTS into lib/crypto/.
This makes the corresponding library APIs be properly accelerated on
these architectures, while still accelerating crypto_skcipher as well
(via the library-based code in crypto/aes.c).
It removes a lot of redundant glue code, since crypto API boilerplate no
longer needs to be duplicated per-architecture.
Finally, it fixes the longstanding issue where these optimizations were
disabled by default.
In the case of RISC-V, this series handles all remaining AES code in
arch/riscv/crypto/. In the case of x86, AES-GCM is still left in
arch/x86/crypto/ for now; it will be handled later. Other architectures
will be handled later as well.
For various reasons, aesni-intel_asm.S (i.e. the x86-accelerated ECB,
CBC, CTS, CTR, and XTS code that doesn't use AVX or VAES) is replaced
with new functions written from scratch. The other assembly functions
are kept but are modified slightly for integration into the library.
Eric Biggers (20):
crypto: aes - Fix undesired override of some optimized AES modes
lib/crypto: aes-xctr: Pass counter by value to aes_xctr_arch()
lib/crypto: x86/aes: Clean up aes-aesni.S in preparation for AES modes
lib/crypto: x86/aes-ecb: Add AES-NI optimization
lib/crypto: x86/aes-cbc: Add AES-NI optimization
lib/crypto: x86/aes-ctr: Add AES-NI optimization
lib/crypto: x86/aes-xts: Add AES-NI optimization
crypto: x86/aes-ecb - Remove superseded ECB skcipher
crypto: x86/aes-cbc - Remove superseded CBC skciphers
crypto: x86/aes-ctr - Remove superseded CTR skcipher
crypto: x86/aes-xts - Remove superseded XTS skcipher
lib/crypto: x86/aes-ctr: Migrate AVX-optimized code into library
lib/crypto: x86/aes-xts: Migrate AVX-optimized code into library
crypto: x86/aes - Drop superseded 32-bit build support
lib/crypto: riscv/aes: Copy aes-macros.S to library
lib/crypto: riscv/aes: Pass key struct to assembly code
lib/crypto: riscv/aes-ecb: Migrate optimized code into library
lib/crypto: riscv/aes-cbc: Migrate optimized code into library
lib/crypto: riscv/aes-ctr: Migrate optimized code into library
lib/crypto: riscv/aes-xts: Migrate optimized code into library
arch/riscv/crypto/Kconfig | 15 -
arch/riscv/crypto/Makefile | 4 -
arch/riscv/crypto/aes-riscv64-glue.c | 566 -------
arch/riscv/crypto/aes-riscv64-zvkned.S | 312 ----
arch/x86/crypto/Kconfig | 11 +-
arch/x86/crypto/Makefile | 8 +-
arch/x86/crypto/aesni-intel_asm.S | 1338 -----------------
arch/x86/crypto/aesni-intel_glue.c | 789 +---------
crypto/aes.c | 53 +-
lib/crypto/Makefile | 14 +
lib/crypto/aes.c | 6 +-
.../crypto => lib/crypto/riscv}/aes-macros.S | 25 +-
.../riscv}/aes-riscv64-zvkned-zvbb-zvkg.S | 96 +-
.../crypto/riscv}/aes-riscv64-zvkned-zvkb.S | 23 +-
lib/crypto/riscv/aes-riscv64-zvkned.S | 311 +++-
lib/crypto/riscv/aes.h | 235 ++-
lib/crypto/x86/aes-aesni.S | 823 +++++++++-
.../crypto/x86}/aes-ctr-avx-x86_64.S | 75 +-
.../crypto/x86}/aes-xts-avx-x86_64.S | 172 +--
lib/crypto/x86/aes.h | 371 ++++-
20 files changed, 1824 insertions(+), 3423 deletions(-)
delete mode 100644 arch/riscv/crypto/aes-riscv64-glue.c
delete mode 100644 arch/riscv/crypto/aes-riscv64-zvkned.S
delete mode 100644 arch/x86/crypto/aesni-intel_asm.S
rename {arch/riscv/crypto => lib/crypto/riscv}/aes-macros.S (90%)
rename {arch/riscv/crypto => lib/crypto/riscv}/aes-riscv64-zvkned-zvbb-zvkg.S (75%)
rename {arch/riscv/crypto => lib/crypto/riscv}/aes-riscv64-zvkned-zvkb.S (93%)
rename {arch/x86/crypto => lib/crypto/x86}/aes-ctr-avx-x86_64.S (92%)
rename {arch/x86/crypto => lib/crypto/x86}/aes-xts-avx-x86_64.S (81%)
base-commit: fd73f4a6659897191fa0d40695fe370925dd3780
--
2.55.0