must be a PFN

Author: romank-msft

openhcl/virt_mshv_vtl/src/processor/snp/mod.rs

@@ -641,7 +641,7 @@ impl UhProcessor<'_, SnpBacked> {
 
             // The kernel does RMP update for the secure AVIC page.
 
-            let savic_page_ptr = self.runner.secure_avic_page_ptr(vtl) as u64;
+            let vtl0_avic_pfn = self.runner.secure_avic_vtl0_pfn(self.inner.cpu_index);
 
             // Specification: "SEV-ES Guest-Hypervisor Communication Block Standartization",
             // 4.1.16.1 "Backing page support".
@@ -655,7 +655,7 @@ impl UhProcessor<'_, SnpBacked> {
 
             let savic_ctrl = SecureAvicControl::from(vmsa.secure_avic_control())
                 .with_secure_avic_en(1)
-                .with_guest_apic_backing_page_ptr(savic_page_ptr);
+                .with_guest_apic_backing_page_ptr(vtl0_avic_pfn);
             *(vmsa.secure_avic_control_mut()) = savic_ctrl;
 
             // Advise the hypervisor.
@@ -668,12 +668,11 @@ impl UhProcessor<'_, SnpBacked> {
             )
             .with_vtl0_interrupt_injection(HvSnpInterruptInjection::HvSnpSecureAvic);
 
-            let vtl0_avic_gpa_number = self.runner.secure_avic_vtl0_pfn(self.inner.cpu_index);
             let values: &[(HvX64RegisterName, u64)] = &[
                 (
                     HvX64RegisterName::SevAvicGpa,
                     hvdef::HvX64RegisterSevAvic::new()
-                        .with_avic_gpa_page_number(vtl0_avic_gpa_number)
+                        .with_avic_gpa_page_number(vtl0_avic_pfn)
                         .with_enable_secure_apic(true)
                         .into(),
                 ),