cshung · Nov 11, 2026
@@ -9,6 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ### Fixed
 * Fix restore on WHP not rewinding the guest TSC on hosts with `TSC_ADJUST` support.
+* GDB memory reads and writes translate each guest page on hosts with larger pages.
+* ARM64 GDB snapshot recovery handles cancellation and crash detach. Snapshot checkpointing rejects software breakpoints before replacing memory.
 
 ## [v0.19.0] - 2026-11-04
 

@@ -335,7 +335,7 @@ test-no-surrogate target=default-target:
 # runs tests that exercise gdb debugging
 test-rust-gdb-debugging target=default-target features="":
     {{ cargo-cmd }} test --profile={{ if target == "debug" { "dev" } else { target } }}  {{ target-triple-flag }} --example guest-debugging {{ if features =="" {'--features gdb'} else { "--features gdb," + features } }}
-    {{ cargo-cmd }} test --profile={{ if target == "debug" { "dev" } else { target } }}  {{ target-triple-flag }} -p hyperlight-host --lib {{ if features =="" {'--features gdb'} else { "--features gdb," + features } }} -- hypervisor::gdb::
+    {{ cargo-cmd }} test --profile={{ if target == "debug" { "dev" } else { target } }}  {{ target-triple-flag }} -p hyperlight-host --lib {{ if features =="" {'--features gdb'} else { "--features gdb," + features } }} -- hypervisor::gdb:: hypervisor::hyperlight_vm::debug::tests:: gdb_recovery_tests::
 
 # rust test for crashdump
 test-rust-crashdump target=default-target features="":

@@ -0,0 +1,54 @@
+# GDB commit layers
+
+Each layer is one signed commit. Backend layers depend on shared GDB support,
+not on another backend's debugger.
+
+```text
+main
+|-- A: shared GDB support
+|   |-- B: WHP ARM64 GDB
+|   `-- C: KVM ARM64 GDB
+`-- D: ARM64 MSHV backend and CI
+    `-- E: cherry-pick of A
+        `-- F: MSHV ARM64 GDB
+```
+
+| Layer | Branch | Parent | Contents |
+|---|---|---|---|
+| A | `cshung/gdb-shared` | `main` | Architecture adapters, protocol handling, software breakpoints, page-sized memory access, guest debug vectors, snapshot recovery, common tests |
+| B | `cshung/whp-aarch64-gdb` | A | WHP register access, HVC exits, debug registers, cache synchronization, platform enablement and tests |
+| C | `cshung/kvm-aarch64-gdb` | A | KVM debug exits, debug registers, platform enablement and CI |
+| D | `cshung/mshv-aarch64` | `main` | MSHV VM implementation, register access, reset, runner configuration and bounded CI scheduling |
+| E | `cshung/mshv-aarch64-gdb-shared` | D | A's shared patch |
+| F | `cshung/mshv-aarch64-gdb` | E | MSHV HVC exits, exception context, debug registers, platform enablement and tests |
+
+A retains the existing x86_64 GDB platform guard. B, C and F enable their ARM64
+backend. D and E provide an MSHV backend without ARM64 GDB enablement.
+F rejects KVM debugging until C is integrated.
+
+## Updating layers
+
+* Update A for shared behavior. Rebuild B and C on A, cherry-pick A onto D as E,
+  then rebuild F on E. Validate all three backend tips before publication.
+* Update B or C for a backend-only debugger change. The sibling branch is independent.
+* Update D for MSHV backend or CI changes. Rebuild E and F on D.
+* Update F for an MSHV-only debugger change.
+* Keep A and E patch-equivalent. E's parent and commit ID differ from A's.
+* Squash each layer to one commit. Keep historical tips in local archive branches
+  before rewriting published refs. Push with an explicit lease on each old remote tip.
+
+Run formatting and Clippy on each affected tip. Rebuild guests for guest changes.
+Run the common debugger tests, backend tests and real GDB client tests on WHP,
+KVM and MSHV for shared updates. Validate both the default Linux driver selection
+and the backend-only feature configuration. A history-only rewrite can reuse
+runtime results when the corresponding source files are identical.
+
+## Pull requests
+
+A has a shared-support PR. B uses #1907, C uses #2016, and D uses #1626.
+F has an MSHV GDB PR. E is a cherry-pick, not a second shared-support PR.
+
+The branches live in `cshung/hyperlight`. Native GitHub stacks require head
+branches in the upstream repository. These fork PRs target upstream `main` and
+link their prerequisites and backend-only comparisons in their descriptions.
+Their full PR diffs include unmerged prerequisites.
@@ -3,6 +3,9 @@
 
 use crate::vmem::bits;
 
+/// HVC immediate for forwarding guest exceptions to the Hyper-V debugger.
+pub const DEBUG_EXCEPTION_HVC: u16 = 0x485a;
+
 const ESR_EC_UNKNOWN: u64 = 0b000000; // udf generates this
 const ESR_EC_DATA_ABORT_LOWER_EL: u64 = 0b100100;
 const ESR_EC_DATA_ABORT_SAME_EL: u64 = 0b100101;

