Date: Fri, 21 Jun 2024 03:24:21 GMT From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 3465f14dac7d - main - ossl: Add support for powerpc64/powerpc64le Message-ID: <202406210324.45L3OLh5031964@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=3465f14dac7dc4efaf1f8b4e10c2a00b2db7c513 commit 3465f14dac7dc4efaf1f8b4e10c2a00b2db7c513 Author: Shawn Anastasio <sanatasio@raptorengineering.com> AuthorDate: 2024-06-21 07:15:55 +0000 Commit: Justin Hibbits <jhibbits@FreeBSD.org> CommitDate: 2024-06-21 07:29:04 +0000 ossl: Add support for powerpc64/powerpc64le Summary: Add support for building ossl(4) on powerpc64* by implementing ossl_cpuid and other support functions for powerpc. The required assembly files for ppc were already present in-tree. Test Plan: The changes were tested using the in-tree tools/tools/crypto/cryptocheck.c tool on both powerpc64 and powerpc64le on a POWER9 system. Reviewed by: #powerpc, jhibbits, jhb Differential Revision: https://reviews.freebsd.org/D41837 --- sys/conf/files.powerpc | 43 ++++++++++++ sys/crypto/openssl/ossl_aes.c | 4 ++ sys/crypto/openssl/ossl_ppc.c | 154 ++++++++++++++++++++++++++++++++++++++++++ sys/crypto/openssl/ossl_ppc.h | 45 ++++++++++++ sys/modules/Makefile | 3 +- sys/modules/ossl/Makefile | 42 ++++++++++++ sys/powerpc/conf/GENERIC64 | 1 + sys/powerpc/conf/GENERIC64LE | 1 + 8 files changed, 292 insertions(+), 1 deletion(-) diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 1baacb5628c7..96e891577917 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -20,6 +20,49 @@ contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-p8.S optional zfs compile-with contrib/openzfs/module/icp/asm-ppc64/sha2/sha256-ppc.S optional zfs compile-with "${ZFS_S}" contrib/openzfs/module/icp/asm-ppc64/sha2/sha512-ppc.S optional zfs compile-with "${ZFS_S}" +# openssl ppc common files +crypto/openssl/ossl_ppc.c optional ossl powerpc64 | ossl powerpc64le + +# openssl assembly files (powerpc64le) +crypto/openssl/powerpc64le/aes-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/aesp8-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/chacha-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ecp_nistz256-ppc64.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ghashp8-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/keccak1600-ppc64.S optional ossl powerpc64le +crypto/openssl/powerpc64le/poly1305-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/poly1305-ppcfp.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ppc-mont.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/ppccpuid.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha1-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha256-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha256p8-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha512-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/sha512p8-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/vpaes-ppc.S optional ossl powerpc64le +crypto/openssl/powerpc64le/x25519-ppc64.S optional ossl powerpc64le + +# openssl assembly files (powerpc64) +crypto/openssl/powerpc64/aes-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/aesp8-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/chacha-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/ecp_nistz256-ppc64.S optional ossl powerpc64 +crypto/openssl/powerpc64/ghashp8-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/keccak1600-ppc64.S optional ossl powerpc64 +crypto/openssl/powerpc64/poly1305-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/poly1305-ppcfp.S optional ossl powerpc64 +crypto/openssl/powerpc64/ppc-mont.S optional ossl powerpc64 +crypto/openssl/powerpc64/ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/ppccpuid.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha1-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha256-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha256p8-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha512-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/sha512p8-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/vpaes-ppc.S optional ossl powerpc64 +crypto/openssl/powerpc64/x25519-ppc64.S optional ossl powerpc64 + cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc | dtrace powerpc | zfs powerpcspe | dtrace powerpcspe compile-with "${ZFS_C}" cddl/dev/dtrace/powerpc/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" cddl/dev/dtrace/powerpc/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}" diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index b6425035f031..dd24e5875c45 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -41,6 +41,10 @@ #include <crypto/openssl/ossl_aarch64.h> #elif defined (__arm__) #include <crypto/openssl/ossl_arm.h> +#elif defined (__powerpc64__) +#include <crypto/openssl/ossl_ppc.h> +#else +#error "Unsupported architecture!" #endif static ossl_cipher_process_t ossl_aes_cbc; diff --git a/sys/crypto/openssl/ossl_ppc.c b/sys/crypto/openssl/ossl_ppc.c new file mode 100644 index 000000000000..0951745c4b43 --- /dev/null +++ b/sys/crypto/openssl/ossl_ppc.c @@ -0,0 +1,154 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Raptor Engineering, LLC + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/libkern.h> +#include <sys/malloc.h> + +#include <machine/cpu.h> + +#include <crypto/openssl/ossl.h> +#include <crypto/openssl/ossl_cipher.h> +#include <crypto/openssl/ossl_ppc.h> + +unsigned int OPENSSL_ppccap_P = 0; + +ossl_cipher_setkey_t aes_p8_set_encrypt_key; +ossl_cipher_setkey_t aes_p8_set_decrypt_key; +ossl_cipher_setkey_t vpaes_set_encrypt_key; +ossl_cipher_setkey_t vpaes_set_decrypt_key; + +void +ossl_cpuid(struct ossl_softc *sc) +{ + if (cpu_features2 & PPC_FEATURE2_HAS_VEC_CRYPTO) { + OPENSSL_ppccap_P |= PPC_CRYPTO207; + } + + if (cpu_features2 & PPC_FEATURE2_ARCH_3_00) { + OPENSSL_ppccap_P |= PPC_MADD300; + } + + if (cpu_features & PPC_FEATURE_64) { + OPENSSL_ppccap_P |= PPC_MFTB; + } else { + OPENSSL_ppccap_P |= PPC_MFSPR268; + } + + if (cpu_features & PPC_FEATURE_HAS_FPU) { + OPENSSL_ppccap_P |= PPC_FPU; + + if (cpu_features & PPC_FEATURE_64) { + OPENSSL_ppccap_P |= PPC_FPU64; + } + } + + if (cpu_features & PPC_FEATURE_HAS_ALTIVEC) { + OPENSSL_ppccap_P |= PPC_ALTIVEC; + } + + /* Pick P8 crypto if available, otherwise fall back to altivec */ + if (OPENSSL_ppccap_P & PPC_CRYPTO207) { + ossl_cipher_aes_cbc.set_encrypt_key = aes_p8_set_encrypt_key; + ossl_cipher_aes_cbc.set_decrypt_key = aes_p8_set_decrypt_key; + sc->has_aes = true; + } else if (OPENSSL_ppccap_P & PPC_ALTIVEC) { + ossl_cipher_aes_cbc.set_encrypt_key = vpaes_set_encrypt_key; + ossl_cipher_aes_cbc.set_decrypt_key = vpaes_set_decrypt_key; + sc->has_aes = true; + } +} + +/* + * The following trivial wrapper functions were copied from OpenSSL 1.1.1v's + * crypto/ppccap.c. + */ + +void sha256_block_p8(void *ctx, const void *inp, size_t len); +void sha256_block_ppc(void *ctx, const void *inp, size_t len); +void sha256_block_data_order(void *ctx, const void *inp, size_t len); +void sha256_block_data_order(void *ctx, const void *inp, size_t len) +{ + OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha256_block_p8(ctx, inp, len) : + sha256_block_ppc(ctx, inp, len); +} + +void sha512_block_p8(void *ctx, const void *inp, size_t len); +void sha512_block_ppc(void *ctx, const void *inp, size_t len); +void sha512_block_data_order(void *ctx, const void *inp, size_t len); +void sha512_block_data_order(void *ctx, const void *inp, size_t len) +{ + OPENSSL_ppccap_P & PPC_CRYPTO207 ? sha512_block_p8(ctx, inp, len) : + sha512_block_ppc(ctx, inp, len); +} + +void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); +void ChaCha20_ctr32_vmx(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); +void ChaCha20_ctr32_vsx(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); +void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]); +void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp, + size_t len, const unsigned int key[8], + const unsigned int counter[4]) +{ + OPENSSL_ppccap_P & PPC_CRYPTO207 + ? ChaCha20_ctr32_vsx(out, inp, len, key, counter) + : OPENSSL_ppccap_P & PPC_ALTIVEC + ? ChaCha20_ctr32_vmx(out, inp, len, key, counter) + : ChaCha20_ctr32_int(out, inp, len, key, counter); +} + +void poly1305_init_int(void *ctx, const unsigned char key[16]); +void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, + unsigned int padbit); +void poly1305_emit(void *ctx, unsigned char mac[16], + const unsigned int nonce[4]); +void poly1305_init_fpu(void *ctx, const unsigned char key[16]); +void poly1305_blocks_fpu(void *ctx, const unsigned char *inp, size_t len, + unsigned int padbit); +void poly1305_emit_fpu(void *ctx, unsigned char mac[16], + const unsigned int nonce[4]); +int poly1305_init(void *ctx, const unsigned char key[16], void *func[2]); +int poly1305_init(void *ctx, const unsigned char key[16], void *func[2]) +{ + if (sizeof(size_t) == 4 && (OPENSSL_ppccap_P & PPC_FPU)) { + poly1305_init_fpu(ctx, key); + func[0] = (void*)(uintptr_t)poly1305_blocks_fpu; + func[1] = (void*)(uintptr_t)poly1305_emit_fpu; + } else { + poly1305_init_int(ctx, key); + func[0] = (void*)(uintptr_t)poly1305_blocks; + func[1] = (void*)(uintptr_t)poly1305_emit; + } + return 1; +} diff --git a/sys/crypto/openssl/ossl_ppc.h b/sys/crypto/openssl/ossl_ppc.h new file mode 100644 index 000000000000..5f685687d27e --- /dev/null +++ b/sys/crypto/openssl/ossl_ppc.h @@ -0,0 +1,45 @@ +/* + * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the OpenSSL license (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef __OSSL_PPC__ +#define __OSSL_PPC__ + +#include <crypto/openssl/ossl.h> +#include <crypto/openssl/ossl_cipher.h> + +extern unsigned int OPENSSL_ppccap_P; + +/* + * Flags' usage can appear ambiguous, because they are set rather + * to reflect OpenSSL performance preferences than actual processor + * capabilities. + */ +# define PPC_FPU64 (1<<0) +# define PPC_ALTIVEC (1<<1) +# define PPC_CRYPTO207 (1<<2) +# define PPC_FPU (1<<3) +# define PPC_MADD300 (1<<4) +# define PPC_MFTB (1<<5) +# define PPC_MFSPR268 (1<<6) + +/* aesp8-ppc.S */ +ossl_cipher_encrypt_t aes_p8_cbc_encrypt; +/* vpaes-ppc.S */ +ossl_cipher_encrypt_t vpaes_cbc_encrypt; + +static void +AES_CBC_ENCRYPT(const unsigned char *in, unsigned char *out, + size_t length, const void *key, unsigned char *iv, int encrypt) +{ + if (OPENSSL_ppccap_P & PPC_CRYPTO207) + aes_p8_cbc_encrypt(in, out, length, key, iv, encrypt); + else + vpaes_cbc_encrypt(in, out, length, key, iv, encrypt); +} +#endif diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 5ef245f17051..be7539e9eae1 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -577,7 +577,8 @@ _vmware= vmware .endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "i386" || ${MACHINE_ARCH} == "armv7" + ${MACHINE_CPUARCH} == "i386" || ${MACHINE_ARCH} == "armv7" || \ + ${MACHINE_ARCH:Mpowerpc64*} != "" _ossl= ossl .endif diff --git a/sys/modules/ossl/Makefile b/sys/modules/ossl/Makefile index 9777e0bcfacc..edaebe26ff9a 100644 --- a/sys/modules/ossl/Makefile +++ b/sys/modules/ossl/Makefile @@ -59,6 +59,48 @@ SRCS.i386= \ sha512-586.S \ ossl_x86.c +SRCS.powerpc64le= \ + ossl_ppccap.c \ + aes-ppc.S \ + aesp8-ppc.S \ + chacha-ppc.S \ + ecp_nistz256-ppc64.S \ + ghashp8-ppc.S \ + keccak1600-ppc64.S \ + poly1305-ppc.S \ + poly1305-ppcfp.S \ + ppc-mont.S \ + ppc.S \ + ppccpuid.S \ + sha1-ppc.S \ + sha256-ppc.S \ + sha256p8-ppc.S \ + sha512-ppc.S \ + sha512p8-ppc.S \ + vpaes-ppc.S \ + x25519-ppc64.S + +SRCS.powerpc64= \ + ossl_ppccap.c \ + aes-ppc.S \ + aesp8-ppc.S \ + chacha-ppc.S \ + ecp_nistz256-ppc64.S \ + ghashp8-ppc.S \ + keccak1600-ppc64.S \ + poly1305-ppc.S \ + poly1305-ppcfp.S \ + ppc-mont.S \ + ppc.S \ + ppccpuid.S \ + sha1-ppc.S \ + sha256-ppc.S \ + sha256p8-ppc.S \ + sha512-ppc.S \ + sha512p8-ppc.S \ + vpaes-ppc.S \ + x25519-ppc64.S + CFLAGS.bsaes-armv7.S+= -D__KERNEL__ CFLAGS+= -I${SRCTOP}/sys/crypto/openssl diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 2a5e3d377ab8..79f484e02dbc 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -191,6 +191,7 @@ device mlx5en # Ethernet driver # Pseudo devices. device crypto # core crypto support +device ossl # OpenSSL OpenCrypto module device loop # Network loopback device ether # Ethernet support device vlan # 802.1Q VLAN support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 63e10df90200..61f67b7246c6 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -187,6 +187,7 @@ device mlx5en # Ethernet driver # Pseudo devices. device crypto # core crypto support +device ossl # OpenSSL OpenCrypto module device loop # Network loopback device ether # Ethernet support device vlan # 802.1Q VLAN support
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406210324.45L3OLh5031964>