Changeset 70260 in vbox for trunk/include/VBox/vmm

Timestamp:

Dec 21, 2017 7:57:01 AM (7 years ago)

Author:

vboxsync

Message:

VMM: SVM VMCB struct logical adjustments for new SVM feature bits (SEV, SEV-ES).

File:

• trunk/include/VBox/vmm/hm_svm.h (modified) (5 diffs)

trunk/include/VBox/vmm/hm_svm.h

@@ -445 +445 @@
 /** @} */
 
-/** @name SVMVMCB.ctrl.u64NestedPaging
- * @{
- */
-#define SVM_NESTED_PAGING_ENABLE              RT_BIT_64(0)
-/** @} */
-
 /** @name SVMVMCB.ctrl.u64IntShadow
  * @{
@@ -638 +632 @@
     SVMIOIOTYPE_IN  = SVM_IOIO_READ
 } SVMIOIOTYPE;
-
-/**
- * SVM nested paging structure.
- */
-typedef union
-{
-    struct
-    {
-        uint32_t    u1NestedPaging      : 1;             /**< enabled/disabled */
-    } n;
-    uint64_t    u;
-} SVMNPCTRL;
 
 /**
@@ -728 +710 @@
     SVMEVENT    ExitIntInfo;
     /** Offset 0x90 - Nested Paging. */
-    SVMNPCTRL   NestedPaging;
+    union
+    {
+        uint32_t    u1NestedPaging   :  1;
+        uint32_t    u1EnableSev      :  1;
+        uint32_t    u1EnableSevEs    :  1;
+        uint32_t    u28Reserved0     : 28;
+        uint64_t    u64NpSevCtrl;
+    } RT_UNION_NM(np);
     /** Offset 0x98 - AVIC APIC BAR.  */
     SVMAVIC     AvicBar;
@@ -763 +752 @@
 typedef const SVMVMCBCTRL *PCSVMVMCBCTRL;
 AssertCompileSize(SVMVMCBCTRL, 0x100);
