arm64/vmm: Preserve PSR_C64 when injecting an exception

CTSRD-CHERI · Nov 27, 2024 · 4fea6a9 · 4fea6a9
1 parent 6fb9ad4
commit 4fea6a9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c
@@ -1189,6 +1189,10 @@ vmmops_run(void *vcpui, uintcap_t pc, pmap_t pmap, struct vm_eventinfo *evinfo)
 			/* Set the new cpsr */
 			hypctx->tf.tf_spsr = hypctx->spsr_el1 & PSR_FLAGS;
 			hypctx->tf.tf_spsr |= PSR_DAIF | PSR_M_EL1h;
+#if __has_feature(capabilities)
+			if ((hypctx->cctlr_el1 & CCTLR_EL1_C64E_MASK) != 0)
+				hypctx->tf.tf_spsr |= PSR_C64;
+#endif
 
 			/*
 			 * Update fields that may change on exeption entry