Replace aarch64 CPU capabilities detection code.

Replace the aarch64 CPU detection code with a version that parses ISAR0,
avoiding signal handling and SIGILL. This gets ISAR0 via sysctl(), but this
can be adapted to other mechanisms for other platforms (or alternatively
the same can be achieved via HWCAP).

This now follows the same naming/design as used by amd64 and i386, hence
define HAVE_CRYPTO_CPU_CAPS_INIT for aarch64.

ok kettenis@ tb@

6 files changed, 114 insertions, 261 deletions

diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc
index a17ef7f5a9..20a634dc99 100644
--- a/src/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,15 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.13 2024/03/29 07:24:09 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2024/11/08 13:34:24 jsing Exp $
 
 # aarch64-specific libcrypto build rules
 
-.for dir f in ${SSLASM}
-SRCS+=  ${f}.S
-GENERATED+=${f}.S
-${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
-        /usr/bin/perl \
-                ${LCRYPTO_SRC}/${dir}/asm/${f}.pl void ${.TARGET} > ${.TARGET}
-.endfor
+SRCS += crypto_cpu_caps.c
 
-CFLAGS+= -DOPENSSL_CPUID_OBJ
 AFLAGS+= -mmark-bti-property
-SRCS+=  arm64cpuid.S arm64cap.c
diff --git a/src/lib/libcrypto/arch/aarch64/arm64_arch.h b/src/lib/libcrypto/arch/aarch64/arm64_arch.h
deleted file mode 100644
index 7f35acaa7d..0000000000
--- a/src/lib/libcrypto/arch/aarch64/arm64_arch.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $OpenBSD: arm64_arch.h,v 1.1 2022/03/23 15:13:31 tb Exp $ */
-#ifndef __ARM_ARCH_H__
-#define __ARM_ARCH_H__
-
-#if !defined(__ARM_ARCH__)
-# if defined(__CC_ARM)
-#  define __ARM_ARCH__ __TARGET_ARCH_ARM
-#  if defined(__BIG_ENDIAN)
-#   define __ARMEB__
-#  else
-#   define __ARMEL__
-#  endif
-# elif defined(__GNUC__)
-  /*
-   * Why doesn't gcc define __ARM_ARCH__? Instead it defines
-   * bunch of below macros. See all_architectures[] table in
-   * gcc/config/arm/arm.c. On a side note it defines
-   * __ARMEL__/__ARMEB__ for little-/big-endian.
-   */
-#  if   defined(__ARM_ARCH)
-#   define __ARM_ARCH__ __ARM_ARCH
-#  elif defined(__ARM_ARCH_8A__)
-#   define __ARM_ARCH__ 8
-#  elif defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__)     || \
-        defined(__ARM_ARCH_7R__)|| defined(__ARM_ARCH_7M__)     || \
-        defined(__ARM_ARCH_7EM__)
-#   define __ARM_ARCH__ 7
-#  elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__)     || \
-        defined(__ARM_ARCH_6K__)|| defined(__ARM_ARCH_6M__)     || \
-        defined(__ARM_ARCH_6Z__)|| defined(__ARM_ARCH_6ZK__)    || \
-        defined(__ARM_ARCH_6T2__)
-#   define __ARM_ARCH__ 6
-#  elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__)     || \
-        defined(__ARM_ARCH_5E__)|| defined(__ARM_ARCH_5TE__)    || \
-        defined(__ARM_ARCH_5TEJ__)
-#   define __ARM_ARCH__ 5
-#  elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
-#   define __ARM_ARCH__ 4
-#  else
-#   error "unsupported ARM architecture"
-#  endif
-# endif
-#endif
-
-#if !defined(__ASSEMBLER__)
-extern unsigned int OPENSSL_armcap_P;
-
-#define ARMV7_NEON      (1<<0)
-#define ARMV8_AES       (1<<1)
-#define ARMV8_SHA1      (1<<2)
-#define ARMV8_SHA256    (1<<3)
-#define ARMV8_PMULL     (1<<4)
-#endif
-
-#if defined(__OpenBSD__)
-#define __STRICT_ALIGNMENT
-#endif
-
-#endif
diff --git a/src/lib/libcrypto/arch/aarch64/arm64cap.c b/src/lib/libcrypto/arch/aarch64/arm64cap.c
deleted file mode 100644
index aeacebfcb4..0000000000
--- a/src/lib/libcrypto/arch/aarch64/arm64cap.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* $OpenBSD: arm64cap.c,v 1.4 2024/08/29 03:30:05 deraadt Exp $ */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <openssl/crypto.h>
-
-#if defined(__OpenBSD__)
-#include <sys/sysctl.h>
-#include <machine/cpu.h>        /* CPU_ID_AA64ISAR0 */
-#endif
-
-#include "arm64_arch.h"
-
-/* ID_AA64ISAR0_EL1 required for OPENSSL_cpuid_setup */
-#define ID_AA64ISAR0_AES_SHIFT          4
-#define ID_AA64ISAR0_AES_MASK           (0xf << ID_AA64ISAR0_AES_SHIFT)
-#define ID_AA64ISAR0_AES(x)             ((x) & ID_AA64ISAR0_AES_MASK)
-#define  ID_AA64ISAR0_AES_BASE          (0x1 << ID_AA64ISAR0_AES_SHIFT)
-#define  ID_AA64ISAR0_AES_PMULL         (0x2 << ID_AA64ISAR0_AES_SHIFT)
-#define ID_AA64ISAR0_SHA1_SHIFT         8
-#define ID_AA64ISAR0_SHA1_MASK          (0xf << ID_AA64ISAR0_SHA1_SHIFT)
-#define ID_AA64ISAR0_SHA1(x)            ((x) & ID_AA64ISAR0_SHA1_MASK)
-#define  ID_AA64ISAR0_SHA1_BASE         (0x1 << ID_AA64ISAR0_SHA1_SHIFT)
-#define ID_AA64ISAR0_SHA2_SHIFT         12
-#define ID_AA64ISAR0_SHA2_MASK          (0xf << ID_AA64ISAR0_SHA2_SHIFT)
-#define ID_AA64ISAR0_SHA2(x)            ((x) & ID_AA64ISAR0_SHA2_MASK)
-#define  ID_AA64ISAR0_SHA2_BASE         (0x1 << ID_AA64ISAR0_SHA2_SHIFT)
-
-unsigned int OPENSSL_armcap_P;
-
-#if defined(CPU_ID_AA64ISAR0)
-void
-OPENSSL_cpuid_setup(void)
-{
-        int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
-        size_t len = sizeof(uint64_t);
-        uint64_t cpu_id = 0;
-
-        if (OPENSSL_armcap_P != 0)
-                return;
-
-        if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0)
-                return;
-
-        OPENSSL_armcap_P |= ARMV7_NEON;
-
-        if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_BASE)
-                OPENSSL_armcap_P |= ARMV8_AES;
-
-        if (ID_AA64ISAR0_AES(cpu_id) >= ID_AA64ISAR0_AES_PMULL)
-                OPENSSL_armcap_P |= ARMV8_PMULL;
-
-        if (ID_AA64ISAR0_SHA1(cpu_id) >= ID_AA64ISAR0_SHA1_BASE)
-                OPENSSL_armcap_P |= ARMV8_SHA1;
-
-        if (ID_AA64ISAR0_SHA2(cpu_id) >= ID_AA64ISAR0_SHA2_BASE)
-                OPENSSL_armcap_P |= ARMV8_SHA256;
-}
-#else
-#if __ARM_ARCH__ >= 7
-static sigset_t all_masked;
-
-static sigjmp_buf ill_jmp;
-
-static void
-ill_handler(int sig)
-{
-        siglongjmp(ill_jmp, sig);
-}
-
-/*
- * Following subroutines could have been inlined, but it's not all
- * ARM compilers support inline assembler...
- */
-void _armv7_neon_probe(void);
-void _armv8_aes_probe(void);
-void _armv8_sha1_probe(void);
-void _armv8_sha256_probe(void);
-void _armv8_pmull_probe(void);
-#endif
-
-void
-OPENSSL_cpuid_setup(void)
-{
-#if __ARM_ARCH__ >= 7
-        struct sigaction        ill_oact, ill_act;
-        sigset_t                oset;
-#endif
-        static int trigger = 0;
-
-        if (trigger)
-                return;
-        trigger = 1;
-
-        OPENSSL_armcap_P = 0;
-
-#if __ARM_ARCH__ >= 7
-        sigfillset(&all_masked);
-        sigdelset(&all_masked, SIGILL);
-        sigdelset(&all_masked, SIGTRAP);
-        sigdelset(&all_masked, SIGFPE);
-        sigdelset(&all_masked, SIGBUS);
-        sigdelset(&all_masked, SIGSEGV);
-
-        memset(&ill_act, 0, sizeof(ill_act));
-        ill_act.sa_handler = ill_handler;
-        ill_act.sa_mask = all_masked;
-
-        sigprocmask(SIG_SETMASK, &ill_act.sa_mask, &oset);
-        sigaction(SIGILL, &ill_act, &ill_oact);
-
-        if (sigsetjmp(ill_jmp, 1) == 0) {
-                _armv7_neon_probe();
-                OPENSSL_armcap_P |= ARMV7_NEON;
-                if (sigsetjmp(ill_jmp, 1) == 0) {
-                        _armv8_pmull_probe();
-                        OPENSSL_armcap_P |= ARMV8_PMULL | ARMV8_AES;
-                } else if (sigsetjmp(ill_jmp, 1) == 0) {
-                        _armv8_aes_probe();
-                        OPENSSL_armcap_P |= ARMV8_AES;
-                }
-                if (sigsetjmp(ill_jmp, 1) == 0) {
-                        _armv8_sha1_probe();
-                        OPENSSL_armcap_P |= ARMV8_SHA1;
-                }
-                if (sigsetjmp(ill_jmp, 1) == 0) {
-                        _armv8_sha256_probe();
-                        OPENSSL_armcap_P |= ARMV8_SHA256;
-                }
-        }
-
-        sigaction (SIGILL, &ill_oact, NULL);
-        sigprocmask(SIG_SETMASK, &oset, NULL);
-#endif
-}
-#endif
diff --git a/src/lib/libcrypto/arch/aarch64/arm64cpuid.S b/src/lib/libcrypto/arch/aarch64/arm64cpuid.S
deleted file mode 100644
index 96a9c76fb1..0000000000
--- a/src/lib/libcrypto/arch/aarch64/arm64cpuid.S
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "arm64_arch.h"
-
-.text
-.arch   armv8-a+crypto+sha3
-
-.align  5
-.globl  _armv7_neon_probe
-.type   _armv7_neon_probe,%function
-_armv7_neon_probe:
-        bti     c
-        orr     v15.16b, v15.16b, v15.16b
-        ret
-.size   _armv7_neon_probe,.-_armv7_neon_probe
-
-.globl  _armv8_aes_probe
-.type   _armv8_aes_probe,%function
-_armv8_aes_probe:
-        bti     c
-        aese    v0.16b, v0.16b
-        ret
-.size   _armv8_aes_probe,.-_armv8_aes_probe
-
-.globl  _armv8_sha1_probe
-.type   _armv8_sha1_probe,%function
-_armv8_sha1_probe:
-        bti     c
-        sha1h   s0, s0
-        ret
-.size   _armv8_sha1_probe,.-_armv8_sha1_probe
-
-.globl  _armv8_sha256_probe
-.type   _armv8_sha256_probe,%function
-_armv8_sha256_probe:
-        bti     c
-        sha256su0       v0.4s, v0.4s
-        ret
-.size   _armv8_sha256_probe,.-_armv8_sha256_probe
-
-.globl  _armv8_pmull_probe
-.type   _armv8_pmull_probe,%function
-_armv8_pmull_probe:
-        bti     c
-        pmull   v0.1q, v0.1d, v0.1d
-        ret
-.size   _armv8_pmull_probe,.-_armv8_pmull_probe
-
-.globl  _armv8_sha512_probe
-.type   _armv8_sha512_probe,%function
-_armv8_sha512_probe:
-        bti     c
-        sha512su0       v0.2d,v0.2d
-        ret
-.size   _armv8_sha512_probe,.-_armv8_sha512_probe
diff --git a/src/lib/libcrypto/arch/aarch64/crypto_arch.h b/src/lib/libcrypto/arch/aarch64/crypto_arch.h
index a3dd98d0ce..b0188c498a 100644
--- a/src/lib/libcrypto/arch/aarch64/crypto_arch.h
+++ b/src/lib/libcrypto/arch/aarch64/crypto_arch.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: crypto_arch.h,v 1.1 2024/08/11 13:02:39 jsing Exp $ */
+/*      $OpenBSD: crypto_arch.h,v 1.2 2024/11/08 13:34:24 jsing Exp $ */
 /*
  * Copyright (c) 2024 Joel Sing <jsing@openbsd.org>
  *
@@ -15,7 +15,22 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <stdint.h>
+
 #ifndef HEADER_CRYPTO_ARCH_H
 #define HEADER_CRYPTO_ARCH_H
 
+#define HAVE_CRYPTO_CPU_CAPS_INIT
+
+#ifndef __ASSEMBLER__
+extern uint64_t crypto_cpu_caps_aarch64;
+#endif
+
+#define CRYPTO_CPU_CAPS_AARCH64_AES     (1ULL << 0)
+#define CRYPTO_CPU_CAPS_AARCH64_PMULL   (1ULL << 1)
+#define CRYPTO_CPU_CAPS_AARCH64_SHA1    (1ULL << 2)
+#define CRYPTO_CPU_CAPS_AARCH64_SHA2    (1ULL << 3)
+#define CRYPTO_CPU_CAPS_AARCH64_SHA512  (1ULL << 4)
+#define CRYPTO_CPU_CAPS_AARCH64_SHA3    (1ULL << 5)
+
 #endif
diff --git a/src/lib/libcrypto/arch/aarch64/crypto_cpu_caps.c b/src/lib/libcrypto/arch/aarch64/crypto_cpu_caps.c
new file mode 100644
index 0000000000..24ebfbdf2b
--- /dev/null
+++ b/src/lib/libcrypto/arch/aarch64/crypto_cpu_caps.c
@@ -0,0 +1,96 @@
+/* $OpenBSD: crypto_cpu_caps.c,v 1.1 2024/11/08 13:34:24 jsing Exp $ */
+/*
+ * Copyright (c) 2023 Joel Sing <jsing@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+#include <machine/cpu.h>
+
+#include <stddef.h>
+#include <stdio.h>
+
+#include "crypto_arch.h"
+
+uint64_t crypto_cpu_caps_aarch64;
+
+static inline uint64_t
+extract_bits(uint64_t val, int start, int end)
+{
+        return (val >> end) & (1ULL << (1 + start - end)) - 1;
+}
+
+static uint64_t
+parse_isar0(uint64_t isar0)
+{
+        uint64_t caps = 0;
+        uint64_t feature;
+
+        /* AES - bits [7:4] */
+        feature = extract_bits(isar0, 7, 4);
+        if (feature >= 1)
+                caps |= CRYPTO_CPU_CAPS_AARCH64_AES;
+        if (feature >= 2)
+                caps |= CRYPTO_CPU_CAPS_AARCH64_PMULL;
+
+        /* SHA1 - bits [11:8] */
+        feature = extract_bits(isar0, 11, 8);
+        if (feature >= 1)
+                caps |= CRYPTO_CPU_CAPS_AARCH64_SHA1;
+
+        /* SHA2 - bits [15:12] */
+        feature = extract_bits(isar0, 15, 12);
+        if (feature >= 1)
+                caps |= CRYPTO_CPU_CAPS_AARCH64_SHA2;
+        if (feature >= 2)
+                caps |= CRYPTO_CPU_CAPS_AARCH64_SHA512;
+
+        /* SHA3 - bits [35:32] */
+        feature = extract_bits(isar0, 35, 32);
+        if (feature >= 1)
+                caps |= CRYPTO_CPU_CAPS_AARCH64_SHA3;
+
+        return caps;
+}
+
+static int
+read_isar0(uint64_t *isar0)
+{
+        uint64_t isar;
+        int mib[2];
+        size_t len;
+
+        mib[0] = CTL_MACHDEP;
+        mib[1] = CPU_ID_AA64ISAR0;
+        len = sizeof(isar);
+        if (sysctl(mib, 2, &isar, &len, NULL, 0) == -1)
+                return 0;
+
+        *isar0 = isar;
+
+        return 1;
+}
+
+void
+crypto_cpu_caps_init(void)
+{
+        uint64_t isar = 0;
+
+        if (!read_isar0(&isar))
+                return;
+
+        crypto_cpu_caps_aarch64 = parse_isar0(isar);
+}