X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fsvm.c;h=5e8eb778f711427f4adf06d82a1d83e9a93df492;hb=2e05f3b8f738466246add183c55bcb17abf33ec9;hp=88ab002cdb55233db66a66b4a6e722d043359924;hpb=ff58148c2cfbbc82405dc9ec25056cc93c773083;p=palacios.git

diff --git a/palacios/src/geekos/svm.c b/palacios/src/geekos/svm.c
index 88ab002..5e8eb77 100644
--- a/palacios/src/geekos/svm.c
+++ b/palacios/src/geekos/svm.c
@@ -1,5 +1,7 @@
 #include <geekos/svm.h>
+#include <geekos/vmm.h>
 
+#include <geekos/vmcb.h>
 
 extern struct vmm_os_hooks * os_hooks;
 
@@ -7,6 +9,8 @@ extern uint_t cpuid_ecx(uint_t op);
 extern uint_t cpuid_edx(uint_t op);
 extern void Get_MSR(uint_t MSR, uint_t * high_byte, uint_t * low_byte); 
 extern void Set_MSR(uint_t MSR, uint_t high_byte, uint_t low_byte);
+extern uint_t launch_svm(vmcb_t * vmcb_addr);
+
 
 /* Checks machine SVM capability */
 /* Implemented from: AMD Arch Manual 3, sect 15.4 */ 
@@ -15,6 +19,7 @@ int is_svm_capable() {
   uint_t vm_cr_low = 0, vm_cr_high = 0;
 
 
+  return 1;
   if ((ret & CPUID_FEATURE_IDS_ecx_svm_avail) == 0) {
     PrintDebug("SVM Not Available\n");
     return 0;
@@ -58,6 +63,8 @@ void Init_SVM() {
   msr.e_reg.high = 0;
   msr.e_reg.low = (uint_t)host_state;
 
+
+  PrintDebug("Host State being saved at %x\n", (uint_t)host_state);
   Set_MSR(SVM_VM_HSAVE_PA_MSR, msr.e_reg.high, msr.e_reg.low);
 
 
@@ -65,11 +72,97 @@ void Init_SVM() {
 }
 
 
+int init_svm_guest(struct guest_info *info) {
+  PrintDebug("Allocating VMCB\n");
+  info->vmm_data = (void*)Allocate_VMCB();
+
+  PrintDebug("Initializing VMCB (addr=%x)\n", info->vmm_data);
+  Init_VMCB((vmcb_t*)(info->vmm_data), *info);
+
+  return 0;
+}
+
+
+// can we start a kernel thread here...
+int start_svm_guest(struct guest_info *info) {
+  vmcb_ctrl_t * guest_ctrl = 0;
+
+  ulong_t exit_code = 0;
+
+  PrintDebug("Launching SVM VM (vmcb=%x)\n", info->vmm_data);
+
+  launch_svm((vmcb_t*)(info->vmm_data));
+
+  guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
+
+
+  PrintDebug("SVM Returned: (Exit Code=%x) (VMCB=%x)\n",&(guest_ctrl->exit_code), info->vmm_data); 
+
+
+  exit_code = guest_ctrl->exit_code;
+
+  PrintDebug("SVM Returned: Exit Code: %x\n",exit_code); 
+
+  return 0;
+}
 
 
-void Allocate_VMCB() {
-  void * vmcb_page = os_hooks->Allocate_Pages(1);
+
+vmcb_t * Allocate_VMCB() {
+  vmcb_t * vmcb_page = (vmcb_t*)os_hooks->Allocate_Pages(1);
 
 
   memset(vmcb_page, 0, 4096);
+
+  return vmcb_page;
+}
+
+
+
+void Init_VMCB(vmcb_t *vmcb, guest_info_t vm_info) {
+  vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA(vmcb);
+  vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA(vmcb);
+  uint_t i = 0;
+
+
+  guest_state->rsp = vm_info.rsp;
+  guest_state->rip = vm_info.rip;
+
+
+  /* I pretty much just gutted this from TVMM */
+  /* Note: That means its probably wrong */
+
+  // set the segment registers to mirror ours
+  guest_state->cs.selector = 0;
+  guest_state->cs.attrib.fields.type = 0xa; // Code segment+read
+  guest_state->cs.attrib.fields.S = 1;
+  guest_state->cs.attrib.fields.P = 1;
+  guest_state->cs.attrib.fields.db = 1;
+  guest_state->cs.limit = 0xffffffff;
+  guest_state->cs.base = 0;
+  
+  struct vmcb_selector *segregs [] = {&(guest_state->ss), &(guest_state->ds), &(guest_state->es), &(guest_state->fs), &(guest_state->gs), NULL};
+  for ( i = 0; segregs[i] != NULL; i++) {
+    struct vmcb_selector * seg = segregs[i];
+    
+    seg->selector = 0;
+    seg->attrib.fields.type = 0x2; // Data Segment+read/write
+    seg->attrib.fields.S = 1;
+    seg->attrib.fields.P = 1;
+    seg->attrib.fields.db = 1;
+    seg->limit = 0xffffffff;
+    seg->base = 0;
+  }
+
+
+  guest_state->efer |= EFER_MSR_svm_enable;
+  guest_state->cr0 = 0x00000001;    // PE 
+  guest_state->rflags = 0x00000002; // The reserved bit is always 1
+  ctrl_area->svm_instrs.instrs.VMRUN = 1;
+  ctrl_area->guest_ASID = 1;
+
+
+
+  /* ** */
+
 }