Add testing of aarch64 linux (#96)

Jake-Shadle · web-flow · commit 84733c534ecc · 2025-05-13T19:05:09.000+02:00
* Add testing of aarch64 linux

* Ignore float state for now

* Fix unneccessary stack copy

* Adjust aarch64 error

* Reenable CI
diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml
@@ -16,7 +16,11 @@ jobs:
     name: Lint
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-14]
+        os:
+          - ubuntu-24.04
+          - windows-2022
+          - macos-14
+          - ubuntu-24.04-arm
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -39,26 +43,28 @@ jobs:
     name: Test
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-14]
+        os:
+          - ubuntu-24.04
+          - windows-2022
+          - macos-14
+          - ubuntu-24.04-arm
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
       - run: cargo fetch
       - name: cargo test build
-        run: cargo build --tests
+        run: cargo build --tests --all-features
       - name: cargo test
-        run: cargo test
+        run: cargo test --all-features
 
   build-android:
     name: Build sources
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         job:
-          #- { target: aarch64-unknown-linux-gnu, toolchain: stable }
-          - { target: aarch64-unknown-linux-musl, toolchain: stable }
           - { target: aarch64-linux-android, toolchain: stable }
           - { target: arm-unknown-linux-gnueabihf, toolchain: stable }
     steps:
@@ -82,14 +88,14 @@ jobs:
 
   deny-check:
     name: cargo-deny
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v2
 
   publish-check:
     name: Publish Check
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
@@ -103,7 +109,7 @@ jobs:
           cargo publish --dry-run --manifest-path sadness-generator/Cargo.toml
 
   all:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [lint, test, build-android, deny-check, publish-check]
     steps:
       - run: echo "All test jobs passed"
diff --git a/crash-handler/src/lib.rs b/crash-handler/src/lib.rs
@@ -9,7 +9,7 @@ pub use error::Error;
 #[macro_export]
 macro_rules! debug_print {
     ($s:literal) => {
-        let cstr = concat!($s, "\n");
+        let cstr = concat!(file!(), ":", line!(), " ", $s, "\n");
         $crate::write_stderr(cstr);
     };
 }
diff --git a/crash-handler/src/linux/state.rs b/crash-handler/src/linux/state.rs
@@ -402,8 +402,8 @@ unsafe extern "C" fn signal_handler(
 
 /// The size of `CrashContext` can be too big w.r.t the size of alternatate stack
 /// for `signal_handler`. Keep the crash context as a .bss field.
-static CRASH_CONTEXT: parking_lot::Mutex<mem::MaybeUninit<crash_context::CrashContext>> =
-    parking_lot::const_mutex(mem::MaybeUninit::uninit());
+static CRASH_CONTEXT: parking_lot::Mutex<crash_context::CrashContext> =
+    parking_lot::const_mutex(unsafe { mem::zeroed() });
 
 pub(super) struct HandlerInner {
     handler: Box<dyn crate::CrashEvent>,
@@ -430,18 +430,25 @@ impl HandlerInner {
             // that we require
             let nix_info = &*((info as *const libc::siginfo_t).cast::<libc::signalfd_siginfo>());
 
+            debug_print!("acquired siginfo");
+
             // Allow ourselves to be dumped, if that is what the user handler wishes to do
             let _set_dumpable = SetDumpable::new(self.dump_process);
-            let mut crash_ctx = CRASH_CONTEXT.lock();
+            debug_print!("set dumpable");
+            let mut cc = CRASH_CONTEXT.lock();
 
             {
-                *crash_ctx = mem::MaybeUninit::zeroed();
-                let cc = &mut *crash_ctx.as_mut_ptr();
+                use std::ops::DerefMut;
+                #[allow(clippy::explicit_deref_methods)]
+                ptr::write_bytes(cc.deref_mut(), 0, 1);
+                debug_print!("zeroed crashctx");
 
                 ptr::copy_nonoverlapping(nix_info, &mut cc.siginfo, 1);
+                debug_print!("copied siginfo");
 
                 let uc_ptr = &*(uc as *const libc::c_void).cast::<crash_context::ucontext_t>();
                 ptr::copy_nonoverlapping(uc_ptr, &mut cc.context, 1);
+                debug_print!("copied context");
 
                 cfg_if::cfg_if! {
                     if #[cfg(target_arch = "aarch64")] {
@@ -453,7 +460,6 @@ impl HandlerInner {
                     } else if #[cfg(not(target_arch = "arm"))] {
                         if !uc_ptr.uc_mcontext.fpregs.is_null() {
                             ptr::copy_nonoverlapping(uc_ptr.uc_mcontext.fpregs, ((&mut cc.float_state) as *mut crash_context::fpregset_t).cast(), 1);
-
                         }
                     }
                 }
@@ -462,7 +468,7 @@ impl HandlerInner {
                 cc.tid = libc::syscall(libc::SYS_gettid) as i32;
             }
 
-            self.handler.on_crash(&*crash_ctx.as_ptr())
+            self.handler.on_crash(&cc)
         }
     }
 }