-AssertCompileMemberOffset(SVMVMCBCTRL, u16InterceptRdCRx,       0x00);
-AssertCompileMemberOffset(SVMVMCBCTRL, u16InterceptWrCRx,       0x02);
-AssertCompileMemberOffset(SVMVMCBCTRL, u16InterceptRdDRx,       0x04);
-AssertCompileMemberOffset(SVMVMCBCTRL, u16InterceptWrDRx,       0x06);
-AssertCompileMemberOffset(SVMVMCBCTRL, u32InterceptXcpt,        0x08);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64InterceptCtrl,        0x0c);
-AssertCompileMemberOffset(SVMVMCBCTRL, u8Reserved,              0x14);
-AssertCompileMemberOffset(SVMVMCBCTRL, u16PauseFilterThreshold, 0x3c);
-AssertCompileMemberOffset(SVMVMCBCTRL, u16PauseFilterCount,     0x3e);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64IOPMPhysAddr,         0x40);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64MSRPMPhysAddr,        0x48);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64TSCOffset,            0x50);
-AssertCompileMemberOffset(SVMVMCBCTRL, TLBCtrl,                 0x58);
-AssertCompileMemberOffset(SVMVMCBCTRL, IntCtrl,                 0x60);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64IntShadow,            0x68);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64ExitCode,             0x70);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64ExitInfo1,            0x78);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64ExitInfo2,            0x80);
-AssertCompileMemberOffset(SVMVMCBCTRL, ExitIntInfo,             0x88);
-AssertCompileMemberOffset(SVMVMCBCTRL, NestedPaging,            0x90);
-AssertCompileMemberOffset(SVMVMCBCTRL, AvicBar,                 0x98);
-AssertCompileMemberOffset(SVMVMCBCTRL, u8Reserved2,             0xa0);
-AssertCompileMemberOffset(SVMVMCBCTRL, EventInject,             0xa8);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64NestedPagingCR3,      0xb0);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64LBRVirt,              0xb8);
-AssertCompileMemberOffset(SVMVMCBCTRL, u32VmcbCleanBits,        0xc0);
-AssertCompileMemberOffset(SVMVMCBCTRL, u64NextRIP,              0xc8);
-AssertCompileMemberOffset(SVMVMCBCTRL, cbInstrFetched,          0xd0);
-AssertCompileMemberOffset(SVMVMCBCTRL, abInstr,                 0xd1);
-AssertCompileMemberOffset(SVMVMCBCTRL, AvicBackingPagePtr,      0xe0);
-AssertCompileMemberOffset(SVMVMCBCTRL, u8Reserved3,             0xe8);
-AssertCompileMemberOffset(SVMVMCBCTRL, AvicLogicalTablePtr,     0xf0);
-AssertCompileMemberOffset(SVMVMCBCTRL, AvicPhysicalTablePtr,    0xf8);
+AssertCompileMemberOffset(SVMVMCBCTRL, u16InterceptRdCRx,             0x00);
+AssertCompileMemberOffset(SVMVMCBCTRL, u16InterceptWrCRx,             0x02);
+AssertCompileMemberOffset(SVMVMCBCTRL, u16InterceptRdDRx,             0x04);
+AssertCompileMemberOffset(SVMVMCBCTRL, u16InterceptWrDRx,             0x06);
+AssertCompileMemberOffset(SVMVMCBCTRL, u32InterceptXcpt,              0x08);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64InterceptCtrl,              0x0c);
+AssertCompileMemberOffset(SVMVMCBCTRL, u8Reserved,                    0x14);
+AssertCompileMemberOffset(SVMVMCBCTRL, u16PauseFilterThreshold,       0x3c);
+AssertCompileMemberOffset(SVMVMCBCTRL, u16PauseFilterCount,           0x3e);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64IOPMPhysAddr,               0x40);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64MSRPMPhysAddr,              0x48);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64TSCOffset,                  0x50);
+AssertCompileMemberOffset(SVMVMCBCTRL, TLBCtrl,                       0x58);
+AssertCompileMemberOffset(SVMVMCBCTRL, IntCtrl,                       0x60);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64IntShadow,                  0x68);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64ExitCode,                   0x70);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64ExitInfo1,                  0x78);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64ExitInfo2,                  0x80);
+AssertCompileMemberOffset(SVMVMCBCTRL, ExitIntInfo,                   0x88);
+AssertCompileMemberOffset(SVMVMCBCTRL, RT_UNION_NM(np.) u64NpSevCtrl, 0x90);
+AssertCompileMemberOffset(SVMVMCBCTRL, AvicBar,                       0x98);
+AssertCompileMemberOffset(SVMVMCBCTRL, u8Reserved2,                   0xa0);
+AssertCompileMemberOffset(SVMVMCBCTRL, EventInject,                   0xa8);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64NestedPagingCR3,            0xb0);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64LBRVirt,                    0xb8);
+AssertCompileMemberOffset(SVMVMCBCTRL, u32VmcbCleanBits,              0xc0);
+AssertCompileMemberOffset(SVMVMCBCTRL, u64NextRIP,                    0xc8);
+AssertCompileMemberOffset(SVMVMCBCTRL, cbInstrFetched,                0xd0);
+AssertCompileMemberOffset(SVMVMCBCTRL, abInstr,                       0xd1);
+AssertCompileMemberOffset(SVMVMCBCTRL, AvicBackingPagePtr,            0xe0);
+AssertCompileMemberOffset(SVMVMCBCTRL, u8Reserved3,                   0xe8);
+AssertCompileMemberOffset(SVMVMCBCTRL, AvicLogicalTablePtr,           0xf0);
+AssertCompileMemberOffset(SVMVMCBCTRL, AvicPhysicalTablePtr,          0xf8);
 
 /**
@@ -1000 +989 @@
     SVMTLBCTRL          TLBCtrl;
     /** Cache of the nested-paging control. */
-    SVMNPCTRL           NestedPagingCtrl;
+    uint32_t            u1NestedPaging :  1;
+    uint32_t            u31Reserved0   : 31;
+    uint32_t            u32Reserved1;
     /** @} */