X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmcs.c;h=67c6f69b7a7798555d360b90992c758234723712;hb=94966f95239e03c7df97bd71d6be3e1316239d21;hp=2d36a3ff0def5b95a32f0b6ac61bb74b55adae50;hpb=a7b07dc7f3bd9c28b0fbfb3c685a306326d56e76;p=palacios.git

diff --git a/palacios/src/palacios/vmcs.c b/palacios/src/palacios/vmcs.c
index 2d36a3f..67c6f69 100644
--- a/palacios/src/palacios/vmcs.c
+++ b/palacios/src/palacios/vmcs.c
@@ -234,10 +234,30 @@ int v3_vmx_save_vmcs(struct guest_info * info) {
 
 #ifdef __V3_64BIT__
     check_vmcs_read(VMCS_GUEST_EFER, &(info->ctrl_regs.efer));
+    check_vmcs_read(VMCS_ENTRY_CTRLS, &(vmx_info->entry_ctrls.value));
 #endif
     
     error =  v3_read_vmcs_segments(&(info->segments));
 
+    /* Save MSRs from MSR SAVE Area (whereever that is...)*/
+
+    info->msrs.star = vmx_info->msr_area->guest_star.hi;
+    info->msrs.star <<= 32;
+    info->msrs.star |= vmx_info->msr_area->guest_star.lo;
+
+    info->msrs.lstar = vmx_info->msr_area->guest_lstar.hi;
+    info->msrs.lstar <<= 32;
+    info->msrs.lstar |= vmx_info->msr_area->guest_lstar.lo;
+
+    info->msrs.sfmask = vmx_info->msr_area->guest_fmask.hi;
+    info->msrs.sfmask <<= 32;
+    info->msrs.sfmask |= vmx_info->msr_area->guest_fmask.lo;
+
+    info->msrs.kern_gs_base = vmx_info->msr_area->guest_kern_gs.hi;
+    info->msrs.kern_gs_base <<= 32;
+    info->msrs.kern_gs_base |= vmx_info->msr_area->guest_kern_gs.lo;
+
+
     return error;
 }
 