@@ -104,10 +104,24 @@ context_restore:\n
     q_off = const offset_of!(ExceptionContext, q),
 );
 
+// Only synchronous exceptions have a syndrome for debug forwarding.
+// The host resumes debug events at ERET and other synchronous exceptions at the prologue.
 macro_rules! vbar_entry {
     ($et:literal, $ef:literal) => {
         concat!(
             "
+            .if {ExceptionType_",
+            $et,
+            "} == {ExceptionType_Synchronous}\n
+            stp x0, x1, [sp, #-16]!\n
+            mrs x0, mdscr_el1\n
+            tbz x0, #13, 1f\n
+            ldp x0, x1, [sp], #16\n
+            hvc #{debug_hvc}\n
+            eret\n
+        1:\n
+            ldp x0, x1, [sp], #16\n
+            .endif\n
             sub sp, sp, #{ctx_size}\n
             str x30, [sp, #{x30_off}]\n
             bl context_save\n
@@ -129,6 +143,8 @@ macro_rules! vbar_entry {
 global_asm!("
 .balign 0x800\n
 .global vbar\n
+.global hyperlight_debug_vectors\n
+hyperlight_debug_vectors:\n
 vbar:\n",
     vbar_entry!("Synchronous", "CurrentSP0"),
     vbar_entry!("IRQ", "CurrentSP0"),
@@ -148,6 +164,7 @@ vbar:\n",
     vbar_entry!("SError", "LowerAArch32"),
     ctx_size = const size_of::<ExceptionContext>(),
     x30_off = const offset_of!(ExceptionContext, x) + 15 * 0x010,
+    debug_hvc = const hyperlight_common::arch::exn::DEBUG_EXCEPTION_HVC,
     handler = sym super::handle::handle_exception,
     ExceptionType_Synchronous = const ExceptionType::Synchronous as u64,
     ExceptionType_IRQ = const ExceptionType::Irq as u64,

@@ -34,10 +34,12 @@ fn main() -> hyperlight_host::Result<()> {
             .host_function("Sleep5Secs", sleep_5_secs)
             .build()?;
 
-    // Call guest function
+    #[cfg(target_arch = "x86_64")]
     multi_use_sandbox_dbg
         .call::<()>("UseSSE2Registers", ())
         .unwrap();
+    #[cfg(target_arch = "aarch64")]
+    multi_use_sandbox_dbg.call::<()>("NoOp", ()).unwrap();
 
     let message =
         "Hello, World! I am executing inside of a VM with debugger attached :)\n".to_string();
@@ -291,6 +293,205 @@ mod tests {
     }
 
     #[test]
+    #[cfg(target_arch = "aarch64")]
+    #[serial]
+    fn test_gdb_bootstrap_step_preserves_live_stack() {
+        let (out_file_path, cmd_file_path, manifest_dir) =
+            gdb_test_paths("gdb-aarch64-bootstrap-stack");
+        let cmd = format!(
+            "set osabi none
+                file {manifest_dir}/../tests/rust_guests/bin/debug/simpleguest
+                target remote :8080
+                set pagination off
+                set logging file {out_file_path}
+                set logging enabled on
+                set language c
+                set $entry = $pc
+                set $instruction = *(unsigned int *)$entry
+                set *(unsigned int *)$entry = 0xd503201f
+                set $bootstrap_sp = $sp
+                set $canary = $sp - 16
+                set $saved = *(unsigned long long *)$canary
+                set *(unsigned long long *)$canary = 0x123456789abcdef0
+                set $sp = $sp - 32
+                stepi
+                if *(unsigned long long *)$canary != 0x123456789abcdef0
+                    echo Bootstrap debug step overwrote the live stack\\n
+                    quit 1
+                end
+                set *(unsigned long long *)$canary = $saved
+                set $sp = $bootstrap_sp
+                set *(unsigned int *)$entry = $instruction
+                set $pc = $entry
+                echo Bootstrap debug step preserved the live stack\\n
+                set logging enabled off
+                detach
+                quit
+            "
+        );
+        let result = run_guest_and_gdb(&cmd_file_path, &out_file_path, &cmd, |contents| {
+            contents.contains("Bootstrap debug step preserved the live stack")
+        });
+        cleanup(&out_file_path, &cmd_file_path);
+        assert!(result.is_ok(), "{}", result.unwrap_err());
+    }
+
+    #[test]
+    #[cfg(target_arch = "aarch64")]
+    #[serial]
+    fn test_gdb_continue_over_sw_breakpoint() {
+        let (out_file_path, cmd_file_path, manifest_dir) = gdb_test_paths("gdb-aarch64-continue");
+        let cmd = format!(
+            "file {manifest_dir}/../tests/rust_guests/bin/debug/simpleguest
+                target remote :8080
+                set pagination off
+                set logging file {out_file_path}
+                set logging enabled on
+                break simpleguest::no_op
+                commands 1
+                    continue
+                end
+                break simpleguest::print_output
+                commands 2
+                    echo Continued over ARM64 software breakpoint\\n
+                    set logging enabled off
+                    detach
+                    quit
+                end
+                continue
+            "
+        );
+        #[cfg(windows)]
+        let cmd = format!("set osabi none\n{cmd}");
+        let checker =
+            |contents: String| contents.contains("Continued over ARM64 software breakpoint");
+        let result = run_guest_and_gdb(&cmd_file_path, &out_file_path, &cmd, checker);
+
+        cleanup(&out_file_path, &cmd_file_path);
+        assert!(result.is_ok(), "{}", result.unwrap_err());
+    }
+
+    #[test]
+    #[cfg(target_arch = "aarch64")]
+    #[serial]
+    fn test_gdb_hardware_breakpoint_and_step() {
+        let (out_file_path, cmd_file_path, manifest_dir) = gdb_test_paths("gdb-aarch64-hardware");
+        let cmd = format!(
+            "set osabi none
+                file {manifest_dir}/../tests/rust_guests/bin/debug/simpleguest
+                target remote :8080
+                set pagination off
+                set logging file {out_file_path}
+                set logging enabled on
+                set $entry_pc = $pc
+                stepi
+                if $pc != $entry_pc + 4
+                    echo Entry step did not execute one instruction\\n
+                    quit 1
+                end
+                hbreak simpleguest::no_op
+                continue
+                set $return_pc = $x30
+                stepi
+                if $pc != $return_pc
+                    echo Hardware RET step missed its destination\\n
+                    quit 1
+                end
+                echo Hardware breakpoint and entry/RET stepping passed\\n
+                set logging enabled off
+                detach
+                quit
+            "
+        );
+        let checker = |contents: String| {
+            contents.contains("Hardware breakpoint and entry/RET stepping passed")
+        };
+        let result = run_guest_and_gdb(&cmd_file_path, &out_file_path, &cmd, checker);
+        cleanup(&out_file_path, &cmd_file_path);
+        assert!(result.is_ok(), "{}", result.unwrap_err());
+    }
+
+    #[test]
+    #[cfg(target_arch = "aarch64")]
+    #[serial]
+    fn test_gdb_code_writes_and_self_loop() {
+        let (out_file_path, cmd_file_path, manifest_dir) =
+            gdb_test_paths("gdb-aarch64-code-writes");
+        let cmd = format!(
+            "set osabi none
+                file {manifest_dir}/../tests/rust_guests/bin/debug/simpleguest
+                target remote :8080
+                set pagination off
+                set logging file {out_file_path}
+                set logging enabled on
+                hbreak simpleguest::no_op
+                continue
+                delete 1
+                set language c
+                set $loop_pc = $pc
+                set $instruction = *(unsigned int *)$pc
+                set *(unsigned int *)$pc = 0x14000000
+                stepi
+                if $pc != $loop_pc
+                    echo Self-loop step missed its destination\\n
+                    quit 1
+                end
+                set *(unsigned int *)$pc = $instruction
+                set $return_pc = $x30
+                stepi
+                if $pc != $return_pc
+                    echo Restored RET missed its destination\\n
+                    quit 1
+                end
+                echo Code writes and self-loop stepping passed\\n
+                set logging enabled off
+                detach
+                quit
+            "
+        );
+        let checker =
+            |contents: String| contents.contains("Code writes and self-loop stepping passed");
+        let result = run_guest_and_gdb(&cmd_file_path, &out_file_path, &cmd, checker);
+        cleanup(&out_file_path, &cmd_file_path);
+        assert!(result.is_ok(), "{}", result.unwrap_err());
+    }
+
+    #[test]
+    #[cfg(target_arch = "aarch64")]
+    #[serial]
+    fn test_gdb_single_step() {
+        let (out_file_path, cmd_file_path, manifest_dir) = gdb_test_paths("gdb-aarch64-step");
+        let cmd = format!(
+            "file {manifest_dir}/../tests/rust_guests/bin/debug/simpleguest
+                target remote :8080
+                set pagination off
+                set logging file {out_file_path}
+                set logging enabled on
+                break simpleguest::no_op
+                stepi
+                echo Stepped over ARM64 linear instruction\\n
+                continue
+                stepi
+                echo Stepped over ARM64 RET\\n
+                set logging enabled off
+                detach
+                quit
+            "
+        );
+        #[cfg(windows)]
+        let cmd = format!("set osabi none\n{cmd}");
+        let checker = |contents: String| {
+            contents.contains("Stepped over ARM64 linear instruction")
+                && contents.contains("Stepped over ARM64 RET")
+        };
+        let result = run_guest_and_gdb(&cmd_file_path, &out_file_path, &cmd, checker);
+
+        cleanup(&out_file_path, &cmd_file_path);
+        assert!(result.is_ok(), "{}", result.unwrap_err());
+    }
+
+    #[test]
+    #[cfg(target_arch = "x86_64")]
     #[serial]
     fn test_gdb_sse_check() {
         let (out_file_path, cmd_file_path, manifest_dir) = gdb_test_paths("gdb-sse");