Nested Virtualization: data structure
PATCH 2/13 Nested Virtualization: data structure
Signature · 6 lines
---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
# HG changeset patch
# User cegger
# Date 1283345873 -7200
Data structures for Nested Virtualization
xen/arch/x86/hvm/svm/vmcb.c +0 -3
@@ -40,9 +40,6 @@extern int svm_dbg_on; -#define IOPM_SIZE (12 * 1024) -#define MSRPM_SIZE (8 * 1024) -struct vmcb_struct *alloc_vmcb (void ) {struct vmcb_struct *vmcb;
xen/include/asm-x86/hvm/hvm.h +4 -1
@@ -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_svm_gif, /* GIF cleared */ };/* These happen to be the same as the VMX interrupt shadow definitions. */
@@ -180,6 +181,8 @@ int hvm_girq_dest_2_vcpu_id(struct domai (hvm_paging_enabled(v) && ((v)->arch.hvm_vcpu.guest_cr[4] & X86_CR4_PAE))#define hvm_nx_enabled (v) \ (!!((v)->arch.hvm_vcpu.guest_efer & EFER_NX)) +#define hvm_svm_enabled (v) \ + (!!((v)->arch.hvm_vcpu.guest_efer & EFER_SVME))#define hvm_hap_has_1gb (d) \ (hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_1GB)
xen/include/asm-x86/hvm/svm/vmcb.h +3 -0
@@ -364,6 +364,9 @@ typedef union } fields; } __attribute__ ((packed)) lbrctrl_t; +#define IOPM_SIZE (12 * 1024) +#define MSRPM_SIZE (8 * 1024) +struct vmcb_struct {u32 cr_intercepts;/* offset 0x00 */ u32 dr_intercepts;/* offset 0x04 */
xen/include/asm-x86/hvm/vcpu.h +57 -0
69 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 1 line · Christoph Egger
Signed-off-by Christoph Egger <[email protected]>
Quoted 22 lines · Eddie
# HG changeset patch
# User cegger
# Date 1283345873 -7200
Data structures for Nested Virtualizationdiff -r
ecec3d163efa-r32aec447e8a1xen/arch/x86/hvm/svm/vmcb.cxen/arch/x86/hvm/svm/vmcb.c +0
-3@@ -40,9 +40,6 @@extern int svm_dbg_on; -#define IOPM_SIZE (12 * 1024) -#define MSRPM_SIZE (8 * 1024) -struct vmcb_struct *alloc_vmcb (void ) {struct vmcb_struct *vmcb;diff -r
ecec3d163efa-r32aec447e8a1xen/include/asm-x86/hvm/hvm.h
xen/include/asm-x86/hvm/hvm.h enum hvm_intblk { · line 56
Quoted 6 lines
xen/include/asm-x86/hvm/hvm.h +2
-1@@ -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_svm_gif, /* GIF cleared */
Minor one:
I am still concerning to add svm_gif in this common file, given that it is only used by one place of interrupt injection. It can be wrapped into SVM.c.
Quoted 29 lines
xen/include/asm-x86/hvm/hvm.h +0
-0};/* These happen to be the same as the VMX interrupt shadow definitions. */ @@ -180,6 +181,8 @@ int
hvm_girq_dest_2_vcpu_id(struct domai (hvm_paging_enabled(v) && ((v)->arch.hvm_vcpu.guest_cr[4] & X86_CR4_PAE)) #define hvm_nx_enabled(v) \ (!!((v)->arch.hvm_vcpu.guest_efer & EFER_NX))xen/include/asm-x86/hvm/hvm.h +2
-0+#define hvm_svm_enabled (v) \ + (!!((v)->arch.hvm_vcpu.guest_efer & EFER_SVME))#define hvm_hap_has_1gb (d) \ (hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_1GB)diff -r
ecec3d163efa-r32aec447e8a1xen/include/asm-x86/hvm/svm/vmcb.h---a/xen/include/asm-x86/hvm/svm/vmcb.h+++b/xen/include/asm-x86/hvm/svm/vmcb.h@@ -364,6 +364,9 @@ typedef union} fields;}
__attribute__((packed))lbrctrl_t;xen/include/asm-x86/hvm/hvm.h +3
-0+#define IOPM_SIZE (12 * 1024) +#define MSRPM_SIZE (8 * 1024) +struct vmcb_struct {u32 cr_intercepts;/* offset 0x00 */ u32 dr_intercepts;/* offset 0x04 */ diff -r
ecec3d163efa-r32aec447e8a1xen/include/asm-x86/hvm/vcpu.h
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 39
Quoted 5 lines
xen/include/asm-x86/hvm/vcpu.h +2
-0@@ -35,6 +35,61 @@ enum hvm_io_state {HVMIO_completed }; +struct nestedhvm { +bool_t nh_gif;/* vcpu's GIF, always true on VMX */
This one should go to SVM specific code.
Quoted 45 lines
xen/include/asm-x86/hvm/vcpu.h +20
-0+bool_t nh_guestmode;/* vcpu in guestmode? */ +void *nh_vm;/* VMCB/VMCS */ +size_t nh_vmsize;/* size of VMCB/VMCS */ + +/* guest vm address of 1st level guest, needed for VMEXIT */ +uint64_t nh_vmaddr; +uint64_t nh_vmmaxaddr;/* Maximum supported address */ +void *nh_hostsave; + +void *nh_arch;/* SVM/VMX specific data */ +size_t nh_arch_size; + +/* Cached real MSR permission bitmaps of the nested guest */ +unsigned long *nh_cached_msrpm; +size_t nh_cached_msrpm_size; +/* Merged MSR permission bitmap */ +unsigned long *nh_merged_msrpm; +size_t nh_merged_msrpm_size; + +/* Cache guest cr3/host cr3 the guest sets up for the nested guest. + * Used by Shadow-on-Shadow and Nested-on-Nested.
+ *nh_vm_guestcr3: in l2 guest physical address space and points
to + * the l2 guest page table
+ *nh_vm_hostcr3: in l1 guest physical address space and points
to + * the l1 guest nested page tablexen/include/asm-x86/hvm/vcpu.h +10
-0+*/ +uint64_t nh_vm_guestcr3, nh_vm_hostcr3; +uint32_t nh_guest_asid; +bool_t nh_flushp2m; +struct p2m_domain *nh_p2m;/* used p2m table for this vcpu */ + +/* Only meaningful when forcevmexit flag is set */ +struct { +uint64_t exitcode;/* generic exitcode */ +uint64_t exitinfo1;/* additional information to the exitcode */ +
uint64_texitinfo2; /* additional information to
the exitcode */ + }nh_forcevmexit;xen/include/asm-x86/hvm/vcpu.h +7
-0+union { +uint32_t bytes; +struct { +uint32_t rflagsif :1 ; +uint32_t vintrmask :1 ;/* always cleared on VMX */ +uint32_t forcevmexit :1 ; +uint32_t vmentry :1 ;/* true during vmentry/vmexit emulation */ +
uint32_treserved : 28;
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 87
Quoted 3 lines
xen/include/asm-x86/hvm/vcpu.h +3
-0+ } fields; + } nh_hostflags; +
I don't want to convert those vendor specific code into vendor neutral code. Those code are not necessary.
Quoted 16 lines
xen/include/asm-x86/hvm/vcpu.h +7
-0+bool_t nh_hap_enabled; +}; + +#define vcpu_nestedhvm (v) ((v)->arch.hvm_vcpu.nestedhvm) +struct hvm_vcpu {/* Guest control-register and EFER values, just as the guest sees them. */ unsigned long guest_cr[5 ];@@ -86,6 +141,8 @@ struct hvm_vcpu {struct tasklet assert_evtchn_irq_tasklet; +struct nestedhvm nestedhvm; +struct mtrr_state mtrr;u64 pat_cr;
To speedup the progress of nested virtualization support, I want to take this thread to discuss the data structure issue, and I think if we can convergence here, the later patch will be much easy.
Given that we have conflict in whether we should introduce new naming space and it will impact a lot to the wrapper APIs, I suggest we leave that later once we get those convergence stuff checked in to simplify patch rebase etc. We may undergo 1: consensus patch -> neutral patch -> fundamental argument, or 2: consensus patch -> fundamental argument -> neutral patch. Here are my comments to the original patch, followed by my proposals.
thx, eddie
Quoted 9 lines · Eddie
# HG changeset patch
# User cegger
# Date 1283345873 -7200
Data structures for Nested Virtualizationdiff -r
ecec3d163efa-r32aec447e8a1xen/include/asm-x86/hvm/hvm.h
xen/include/asm-x86/hvm/hvm.h enum hvm_intblk { · line 56
Quoted 6 lines
xen/include/asm-x86/hvm/hvm.h +2
-1@@ -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_svm_gif, /* GIF cleared */
That one is SVM specific, we don't have consensus for now, we can discuss later after the fundamental argument is solved.
xen/include/asm-x86/hvm/hvm.h
Quoted 9 lines
xen/include/asm-x86/hvm/hvm.h +0
-0};/* These happen to be the same as the VMX interrupt shadow definitions. */ @@ -180,6 +181,8 @@ int
hvm_girq_dest_2_vcpu_id(struct domai (hvm_paging_enabled(v) && ((v)->arch.hvm_vcpu.guest_cr[4] & X86_CR4_PAE)) #define hvm_nx_enabled(v) \ (!!((v)->arch.hvm_vcpu.guest_efer & EFER_NX))xen/include/asm-x86/hvm/hvm.h +2
-0+#define hvm_svm_enabled (v) \ + (!!((v)->arch.hvm_vcpu.guest_efer & EFER_SVME))
That is nested SVM on VMX model. May you remove this to SVM specific tree?
I suggest we have a wrapper: bool_t nestedhvm_is_enabled(), SVM & VMX will provide each callback for this.
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 38
Quoted 11 lines
#define
hvm_hap_has_1gb(d)\
(hvm_funcs.hap_capabilities &HVM_HAP_SUPERPAGE_1GB)
diff -recec3d163efa-r32aec447e8a1xen/include/asm-x86/hvm/vcpu.hxen/include/asm-x86/hvm/vcpu.h +1
-0@@ -35,6 +35,61 @@ enum hvm_io_state {HVMIO_completed }; +struct nestedhvm {
I don't think it is nestedhvm, but hested_vcpu.
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 39
Quoted 1 line
xen/include/asm-x86/hvm/vcpu.h +1
-0+bool_t nh_gif;/* vcpu's GIF, always true on VMX */
No consensus for now.
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 40
Quoted 1 line
xen/include/asm-x86/hvm/vcpu.h +1
-0+bool_t nh_guestmode;/* vcpu in guestmode? */
I want to use n1/n2 prefix/postfix for better terminology. guestmode is confusing given that L1 is also guest.
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 42
Quoted 2 lines
xen/include/asm-x86/hvm/vcpu.h +2
-0+void *nh_vm;/* VMCB/VMCS */ +size_t nh_vmsize;/* size of VMCB/VMCS */
I don't like pointer + size model. It is more like writting ASM code. Rather I would like to move those structure to arch specific tree. This is part of fundamental argument part, we can handle later.
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 46
Quoted 4 lines
xen/include/asm-x86/hvm/vcpu.h +4
-0+ +/* guest vm address of 1st level guest, needed for VMEXIT */ +uint64_t nh_vmaddr; +uint64_t nh_vmmaxaddr;/* Maximum supported address */
The term vm is confusing here.
And whether we should put those here or arch specific tree has no consensus yet. It highly depends on if we need the new naming space which I strongly against.
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 50
Quoted 4 lines
xen/include/asm-x86/hvm/vcpu.h +4
-0+void *nh_hostsave; + +void *nh_arch;/* SVM/VMX specific data */ +size_t nh_arch_size;
ditto
xen/include/asm-x86/hvm/vcpu.h enum hvm_io_state { · line 57
Quoted 7 lines
xen/include/asm-x86/hvm/vcpu.h +7
-0+ +/* Cached real MSR permission bitmaps of the nested guest */ +unsigned long *nh_cached_msrpm; +size_t nh_cached_msrpm_size; +/* Merged MSR permission bitmap */ +unsigned long *nh_merged_msrpm; +size_t nh_merged_msrpm_size;
VMX doesn't need to support l2 guest MSR bitmap for efficiency reason. Even in L1 VMM, we rather prefer on demand software save/restore of MSR, than unconditional HW save/restore. (We may have a few in reality) So we won't implement that for l2 guest.
Pls move them to SVM tree if SVM needs that.
xen/include/asm-x86/hvm/vcpu.h
Quoted 9 lines
xen/include/asm-x86/hvm/vcpu.h +2
-0+ +/* Cache guest cr3/host cr3 the guest sets up for the nested guest. + * Used by Shadow-on-Shadow and Nested-on-Nested.
+ *nh_vm_guestcr3: in l2 guest physical address space and points
to + * the l2 guest page table
+ *nh_vm_hostcr3: in l1 guest physical address space and points
to + * the l1 guest nested page tablexen/include/asm-x86/hvm/vcpu.h +2
-0+*/ +uint64_t nh_vm_guestcr3, nh_vm_hostcr3;
For nh_vm_guestcr3, I didn't see any real usage of this even in SVM, where you just need to reset it in nestedhvm_vcpu_reset. I would suggest you move them to SVM specific tree since nestedvcpu is part of VCPU, so you will be easily do that in svmvcpu_reset.
BTW, I didn't see the value of cache here, it is just a memory access. I'd rather to see a API to fetch them, rather than to maintain 2 data which is same.
Quoted 1 line
+
uint32_tnh_guest_asid;
same with nh_vm_guestcr3, no real usage so far, and caching is not necessary (we can use a wrapper API).
xen/include/asm-x86/hvm/vcpu.h
Quoted 3 lines
xen/include/asm-x86/hvm/vcpu.h +3
-0+bool_t nh_flushp2m; +struct p2m_domain *nh_p2m;/* used p2m table for this vcpu */ +
We may need this 2. How about to rename them to add n1/n2 prefix/postfix? p2m should be n2p_to_l0m or n2p_to_l1m? I suggest to make name as precise as possible especially for nested virt.
Quoted 14 lines
xen/include/asm-x86/hvm/vcpu.h +4
-0+/* Only meaningful when forcevmexit flag is set */ +struct { +uint64_t exitcode;/* generic exitcode */ +uint64_t exitinfo1;/* additional information to the exitcode */ +
uint64_texitinfo2; /* additional information to
the exitcode */ + }nh_forcevmexit;xen/include/asm-x86/hvm/vcpu.h +7
-0+union { +uint32_t bytes; +struct { +uint32_t rflagsif :1 ; +uint32_t vintrmask :1 ;/* always cleared on VMX */ +uint32_t forcevmexit :1 ; +uint32_t vmentry :1 ;/* true during vmentry/vmexit emulation */ +
uint32_treserved : 28;
xen/include/asm-x86/hvm/vcpu.h
Quoted 2 lines
xen/include/asm-x86/hvm/vcpu.h +2
-0+ } fields; + } nh_hostflags;
That is the key argument part.
xen/include/asm-x86/hvm/vcpu.h
Quoted 2 lines
xen/include/asm-x86/hvm/vcpu.h +2
-0+ +bool_t nh_hap_enabled;
What I can see is that it is a cache only. Question for the necessary since API can do easier.
Quoted 9 lines
xen/include/asm-x86/hvm/vcpu.h +4
-0+}; + +#define vcpu_nestedhvm (v) ((v)->arch.hvm_vcpu.nestedhvm) +struct hvm_vcpu {/* Guest control-register and EFER values, just as the guest sees them. */ unsigned long guest_cr[5 ];
xen/include/asm-x86/hvm/vcpu.h struct hvm_vcpu { · line 147
Quoted 7 lines
xen/include/asm-x86/hvm/vcpu.h +2
-0@@ -86,6 +141,8 @@ struct hvm_vcpu {struct tasklet assert_evtchn_irq_tasklet; +struct nestedhvm nestedhvm; +struct mtrr_state mtrr;u64 pat_cr;
Next part is my proposal of the startpoint just for reference. We can gradually put more inside.
xen/include/asm-x86/hvm/vcpu.h Thu Sep 16 11:52:03 2010 +0800 renamed from xen/include/asm-x86/hvm/vcpu.h Thu Sep 16 10:31:19 2010 +0800 +14 -0
@@ -35,6 +35,10 @@ HVMIO_completed }; +struct nested_vcpu { + bool_t n2_guest; /* vcpu in layer 2 nested guest */ +}; + struct hvm_vcpu { /* Guest control-register and EFER values, just as the guest sees them. */ unsigned long guest_cr[5];
@@ -85,6 +89,8 @@ } u; struct tasklet assert_evtchn_irq_tasklet; + struct nested_vcpu nvcpu; + struct mtrr_state mtrr; u64 pat_cr;
@@ -123,4 +129,12 @@ unsigned int mmio_large_write_bytes; }; +#define is_n2_guest(v) ((v)->arch.hvm_vcpu.nvcpu.n2_guest) + +static inline void enter_n2_guest(struct hvm_vcpu *v, bool_t n2_guest) +{ + v->nvcpu.n2_guest = n2_guest; + return; +} + #endif /* __ASM_X86_HVM_VCPU_H__ */