@@ -263,10 +283,21 @@ int v3_vmx_restore_vmcs(struct guest_info * info) {
     check_vmcs_write(VMCS_ENTRY_CTRLS, vmx_info->entry_ctrls.value);
 #endif
 
+    error = v3_write_vmcs_segments(&(info->segments));
 
+    /* Restore MSRs from MSR SAVE Area (whereever that is...)*/
 
+    vmx_info->msr_area->guest_star.hi = (info->msrs.star >> 32);
+    vmx_info->msr_area->guest_star.lo = (info->msrs.star & 0xffffffff);
 
-    error = v3_write_vmcs_segments(&(info->segments));
+    vmx_info->msr_area->guest_lstar.hi = (info->msrs.lstar >> 32);
+    vmx_info->msr_area->guest_lstar.lo = (info->msrs.lstar & 0xffffffff);
+
+    vmx_info->msr_area->guest_fmask.hi = (info->msrs.sfmask >> 32);
+    vmx_info->msr_area->guest_fmask.lo = (info->msrs.sfmask & 0xffffffff);
+
+    vmx_info->msr_area->guest_kern_gs.hi = (info->msrs.kern_gs_base >> 32);
+    vmx_info->msr_area->guest_kern_gs.lo = (info->msrs.kern_gs_base & 0xffffffff);
 
     return error;
 
@@ -277,8 +308,12 @@ int v3_vmx_restore_vmcs(struct guest_info * info) {
 int v3_update_vmcs_host_state(struct guest_info * info) {
     int vmx_ret = 0;
     addr_t tmp;
-    struct vmx_data * arch_data = (struct vmx_data *)(info->vmm_data);
     struct v3_msr tmp_msr;
+    addr_t gdtr_base;
+    struct {
+        uint16_t selector;
+        addr_t   base;
+    } __attribute__((packed)) tmp_seg;
 
 #ifdef __V3_64BIT__
     __asm__ __volatile__ ( "movq    %%cr0, %0; "		
@@ -322,12 +357,48 @@ int v3_update_vmcs_host_state(struct guest_info * info) {
     vmx_ret |= check_vmcs_write(VMCS_HOST_CR4, tmp);
 
 
+    __asm__ __volatile__(
+			 "sgdt (%0);"
+			 :
+			 : "q"(&tmp_seg)
+			 : "memory"
+			 );
+    gdtr_base = tmp_seg.base;
+    vmx_ret |= check_vmcs_write(VMCS_HOST_GDTR_BASE, tmp_seg.base);
+
+    __asm__ __volatile__(
+			 "sidt (%0);"
+			 :
+			 : "q"(&tmp_seg)
+			 : "memory"
+			 );
+    vmx_ret |= check_vmcs_write(VMCS_HOST_IDTR_BASE, tmp_seg.base);
+
+    __asm__ __volatile__(
+			 "str (%0);"
+			 :
+			 : "q"(&tmp_seg)
+			 : "memory"
+			 );
+    vmx_ret |= check_vmcs_write(VMCS_HOST_TR_SELECTOR, tmp_seg.selector);
+
+    /* The GDTR *index* is bits 3-15 of the selector. */
+    {
+	struct tss_descriptor * desc = NULL;
+	desc = (struct tss_descriptor *)(gdtr_base + (8 * (tmp_seg.selector >> 3)));
+
+	tmp_seg.base = ((desc->base1) |
+			(desc->base2 << 16) |
+			(desc->base3 << 24) |
+#ifdef __V3_64BIT__
+			((uint64_t)desc->base4 << 32)
+#else
+			(0)
+#endif
+			);
 
-    vmx_ret |= check_vmcs_write(VMCS_HOST_GDTR_BASE, arch_data->host_state.gdtr.base);
-    vmx_ret |= check_vmcs_write(VMCS_HOST_IDTR_BASE, arch_data->host_state.idtr.base);
-    vmx_ret |= check_vmcs_write(VMCS_HOST_TR_BASE, arch_data->host_state.tr.base);
-
-
+	vmx_ret |= check_vmcs_write(VMCS_HOST_TR_BASE, tmp_seg.base);
+    }
 
 
 #ifdef __V3_64BIT__
@@ -408,8 +479,6 @@ int v3_update_vmcs_host_state(struct guest_info * info) {
 #endif
     vmx_ret |= check_vmcs_write(VMCS_HOST_GS_SELECTOR, tmp);
 
-    vmx_ret |= check_vmcs_write(VMCS_HOST_TR_SELECTOR, arch_data->host_state.tr.selector);
-
 
 #define SYSENTER_CS_MSR 0x00000174
 #define SYSENTER_ESP_MSR 0x00000175
@@ -449,10 +518,21 @@ int v3_update_vmcs_host_state(struct guest_info * info) {
 
     // PAT
 
+    v3_get_msr(IA32_PAT_MSR, &(tmp_msr.hi), &(tmp_msr.lo));
+    vmx_ret |= check_vmcs_write(VMCS_HOST_PAT, tmp_msr.value);  
+
 
     // save STAR, LSTAR, FMASK, KERNEL_GS_BASE MSRs in MSR load/store area
+    {
+	struct vmx_data * vmx_state = (struct vmx_data *)info->vmm_data;
+	struct vmcs_msr_save_area * msr_entries = vmx_state->msr_area;
 
     
+	v3_get_msr(IA32_STAR_MSR, &(msr_entries->host_star.hi), &(msr_entries->host_star.lo));
+	v3_get_msr(IA32_LSTAR_MSR, &(msr_entries->host_lstar.hi), &(msr_entries->host_lstar.lo));
+	v3_get_msr(IA32_FMASK_MSR, &(msr_entries->host_fmask.hi), &(msr_entries->host_fmask.lo));
+	v3_get_msr(IA32_KERN_GS_BASE_MSR, &(msr_entries->host_kern_gs.hi), &(msr_entries->host_kern_gs.lo));
+    }