From f915ea551e3b9e247a4369ee5f9ecb173918ad56 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Thu, 10 Sep 2026 13:53:39 -0600
Subject: [PATCH] cpufeatures: add Speculation Barrier (SB) support for AArch64

As suggested in #1472, this instruction is needed by the `aarch64-dit`
crate to properly implement Data-Independent Timing:

https://support.arm.com/documentation/ddi0487/mb/-Part-B-The-AArch64-Application-Level-Architecture/-Chapter-B2-The-AArch64-Application-Level-Memory-Model/-B2-6-Memory-barriers/-B2-6-3-Speculation-Barrier

The usage on Apple targets is covered here:

https://developer.apple.com/documentation/xcode/writing-arm64-code-for-apple-platforms#Enable-DIT-for-constant-time-cryptographic-operations

> "To ensure that subsequent instruction timing reflects the updated DIT
> processor state, add a speculation barrier after turning on DIT.
> Use the sb instruction to add a speculation barrier"

This PR is effectively an extraction of the `cpufeatures`-related
changes originally suggested in this patch from #1472:

https://github.com/RustCrypto/utils/commit/f31f41cb4c5089b7ce0fd20b818f335a64bbf2c3
---
 cpufeatures/src/aarch64.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/cpufeatures/src/aarch64.rs b/cpufeatures/src/aarch64.rs
index bb955418..24386621 100644
--- a/cpufeatures/src/aarch64.rs
+++ b/cpufeatures/src/aarch64.rs
@@ -67,10 +67,11 @@ macro_rules! __expand_check_macro {
 #[cfg(any(target_os = "linux", target_os = "android"))]
 __expand_check_macro! {
     ("aes",    AES),    // Enable AES support.
-    ("dit",    DIT),    // Enable DIT support.
+    ("dit",    DIT),    // Enable Data-Independent Timing support.
     ("sha2",   SHA2),   // Enable SHA1 and SHA256 support.
     ("sha3",   SHA3),   // Enable SHA512 and SHA3 support.
     ("sm4",    SM4),    // Enable SM3 and SM4 support.
+    ("sb",     SB),     // Enable Speculation Barrier support
 }
 
 /// Linux hardware capabilities mapped to target features.
@@ -89,6 +90,7 @@ pub mod hwcaps {
     pub const SHA2: c_ulong = libc::HWCAP_SHA2;
     pub const SHA3: c_ulong = libc::HWCAP_SHA3 | libc::HWCAP_SHA512;
     pub const SM4: c_ulong = libc::HWCAP_SM3 | libc::HWCAP_SM4;
+    pub const SB: c_ulong = libc::HWCAP_SB;
 }
 
 // Apple OS (macOS, iOS, watchOS, and tvOS) `check!` macro.
@@ -128,6 +130,12 @@ macro_rules! check {
     ("sm4") => {
         false
     };
+    ("sb") => {
+        // https://support.arm.com/documentation/ddi0487/mb/-Part-B-The-AArch64-Application-Level-Architecture/-Chapter-B2-The-AArch64-Application-Level-Memory-Model/-B2-6-Memory-barriers/-B2-6-3-Speculation-Barrier
+        unsafe {
+            $crate::aarch64::sysctlbyname(b"hw.optional.arm.FEAT_SB\0")
+        }
+    };
 }
 
 /// Apple helper function for calling `sysctlbyname`.