1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
// Multi-vCPU coordinator. Each vCPU runs in its own pthread, owns
// its own hv_vcpu_t (HVF requires creation + register access from
// the SAME thread). vCPU 0 is the boot CPU and runs on the main
// thread; secondaries are parked at thread start, woken by PSCI
// CPU_ON from vCPU 0.
//
// PSCI is via HVC (FDT advertises method="hvc" already). Subset
// implemented:
// PSCI_VERSION (0x84000000) -> 0x10000 (PSCI 1.0)
// PSCI_CPU_OFF (0x84000002) -> spin (no-op for now)
// PSCI_CPU_ON (0xC4000003) -> wake target thread
// PSCI_AFFINITY_INFO (0xC4000004) -> 0=on / 1=off / 2=pending
// PSCI_FEATURES (0x8400000A) -> 0 for known, NOT_SUPPORTED else
// PSCI_SYSTEM_OFF (0x84000008) -> shutdown
// PSCI_SYSTEM_RESET (0x84000009) -> shutdown
#![cfg(all(target_os = "macos", target_arch = "aarch64"))]
use std::sync::atomic::{AtomicBool, AtomicU32, AtomicU64, Ordering};
use std::sync::{Arc, Condvar, Mutex};
use std::time::{Duration, Instant};
use crate::hypervisor::{ActiveVcpu, ActiveVcpuHandle, HypervisorVcpu, VcpuHandle};
use crate::vmm::snapshot::PerVcpuState;
pub const PSCI_VERSION: u32 = 0x84000000;
pub const PSCI_CPU_OFF: u32 = 0x84000002;
pub const PSCI_CPU_ON: u32 = 0xC4000003;
pub const PSCI_AFFINITY_INFO: u32 = 0xC4000004;
pub const PSCI_FEATURES: u32 = 0x8400000A;
pub const PSCI_SYSTEM_OFF: u32 = 0x84000008;
pub const PSCI_SYSTEM_RESET: u32 = 0x84000009;
pub const PSCI_SUCCESS: i64 = 0;
pub const PSCI_NOT_SUPPORTED: i64 = -1;
pub const PSCI_INVALID_PARAMS: i64 = -2;
pub const PSCI_ALREADY_ON: i64 = -4;
/// If a cycle-restore request has woken no secondary at all by this point,
/// stop burning the long phase-2 deadline and let the existing always-restore
/// recovery path take over. Field data from issue #32 showed the flaky first
/// post-codesign run stayed at 0/N for the full 2-5s window, so waiting longer
/// only adds product-visible first-boot latency.
const RESTORE_ZERO_APPLIED_FAST_BAIL: Duration = Duration::from_millis(250);
/// Keep the legacy forward-progress ceiling when at least one secondary has
/// applied; a partial rendezvous may still be genuine slowness rather than the
/// first-exec lost-handoff mode.
const RESTORE_PHASE2_DEADLINE: Duration = Duration::from_secs(2);
#[derive(Clone)]
pub enum VcpuStart {
/// Secondary thread waits.
Parked,
/// CPU_ON requested: enter at `entry` with X0=`ctx_id`.
Run { entry: u64, ctx_id: u64 },
}
pub struct VcpuSlot {
pub state: Mutex<VcpuStart>,
pub cv: Condvar,
/// True once vCPU thread has begun running guest code (any
/// CPU_ON for an already-on vCPU returns ALREADY_ON).
pub on: AtomicBool,
}
pub struct VcpuCoordinator {
pub n_vcpus: u32,
pub slots: Vec<VcpuSlot>,
pub shutdown: AtomicBool,
/// Multi-vCPU snapshot pause/resume rendezvous — the shared, loom-proven
/// [`PauseBarrier`](crate::vcpu_dispatch::PauseBarrier) (Phase 3 7b.3c). On
/// vcpu0's thread the snapshot trigger calls `request_snapshot_pause`, which
/// `request_pause`s + `hv_vcpus_exit`s the secondaries; each secondary's
/// `maybe_pause_for_snapshot` captures its `PerVcpuState` and
/// `park_cancelable`s into the barrier (best-effort: a 2 s deadline, and the
/// shutdown flag cancels the park). The trigger drains the deposited states
/// into `captured` — now just a single-threaded OUTPUT buffer that
/// `take_secondary_states` reads, defaulting any secondary that didn't park
/// in time. The barrier owns all the cross-thread concurrency (the part that
/// was previously hand-rolled here and intermittent at N>1 vCPUs).
pub snapshot_pause: crate::vcpu_dispatch::PauseBarrier<PerVcpuState>,
pub captured: Mutex<Vec<Option<PerVcpuState>>>,
pub resume_lock: Mutex<u64>, // monotonic generation; secondaries wait while gen unchanged
pub resume_cv: Condvar,
/// Secondary `hv_vcpu_t` handles, registered by each
/// secondary thread after it creates its vCPU (HVF requires
/// the same thread that created the vCPU to perform reg
/// access; the handle itself is just a u64 we can pass to
/// `hv_vcpus_exit` to force a run exit from any thread).
pub secondary_handles: Mutex<Vec<ActiveVcpuHandle>>,
/// Multi-vCPU cycle-restore rendezvous. Counterpart to the
/// snapshot pause primitives above. When the runner takes a
/// pool restore request and needs to roll secondaries back to
/// the snapshot's per-vCPU state, it populates `restore_states`
/// with each secondary's target state, sets `restore_request`,
/// and `hv_vcpus_exit`s them. Each secondary thread, on its own
/// HVF-owning thread (HVF requires register writes to come from
/// the thread that created the vCPU), pulls its target from
/// `restore_states[idx]`, calls `restore_vcpu_state`, increments
/// `restored_count`, and waits on `resume_lock`'s generation
/// (shared with the snapshot path — only one of the two can be
/// active at a time). Same shape as `request_snapshot_pause`,
/// just inverted: secondaries WRITE state instead of READING it.
pub restore_request: AtomicBool,
pub restore_states: Mutex<Vec<Option<PerVcpuState>>>,
pub restored_count: AtomicU32,
/// CNTVOFF_EL2 value to apply to every secondary vCPU on its
/// restore path. Set by the boot vCPU's restore_snapshot just
/// after it computes the new offset; read by each secondary's
/// `run_secondary_inner` after it's loaded its captured
/// per-vCPU state. Same value on all vCPUs so the guest's
/// CNTVCT_EL0 reads are consistent across cores — without
/// this, only vcpu0 had its offset re-applied on restore,
/// secondaries saw the host's raw CNTPCT, and Linux thread
/// migration between vCPUs caused CLOCK_MONOTONIC to skew
/// (libuv asserts in Node ≥24, hangs in earlier versions).
/// 0 means "no value set yet" (the secondary just keeps its
/// HVF default for that boot, fine on cold boot, but should
/// only happen pre-snapshot-restore).
pub vtimer_offset: AtomicU64,
/// Cold-restore handshake: signals secondaries that the boot
/// thread has completed `hv_gic_set_state` (the GIC blob applies
/// to every PE — distributor + per-PE redistributor frame
/// including the WAKER `ProcessorSleep` bit and CTLR enable
/// bits HVF does NOT expose via per-register accessors). Before
/// this flag is true, a secondary's HVF vCPU exists but its
/// redistributor frame is in HVF's default state (asleep, IRQs
/// not routable). After it's true, the secondary can safely
/// overlay its per-PE register state from the snapshot's
/// `redist_regs`/`ich_regs` knowing the GIC's global view of
/// this PE already has the blob's machinery in place.
///
/// Without this handshake we saw intermittent (~13 % at 4
/// vCPUs, never at 1 vCPU) post-restore deadlocks where amd64
/// processes spawned via rosettad would hang in
/// `__skb_wait_for_more_packets` on the rosettad↔wrapper
/// AF_UNIX DGRAM socket. The rosettad daemon (or the wrapper)
/// happened to land on a secondary whose redistributor was
/// still in "ProcessorSleep" state — IPIs from the sending
/// process (running on a working CPU) hit a redistributor that
/// wouldn't accept SGIs, the wake-up was dropped, and the
/// recv() never returned. The boot CPU stayed responsive (its
/// PE was created before `hv_gic_set_state` so it picked up
/// the blob), the agent could still accept `vm.exec` calls,
/// but everything scheduled on the broken secondary stayed
/// frozen.
pub gic_restore_done: AtomicBool,
}
impl VcpuCoordinator {
pub fn new(n_vcpus: u32) -> Arc<Self> {
let slots = (0..n_vcpus)
.map(|_| VcpuSlot {
state: Mutex::new(VcpuStart::Parked),
cv: Condvar::new(),
on: AtomicBool::new(false),
})
.collect();
Arc::new(Self {
n_vcpus,
slots,
shutdown: AtomicBool::new(false),
snapshot_pause: crate::vcpu_dispatch::PauseBarrier::new(),
captured: Mutex::new((0..n_vcpus).map(|_| None).collect()),
resume_lock: Mutex::new(0),
resume_cv: Condvar::new(),
secondary_handles: Mutex::new(Vec::new()),
restore_request: AtomicBool::new(false),
restore_states: Mutex::new((0..n_vcpus).map(|_| None).collect()),
restored_count: AtomicU32::new(0),
vtimer_offset: AtomicU64::new(0),
gic_restore_done: AtomicBool::new(false),
})
}
/// Called by a secondary vCPU thread once it has created its
/// `hv_vcpu_t`. Stored so the snapshot trigger thread can
/// `hv_vcpus_exit` all secondaries in one batch.
pub fn register_secondary(&self, handle: ActiveVcpuHandle) {
self.secondary_handles.lock().unwrap().push(handle);
}
pub fn secondary_handles_snapshot(&self) -> Vec<ActiveVcpuHandle> {
self.secondary_handles.lock().unwrap().clone()
}
/// Spin-wait (bounded by `deadline`) until at least `target` of the
/// secondary slots (index 1..) report `on == true`. Returns the number
/// observed online when it stopped waiting (== `target` on success, less
/// on timeout).
///
/// Callers that finish a restore and then hand control to something that
/// may immediately start ANOTHER restore/snapshot cycle (e.g. `Vm::start`
/// firing a redundant `pool.restore_timeout()` right after its initial
/// synchronous restore, its only way to block until the guest is ready —
/// see `runner.rs`'s call site) MUST wait for this before proceeding.
/// `pause_secondaries_for_restore`'s `force_exit` is a no-op against a
/// vCPU that hasn't called `hv_vcpu_run` yet, and `publish_and_wait_
/// secondary_restore`'s `target` count (also `on`-based) silently
/// excludes a secondary that isn't online yet — so that secondary can
/// apply its state (published unconditionally, regardless of `on`) only
/// AFTER the runner already decided the cycle was complete and bumped
/// the resume generation via `release_after_restore`, parking it on a
/// generation that will never advance again. See
/// `secondary_online_after_generation_bump_would_park_forever` below for
/// the mechanism this guards against.
pub fn wait_until_secondaries_online(&self, target: usize, deadline: Instant) -> usize {
loop {
let online = self.slots[1..]
.iter()
.filter(|s| s.on.load(Ordering::Acquire))
.count();
if online >= target || Instant::now() > deadline {
return online;
}
std::hint::spin_loop();
}
}
/// Called by secondary dispatch loops between `hv_vcpu_run`
/// iterations. If a snapshot is in progress, the secondary
/// captures its own register state, deposits it into
/// `captured[idx]`, bumps `captured_count`, and waits for
/// `resume_lock`'s generation to advance. Returns when the
/// secondary is free to continue running guest code.
pub fn maybe_pause_for_snapshot(
&self,
idx: u32,
vcpu: &ActiveVcpu,
) -> crate::hypervisor::ActiveResult<()> {
if !self.snapshot_pause.is_paused() {
return Ok(());
}
// Capture state on the OWNING thread (the backend requires it), then
// deposit it and park on the shared barrier until the trigger resumes us
// (or shutdown cancels the park).
let st = vcpu.capture_snapshot()?;
if crate::trace::enabled("timings") {
let pc = st.pc().unwrap_or(0);
eprintln!(" [vcpu-{idx}] snapshot pause: PC=0x{pc:x}");
}
self.snapshot_pause
.park_cancelable(idx as usize, st, &self.shutdown);
Ok(())
}
/// Called by the snapshot trigger thread (vcpu0). Returns
/// after every *running* secondary has deposited its state.
/// Secondaries still parked in `wait_for_run` (e.g. snapshot
/// trigger fires pre-SMP-bringup, like in volume mode where
/// the bake snapshots at the heartbeat marker before the
/// kernel has issued CPU_ON for them) are skipped — their
/// PerVcpuState defaults to a no-op restore that hits the
/// PSCI park path again on restore.
pub fn request_snapshot_pause(&self, secondary_handles: &[ActiveVcpuHandle]) {
// Reset the output buffer from any prior snapshot.
{
let mut g = self.captured.lock().unwrap();
for s in g.iter_mut() {
*s = None;
}
}
self.snapshot_pause.request_pause();
ActiveVcpuHandle::force_exit(secondary_handles);
// Count only secondaries currently running guest code; parked-pre-SMP
// ones won't reach the rendezvous, so they're not part of `target`.
let target = self
.slots
.iter()
.skip(1)
.filter(|s| s.on.load(Ordering::Acquire))
.count();
let deadline = Instant::now() + Duration::from_secs(2);
// Best-effort: wait until all running secondaries park, the deadline
// passes, or shutdown — then place each deposited state into the output
// buffer BY INDEX (a secondary that didn't park stays None → restores
// from a default/no-op state, the prior contract). The barrier owns the
// concurrency (loom-proven); this is now single-threaded bookkeeping.
let pairs = self
.snapshot_pause
.wait_parked_until(target, deadline, &self.shutdown);
if pairs.len() < target {
eprintln!(
" [coord] snapshot-pause timeout: {}/{} secondaries deposited",
pairs.len(),
target,
);
}
let mut g = self.captured.lock().unwrap();
for (idx, st) in pairs {
if idx < g.len() {
g[idx] = Some(st);
}
}
}
/// Release secondaries so they resume guest execution after
/// snapshot capture. Pair with `request_snapshot_pause`.
pub fn release_after_snapshot(&self) {
self.snapshot_pause.resume();
}
/// Multi-vCPU cycle-restore: secondary-side rendezvous.
/// Counterpart to `maybe_pause_for_snapshot`. Two-phase:
///
/// 1. The runner sets `restore_request` + `hv_vcpus_exit`s
/// secondaries BEFORE doing RAM remap / GIC blob /
/// vcpu0 restore. Each secondary lands here and spins
/// until its `restore_states[idx]` becomes `Some` —
/// that's the runner's signal "GIC + vcpu0 are done,
/// apply your state now". (HVF requires register writes
/// to come from the OWNING thread, so secondaries apply
/// their own state.)
///
/// 2. After applying, the secondary increments
/// `restored_count` and waits on `resume_lock`'s
/// generation. The runner spins until
/// `restored_count == n_running_secondaries`, then
/// `release_after_restore` bumps the gen and secondaries
/// re-enter `hv_vcpu_run` with the snapshot's coherent
/// state.
///
/// Without the two-phase split the runner would race against
/// secondaries' state application — they'd write ICH regs
/// referencing distributor INTIDs the GIC blob restore
/// hadn't published yet, and the next IRQ delivery on the
/// restored guest would land in undefined territory.
pub fn maybe_apply_restore(
&self,
idx: u32,
vcpu: &ActiveVcpu,
) -> crate::hypervisor::ActiveResult<()> {
if !self.restore_request.load(Ordering::Acquire) {
return Ok(());
}
let saved_gen = *self.resume_lock.lock().unwrap();
// Phase 1: spin-wait until our target state is published.
// The runner does GIC + vcpu0 restore first, then pops
// states into `restore_states`. Bound the wait on shutdown
// so a teardown mid-restore doesn't deadlock the secondary.
let deadline = Instant::now() + Duration::from_secs(5);
loop {
let snapshot = {
let g = self.restore_states.lock().unwrap();
g[idx as usize].clone()
};
if let Some(st) = snapshot {
vcpu.restore_snapshot(&st)?;
// Re-align this secondary's CNTVOFF_EL2 with the
// boot vCPU's just-applied offset. The boot vCPU
// runs `restore_snapshot_timed_with_options`
// BEFORE publishing into `restore_states`, so the
// value in `self.vtimer_offset` is already fresh
// when we land here. See worker.rs's analogous
// call in run_secondary_inner's cold-restore path
// for the full rationale (Node libuv asserts on
// CLOCK_MONOTONIC skew when secondaries don't
// share vcpu0's CNTVOFF after restore).
let off = self.vtimer_offset.load(Ordering::Acquire);
if off != 0 {
vcpu.set_vtimer_offset(off)?;
}
break;
}
if self.shutdown.load(Ordering::Acquire) {
return Ok(());
}
if Instant::now() > deadline {
eprintln!(
" [vcpu-{idx}] cycle-restore phase-1 timeout (state not published); \
proceeding without restore (will likely panic on resume)"
);
break;
}
std::hint::spin_loop();
}
// Phase 2: deposit completion + wait for resume.
self.restored_count.fetch_add(1, Ordering::AcqRel);
let mut g = self.resume_lock.lock().unwrap();
while *g == saved_gen && !self.shutdown.load(Ordering::Acquire) {
g = self.resume_cv.wait(g).unwrap();
}
Ok(())
}
/// Multi-vCPU cycle-restore: phase-1 driver call. Forces
/// secondaries out of `hv_vcpu_run` and parks them in
/// `maybe_apply_restore`, where they spin-wait for the
/// runner to publish per-vcpu target states. Returns
/// immediately after issuing `hv_vcpus_exit` — does NOT wait
/// for secondaries to land at the rendezvous (they'll spin
/// when they get there; runner can do GIC + vcpu0 restore in
/// parallel).
pub fn pause_secondaries_for_restore(&self, secondary_handles: &[ActiveVcpuHandle]) {
let _t0 = Instant::now();
// Reset state slots — a prior restore may have left them
// populated with stale snapshots.
{
let mut g = self.restore_states.lock().unwrap();
for s in g.iter_mut() {
*s = None;
}
}
self.restored_count.store(0, Ordering::SeqCst);
self.restore_request.store(true, Ordering::Release);
ActiveVcpuHandle::force_exit(secondary_handles);
if crate::trace::enabled("timings") {
eprintln!(
" [coord-restore] pause: {} us (n_secondaries={})",
_t0.elapsed().as_micros(),
secondary_handles.len(),
);
}
}
/// Multi-vCPU cycle-restore: phase-2 driver call. Publishes
/// each secondary's target `PerVcpuState` into
/// `restore_states`, then spins until every running secondary
/// has applied its state and parked at the resume rendezvous.
/// Caller MUST call `release_after_restore` after this returns
/// to bump the resume generation.
///
/// `secondary_states[i]` corresponds to vcpu_index `i + 1`.
pub fn publish_and_wait_secondary_restore(&self, secondary_states: &[Option<PerVcpuState>]) {
let _t0 = Instant::now();
// Publish target states atomically in one lock acquisition.
{
let mut g = self.restore_states.lock().unwrap();
for (i, st) in secondary_states.iter().enumerate() {
let idx = i + 1; // secondaries start at vcpu 1
if idx < g.len() {
g[idx] = st.clone();
}
}
}
let _t_publish = _t0.elapsed().as_micros();
// Wait for completion. Only secondaries with slot.on=true
// are running and will reach `maybe_apply_restore`; parked-
// pre-SMP-bringup ones are skipped (same logic as
// `request_snapshot_pause`).
let target: u32 = self
.slots
.iter()
.skip(1)
.filter(|s| s.on.load(Ordering::Acquire))
.count() as u32;
let fast_bail_deadline = Instant::now() + RESTORE_ZERO_APPLIED_FAST_BAIL;
let deadline = Instant::now() + RESTORE_PHASE2_DEADLINE;
while self.restored_count.load(Ordering::Acquire) < target {
if self.shutdown.load(Ordering::Acquire) {
return;
}
let now = Instant::now();
let applied = self.restored_count.load(Ordering::Acquire);
if applied == 0 && now > fast_bail_deadline {
eprintln!(
" [coord] cycle-restore phase-2 fast-bail: 0/{target} secondaries applied after {} ms; falling back to always-restore",
RESTORE_ZERO_APPLIED_FAST_BAIL.as_millis(),
);
break;
}
if now > deadline {
eprintln!(
" [coord] cycle-restore phase-2 timeout: {}/{} secondaries applied",
applied, target,
);
break;
}
std::hint::spin_loop();
}
if crate::trace::enabled("timings") {
eprintln!(
" [coord-restore] publish+wait: total {} us (publish {} us; spin {} us, target={target})",
_t0.elapsed().as_micros(),
_t_publish,
_t0.elapsed().as_micros().saturating_sub(_t_publish),
);
}
}
/// Release secondaries after a cycle-restore — they re-enter
/// `hv_vcpu_run` with their newly-applied snapshot state.
pub fn release_after_restore(&self) {
self.restore_request.store(false, Ordering::Release);
let mut g = self.resume_lock.lock().unwrap();
*g = g.wrapping_add(1);
self.resume_cv.notify_all();
}
/// Pop secondary captured states (idx 1..n_vcpus). Called by
/// the snapshot trigger AFTER `request_snapshot_pause`
/// returned and AFTER capturing vcpu0's own state. Returns a
/// vector of length `n_vcpus - 1` (so caller can prepend
/// vcpu0's state).
pub fn take_secondary_states(&self) -> Vec<PerVcpuState> {
let mut g = self.captured.lock().unwrap();
let mut out = Vec::with_capacity(g.len().saturating_sub(1));
for st in g.iter_mut().skip(1) {
// Replace with default (empty) so a missing entry
// doesn't crash the saver. In practice every entry
// should be Some here.
out.push(st.take().unwrap_or_default());
}
out
}
/// PSCI CPU_ON: signal target vCPU's thread to start. Returns the
/// PSCI return code.
pub fn cpu_on(&self, target: u32, entry: u64, ctx_id: u64) -> i64 {
let Some(slot) = self.slots.get(target as usize) else {
return PSCI_INVALID_PARAMS;
};
if slot.on.load(Ordering::SeqCst) {
return PSCI_ALREADY_ON;
}
let mut s = slot.state.lock().unwrap();
*s = VcpuStart::Run { entry, ctx_id };
slot.cv.notify_one();
PSCI_SUCCESS
}
pub fn affinity_info(&self, target: u32) -> i64 {
match self.slots.get(target as usize) {
Some(slot) if slot.on.load(Ordering::SeqCst) => 0, // ON
Some(_) => 1, // OFF
None => PSCI_INVALID_PARAMS,
}
}
/// Wait (blocking) until our slot is told to Run. Used by
/// secondary vCPU threads on startup.
pub fn wait_for_run(&self, idx: u32) -> Option<(u64, u64)> {
let slot = &self.slots[idx as usize];
let mut s = slot.state.lock().unwrap();
loop {
if self.shutdown.load(Ordering::SeqCst) {
return None;
}
if let VcpuStart::Run { entry, ctx_id } = *s {
slot.on.store(true, Ordering::SeqCst);
return Some((entry, ctx_id));
}
s = slot.cv.wait(s).unwrap();
}
}
}
#[cfg(test)]
mod tests {
//! The multi-vCPU restore rendezvous (`publish_and_wait_secondary_
//! restore`) drives real secondary vCPU threads in production, but its
//! coordination is just atomics + a deadline, so we exercise it here
//! without HVF by driving `restored_count` / slot `on` / `shutdown`
//! directly. The headline is the forward-progress guarantee: a stalled
//! secondary must NOT hang the host — the deadline fires and we return.
use super::*;
use std::time::{Duration, Instant};
fn st(vtimer_offset: u64) -> Option<PerVcpuState> {
Some(PerVcpuState {
vtimer_offset,
..Default::default()
})
}
fn mark_running(coord: &VcpuCoordinator, indices: &[usize]) {
for &i in indices {
coord.slots[i].on.store(true, Ordering::Release);
}
}
#[test]
fn publish_and_wait_returns_at_once_with_no_running_secondaries() {
// 4 vCPUs declared but none marked running → target 0 → no spin.
let coord = VcpuCoordinator::new(4);
let t = Instant::now();
coord.publish_and_wait_secondary_restore(&[st(0xAB), st(0xAB), st(0xAB)]);
assert!(t.elapsed() < Duration::from_millis(500));
// Published into the secondary slots (idx 1..).
let g = coord.restore_states.lock().unwrap();
assert_eq!(g[1].as_ref().unwrap().vtimer_offset, 0xAB);
assert_eq!(g[3].as_ref().unwrap().vtimer_offset, 0xAB);
}
#[test]
fn publish_and_wait_completes_when_all_secondaries_apply() {
let coord = VcpuCoordinator::new(3);
mark_running(&coord, &[1, 2]); // target = 2
let c = coord.clone();
let h = std::thread::spawn(move || {
std::thread::sleep(Duration::from_millis(50));
c.restored_count.store(2, Ordering::Release); // both applied
});
let t = Instant::now();
coord.publish_and_wait_secondary_restore(&[st(1), st(2)]);
let el = t.elapsed();
h.join().unwrap();
assert!(
el < Duration::from_millis(1500),
"returned before the 2s deadline: {el:?}"
);
}
#[test]
fn publish_and_wait_fast_bails_when_zero_secondaries_apply() {
// Issue #32: field validation showed the first post-codesign run could
// stay at 0/N applied for the entire long phase-2 window. That is not
// slow progress; it is a lost handoff into the existing always-restore
// recovery path, so stop waiting quickly.
let coord = VcpuCoordinator::new(4);
mark_running(&coord, &[1, 2, 3]); // target = 3, restored_count remains 0
let t = Instant::now();
coord.publish_and_wait_secondary_restore(&[st(1), st(2), st(3)]);
let el = t.elapsed();
assert!(
el >= RESTORE_ZERO_APPLIED_FAST_BAIL,
"must give secondaries the short fast-bail window: {el:?}"
);
assert!(
el < Duration::from_secs(1),
"must fast-bail instead of burning the long phase-2 deadline: {el:?}"
);
}
#[test]
fn publish_and_wait_times_out_when_a_secondary_stalls() {
// FORWARD PROGRESS: after at least one secondary applies, a partial
// rendezvous still gets the legacy long deadline rather than the
// zero-applied fast-bail. (This single test costs ~2s by design.)
let coord = VcpuCoordinator::new(3);
mark_running(&coord, &[1, 2]); // target = 2
coord.restored_count.store(1, Ordering::Release); // only one applied
let t = Instant::now();
coord.publish_and_wait_secondary_restore(&[st(1), st(2)]);
let el = t.elapsed();
assert!(
el >= Duration::from_secs(2),
"must wait out the deadline: {el:?}"
);
assert!(
el < Duration::from_secs(4),
"must return after it, not hang: {el:?}"
);
}
#[test]
fn publish_and_wait_shutdown_short_circuits() {
let coord = VcpuCoordinator::new(3);
mark_running(&coord, &[1, 2]); // target never satisfied
let c = coord.clone();
let h = std::thread::spawn(move || {
std::thread::sleep(Duration::from_millis(50));
c.shutdown.store(true, Ordering::Release);
});
let t = Instant::now();
coord.publish_and_wait_secondary_restore(&[st(1), st(2)]);
let el = t.elapsed();
h.join().unwrap();
assert!(
el < Duration::from_millis(1500),
"shutdown must cut the wait short: {el:?}"
);
}
#[test]
fn publish_state_is_bounds_checked_against_slot_count() {
// More secondary_states than slots → only in-bounds slots written,
// no panic / OOB (the `idx < g.len()` guard in the publish loop).
let coord = VcpuCoordinator::new(2); // restore_states len 2 (idx 0,1)
coord.publish_and_wait_secondary_restore(&[
st(0x55),
st(0x66),
st(0x77),
st(0x88),
st(0x99),
]);
let g = coord.restore_states.lock().unwrap();
assert_eq!(g.len(), 2);
assert_eq!(g[1].as_ref().unwrap().vtimer_offset, 0x55); // i=0 → idx 1
// i>=1 map to idx>=2 which are out of range and silently skipped.
}
#[test]
fn release_after_restore_clears_request_and_bumps_resume_generation() {
let coord = VcpuCoordinator::new(2);
coord.restore_request.store(true, Ordering::Release);
*coord.resume_lock.lock().unwrap() = 41;
coord.release_after_restore();
assert!(!coord.restore_request.load(Ordering::Acquire));
assert_eq!(
*coord.resume_lock.lock().unwrap(),
42,
"resume generation advances"
);
}
// The snapshot-PAUSE rendezvous now runs on the shared, loom-proven
// `PauseBarrier` (its own concurrency tests + loom Models C/D cover the
// handshake). These tests just verify the COORDINATOR wires it correctly:
// request → secondaries park → states drained into `captured` by index;
// shutdown short-circuits; release clears the pause. An empty handles slice
// skips the HVF `hv_vcpus_exit`, so it drives without a real VM.
#[test]
fn request_snapshot_pause_collects_parked_secondary_states() {
let coord = VcpuCoordinator::new(3);
mark_running(&coord, &[1, 2]); // target = 2
coord.captured.lock().unwrap()[1] = st(0xDEAD); // stale, must be reset
// Two secondaries park (deposit their state) once the pause is requested.
let parkers: Vec<_> = [1usize, 2]
.into_iter()
.map(|idx| {
let c = coord.clone();
std::thread::spawn(move || {
while !c.snapshot_pause.is_paused() {
std::thread::yield_now();
}
c.snapshot_pause
.park_cancelable(idx, st(idx as u64).unwrap(), &c.shutdown);
})
})
.collect();
let t = Instant::now();
coord.request_snapshot_pause(&[]); // request pause + wait for both to park
let el = t.elapsed();
assert!(
el < Duration::from_millis(1500),
"returned before the deadline: {el:?}"
);
assert!(
coord.snapshot_pause.is_paused(),
"still paused after request"
);
// Both secondaries' states were drained into the output buffer by index
// (and the stale 0xDEAD slot was reset first).
assert!(
coord.captured.lock().unwrap()[1].is_some(),
"secondary 1 captured"
);
assert!(
coord.captured.lock().unwrap()[2].is_some(),
"secondary 2 captured"
);
coord.release_after_snapshot(); // release the parked secondaries
for h in parkers {
h.join().unwrap();
}
}
#[test]
fn request_snapshot_pause_shutdown_short_circuits() {
let coord = VcpuCoordinator::new(3);
mark_running(&coord, &[1, 2]); // target never satisfied
let c = coord.clone();
let h = std::thread::spawn(move || {
std::thread::sleep(Duration::from_millis(50));
c.shutdown.store(true, Ordering::Release);
});
let t = Instant::now();
coord.request_snapshot_pause(&[]);
let el = t.elapsed();
h.join().unwrap();
assert!(
el < Duration::from_millis(1500),
"shutdown must cut the wait short: {el:?}"
);
}
#[test]
fn release_after_snapshot_clears_the_pause() {
// Snapshot release now drives the barrier (its own gen), not the
// restore-shared `resume_lock`. Just verify the pause is cleared.
let coord = VcpuCoordinator::new(2);
coord.snapshot_pause.request_pause();
assert!(coord.snapshot_pause.is_paused());
coord.release_after_snapshot();
assert!(
!coord.snapshot_pause.is_paused(),
"pause cleared after release"
);
}
// ── `wait_until_secondaries_online` (supermachine-vm#28) ────────────
//
// `runner.rs` calls this right after the FIRST restore-with-secondaries
// completes, before returning control to a caller that might immediately
// start another restore/snapshot cycle (`Vm::start` does exactly this:
// `WarmPool::start` only guarantees its worker thread was spawned, not
// that the restore finished, so `Vm::start` blocks on a follow-up
// `pool.restore_timeout()` as its only way to wait for readiness).
#[test]
fn wait_until_secondaries_online_blocks_until_target_reached() {
let coord = VcpuCoordinator::new(3); // secondaries at idx 1, 2
let c = coord.clone();
let h = std::thread::spawn(move || {
std::thread::sleep(Duration::from_millis(50));
c.slots[1].on.store(true, Ordering::Release);
std::thread::sleep(Duration::from_millis(50));
c.slots[2].on.store(true, Ordering::Release);
});
let t = Instant::now();
let online = coord.wait_until_secondaries_online(2, t + Duration::from_secs(2));
h.join().unwrap();
assert_eq!(online, 2);
assert!(
t.elapsed() >= Duration::from_millis(90),
"must actually wait for both secondaries: {:?}",
t.elapsed()
);
assert!(
t.elapsed() < Duration::from_secs(2),
"must return as soon as satisfied, not wait out the full deadline: {:?}",
t.elapsed()
);
}
#[test]
fn wait_until_secondaries_online_times_out_when_a_secondary_never_comes_online() {
let coord = VcpuCoordinator::new(2); // secondary at idx 1, never marked on
let t = Instant::now();
let online = coord.wait_until_secondaries_online(1, t + Duration::from_millis(200));
let el = t.elapsed();
assert_eq!(online, 0);
assert!(
el >= Duration::from_millis(200),
"must wait out the deadline: {el:?}"
);
assert!(
el < Duration::from_secs(1),
"must return after it, not hang: {el:?}"
);
}
#[test]
fn secondary_online_after_generation_bump_parks_forever_without_the_caller_barrier() {
// Pins the exact hazard the barrier above prevents. A restore cycle
// runs while this secondary is NOT yet `on` (still applying its own
// FIRST restore in `run_secondary_inner`, same as during `Vm::start`'s
// real startup race) — so it's excluded from `target` and the cycle
// completes and bumps the resume generation without it.
let coord = VcpuCoordinator::new(2);
coord.publish_and_wait_secondary_restore(&[st(1)]); // target=0: not on yet
coord.release_after_restore(); // bumps gen 0 -> 1; cycle considered done
// Late: the secondary now finishes applying its own first-restore
// state and becomes on, then runs exactly `maybe_apply_restore`'s
// phase-2 rendezvous (its state in `restore_states[1]` was already
// published above, unconditionally of `on` — so phase-1 would
// succeed; it's phase-2's generation wait that's the trap).
coord.slots[1].on.store(true, Ordering::Release);
let c = coord.clone();
let (tx, rx) = std::sync::mpsc::channel();
std::thread::spawn(move || {
let saved_gen = *c.resume_lock.lock().unwrap();
let mut g = c.resume_lock.lock().unwrap();
while *g == saved_gen && !c.shutdown.load(Ordering::Acquire) {
g = c.resume_cv.wait(g).unwrap();
}
let _ = tx.send(());
});
// Nothing in this cycle bumps the generation again — proves the
// secondary is genuinely parked, not just slow. This is why the
// caller (runner.rs) must call `wait_until_secondaries_online`
// BEFORE allowing another restore cycle to start, rather than
// letting a late-arriving secondary discover the race after the
// fact.
assert_eq!(
rx.recv_timeout(Duration::from_millis(300)),
Err(std::sync::mpsc::RecvTimeoutError::Timeout),
"a secondary that comes online after release_after_restore must not \
resume on its own"
);
// Clean up: release it via shutdown so the thread doesn't leak past
// the test.
coord.shutdown.store(true, Ordering::Release);
coord.resume_cv.notify_all();
let _ = rx.recv_timeout(Duration::from_secs(1));
}
}