diff --git a/minidumper-test/src/lib.rs b/minidumper-test/src/lib.rs
@@ -315,8 +315,7 @@ pub fn assert_minidump(md_buf: &[u8], signal: Signal) {
         ($expected:pat) => {
             assert!(
                 matches!(crash_reason, $expected),
-                "crash reason: {:?}",
-                crash_reason
+                "crash reason: {crash_reason:?}",
             );
         };
     }
@@ -336,14 +335,27 @@ pub fn assert_minidump(md_buf: &[u8], signal: Signal) {
                 ));
             }
             Signal::Fpe => {
-                verify!(CrashReason::LinuxSigfpe(
-                    errors::ExceptionCodeLinuxSigfpeKind::FPE_INTDIV
-                ));
+                if cfg!(not(any(target_arch = "aarch64", target_arch = "arm"))) {
+                    verify!(CrashReason::LinuxSigfpe(
+                        errors::ExceptionCodeLinuxSigfpeKind::FPE_INTDIV
+                    ));
+                } else {
+                    verify!(CrashReason::LinuxGeneral(
+                        errors::ExceptionCodeLinux::SIGFPE,
+                        4294967290
+                    ));
+                }
             }
             Signal::Illegal => {
-                verify!(CrashReason::LinuxSigill(
-                    errors::ExceptionCodeLinuxSigillKind::ILL_ILLOPN
-                ));
+                if cfg!(not(any(target_arch = "aarch64", target_arch = "arm"))) {
+                    verify!(CrashReason::LinuxSigill(
+                        errors::ExceptionCodeLinuxSigillKind::ILL_ILLOPN
+                    ));
+                } else {
+                    verify!(CrashReason::LinuxSigill(
+                        errors::ExceptionCodeLinuxSigillKind::ILL_ILLOPC
+                    ));
+                }
             }
             Signal::Segv => {
                 verify!(CrashReason::LinuxSigsegv(
@@ -362,10 +374,16 @@ pub fn assert_minidump(md_buf: &[u8], signal: Signal) {
                 ));
             }
             Signal::Trap => {
-                verify!(CrashReason::LinuxGeneral(
-                    errors::ExceptionCodeLinux::SIGTRAP,
-                    _
-                ));
+                if cfg!(not(any(target_arch = "aarch64", target_arch = "arm"))) {
+                    verify!(CrashReason::LinuxGeneral(
+                        errors::ExceptionCodeLinux::SIGTRAP,
+                        _
+                    ));
+                } else {
+                    verify!(CrashReason::LinuxSigtrap(
+                        errors::ExceptionCodeLinuxSigtrapKind::TRAP_BRKPT
+                    ));
+                }
             }
             #[cfg(windows)]
             Signal::Purecall | Signal::InvalidParameter | Signal::HeapCorruption => {
diff --git a/minidumper/src/ipc/server.rs b/minidumper/src/ipc/server.rs
@@ -455,9 +455,15 @@ impl Server {
 
         cfg_if::cfg_if! {
             if #[cfg(any(target_os = "linux", target_os = "android"))] {
+                #[allow(unsafe_code)]
+                let crash_context = minidump_writer::crash_context::CrashContext {
+                    inner: unsafe { std::mem::transmute_copy(&crash_context) },
+                };
+
                 let mut writer =
-                    minidump_writer::minidump_writer::MinidumpWriter::new(crash_context.pid, crash_context.tid);
-                writer.set_crash_context(minidump_writer::crash_context::CrashContext { inner: crash_context });
+                    minidump_writer::minidump_writer::MinidumpWriter::new(crash_context.inner.pid, crash_context.inner.tid);
+
+                writer.set_crash_context(crash_context);
             } else if #[cfg(target_os = "windows")] {
                 // SAFETY: Unfortunately this is a bit dangerous since we are relying on the crashing process
                 // to still be alive and still have the interior pointers in the crash context still at the

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ pub use error::Error;`
`9`	`9`	`#[macro_export]`
`10`	`10`	`macro_rules! debug_print {`
`11`	`11`	`($s:literal) => {`
`12`		`- let cstr = concat!($s, "\n");`
	`12`	`+ let cstr = concat!(file!(), ":", line!(), " ", $s, "\n");`
`13`	`13`	`$crate::write_stderr(cstr);`
`14`	`14`	`};`
`15`	`15`	`}`