Data structures for Nested Virtualization

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
Acked-by: Tim Deegan <Tim.Deegan@citrix.com>
Committed-by: Tim Deegan <Tim.Deegan@citrix.com>

diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h
index 46baf2c8942153cc09f8bb3ad3f3eef2608b680b..6a0a5514558521001fed843269ac34268fe64b8b 100644 (file)
--- a/xen/include/asm-x86/hvm/hvm.h
+++ b/xen/include/asm-x86/hvm/hvm.h
@@ -52,7 +52,8 @@ enum hvm_intblk {
     hvm_intblk_shadow,    /* MOV-SS or STI shadow */
     hvm_intblk_rflags_ie, /* RFLAGS.IE == 0 */
     hvm_intblk_tpr,       /* LAPIC TPR too high */
-    hvm_intblk_nmi_iret   /* NMI blocked until IRET */
+    hvm_intblk_nmi_iret,  /* NMI blocked until IRET */
+    hvm_intblk_arch,      /* SVM/VMX specific reason */
 };
 
 /* These happen to be the same as the VMX interrupt shadow definitions. */

diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h
index f5a04a80bfc1a221f232ecf742fe4c8e0dbe0d40..e5d26c9f2207ae8ccbf525ea0121f6d136cf2a19 100644 (file)
--- a/xen/include/asm-x86/hvm/vcpu.h
+++ b/xen/include/asm-x86/hvm/vcpu.h
@@ -36,6 +36,38 @@ enum hvm_io_state {
     HVMIO_completed
 };
 
+#define VMCX_EADDR    (~0ULL)
+
+struct nestedvcpu {
+    bool_t nv_guestmode; /* vcpu in guestmode? */
+    void *nv_vvmcx; /* l1 guest virtual VMCB/VMCS */
+    void *nv_n1vmcx; /* VMCB/VMCS used to run l1 guest */
+    void *nv_n2vmcx; /* shadow VMCB/VMCS used to run l2 guest */
+
+    uint64_t nv_vvmcxaddr; /* l1 guest physical address of nv_vvmcx */
+    uint64_t nv_n1vmcx_pa; /* host physical address of nv_n1vmcx */
+    uint64_t nv_n2vmcx_pa; /* host physical address of nv_n2vmcx */
+
+    /* SVM/VMX arch specific */
+    union {
+    } u;
+
+    bool_t nv_flushp2m; /* True, when p2m table must be flushed */
+    struct p2m_domain *nv_p2m; /* used p2m table for this vcpu */
+
+    bool_t nv_vmentry_pending;
+    bool_t nv_vmexit_pending;
+    bool_t nv_vmswitch_in_progress; /* true during vmentry/vmexit emulation */
+
+    /* Does l1 guest intercept io ports 0x80 and/or 0xED ?
+     * Useful to optimize io permission handling.
+     */
+    bool_t nv_ioport80;
+    bool_t nv_ioportED;
+};
+
+#define vcpu_nestedhvm(v) ((v)->arch.hvm_vcpu.nvcpu)
+
 struct hvm_vcpu {
     /* Guest control-register and EFER values, just as the guest sees them. */
     unsigned long       guest_cr[5];
@@ -81,6 +113,8 @@ struct hvm_vcpu {
 
     struct tasklet      assert_evtchn_irq_tasklet;
 
+    struct nestedvcpu   nvcpu;
+
     struct mtrr_state   mtrr;
     u64                 pat_cr;