Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

Conflicts:

	palacios/src/devices/apic.c

diff --git a/palacios/include/devices/apic.h b/palacios/include/devices/apic.h
index 6ad758e..40415e6 100644 (file)
--- a/palacios/include/devices/apic.h
+++ b/palacios/include/devices/apic.h
@@ -25,8 +25,32 @@
 #include <palacios/vmm_dev_mgr.h>
 
 
+typedef enum {IPI_FIXED = 0,
+             IPI_LOWEST_PRIO = 1,
+             IPI_SMI = 2,
+             IPI_NMI = 4,
+             IPI_INIT = 5,
+             IPI_EXINT = 7 } ipi_mode_t; 
+
+
+struct v3_gen_ipi {
+    uint8_t vector;
+    ipi_mode_t mode;
+
+    uint8_t logical      : 1;
+    uint8_t trigger_mode : 1;
+    uint8_t dst_shorthand : 2;
+
+    uint8_t dst;
+} __attribute__((packed));
+
+int v3_apic_send_ipi(struct v3_vm_info * vm, struct vm_device * dev, 
+                    struct v3_gen_ipi * ipi);
+
+int v3_apic_raise_intr(struct v3_vm_info * vm, struct vm_device * apic_dev, 
+                      uint32_t irq, uint32_t dst);
+
 
-int v3_apic_raise_intr(struct v3_vm_info * vm, struct vm_device * apic_dev, uint32_t irq, uint32_t dst);
 
 
 #endif // ! __V3VEE__

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index c6441fb..348fff7 100644 (file)
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -147,15 +147,15 @@ struct apic_msr {
            uint8_t bootstrap_cpu : 1;
            uint8_t rsvd2         : 2;
            uint8_t apic_enable   : 1;
-           uint64_t base_addr   : 40;
-           uint32_t rsvd3         : 12;
+           uint64_t base_addr    : 40;
+           uint32_t rsvd3        : 12;
        } __attribute__((packed));
     } __attribute__((packed));
 } __attribute__((packed));
 
 
 
-typedef enum {INIT, SIPI, STARTED} ipi_state_t; 
+typedef enum {INIT_ST, SIPI, STARTED} ipi_state_t; 
 
 struct apic_dev_state;
 
@@ -259,7 +259,7 @@ static void init_apic_state(struct apic_state * apic, uint32_t id) {
 
     apic->lapic_id.val = id;
     
-    apic->ipi_state = INIT;
+    apic->ipi_state = INIT_ST;
 
     // The P6 has 6 LVT entries, so we set the value to (6-1)...
     apic->apic_ver.val = 0x80050010;
@@ -323,7 +323,9 @@ static int write_apic_msr(struct guest_info * core, uint_t msr, v3_msr_t src, vo
 
     apic->base_addr = src.value;
 
-    if (v3_hook_full_mem(core->vm_info, core->cpu_id, apic->base_addr, apic->base_addr + PAGE_SIZE_4KB, apic_read, apic_write, apic_dev) == -1) {
+    if (v3_hook_full_mem(core->vm_info, core->cpu_id, apic->base_addr, 
+                        apic->base_addr + PAGE_SIZE_4KB, 
+                        apic_read, apic_write, apic_dev) == -1) {
        PrintError("apic %u: core %u: Could not hook new APIC Base address\n",
                   apic->lapic_id.val, core->cpu_id);
        v3_unlock(apic->lock);
@@ -547,14 +549,22 @@ static inline int should_deliver_flat_ipi(struct guest_info * dst_core,
 static int should_deliver_ipi(struct guest_info * dst_core, 
                              struct apic_state * dst_apic, uint8_t mda) {
 
-    if (mda == 0xff) {
-       // always deliver broadcast
-       return 1;
-    }
 
     if (dst_apic->dst_fmt.model == 0xf) {
+
+       if (mda == 0xff) {
+           // always deliver broadcast
+           return 1;
+       }
+
        return should_deliver_cluster_ipi(dst_core, dst_apic, mda);
     } else if (dst_apic->dst_fmt.model == 0x0) {
+
+       if (mda == 0xff) {
+           // always deliver broadcast
+           return 1;
+       }
+
        return should_deliver_flat_ipi(dst_core, dst_apic, mda);
     } else {
        PrintError("apic %u core %u: invalid destination format register value 0x%x for logical mode delivery.\n", 
@@ -564,8 +574,7 @@ static int should_deliver_ipi(struct guest_info * dst_core,
 }
 
 
-static int deliver_ipi(struct guest_info * core, 
-                      struct apic_state * src_apic, 
+static int deliver_ipi(struct apic_state * src_apic, 
                       struct apic_state * dst_apic, 
                       uint32_t vector, uint8_t del_mode) {
 
@@ -598,7 +607,7 @@ static int deliver_ipi(struct guest_info * core,
            // TODO: any APIC reset on dest core (shouldn't be needed, but not sure...)
 
            // Sanity check
-           if (dst_apic->ipi_state != INIT) { 
+           if (dst_apic->ipi_state != INIT_ST) { 
                PrintError(" Warning: core %u is not in INIT state (mode = %d), ignored\n",
                           dst_core->cpu_id, dst_core->cpu_mode);
                // Only a warning, since INIT INIT SIPI is common
@@ -670,23 +679,15 @@ static int deliver_ipi(struct guest_info * core,
 }
 
 
-static int route_ipi(struct guest_info * core, struct apic_dev_state * apic_dev,
-                    struct apic_state * src_apic,  uint32_t icr_val) {
-    struct int_cmd_reg * icr = (struct int_cmd_reg *)&icr_val;
+static int route_ipi(struct apic_dev_state * apic_dev,
+                    struct apic_state * src_apic, 
+                    struct int_cmd_reg * icr) {
     struct apic_state * dest_apic = NULL;
 
     PrintDebug("route_ipi: src_apic=%p, icr_data=%x", 
               src_apic, icr_val);
 
 
-    // initial sanity checks
-    if (src_apic == NULL) { 
-       PrintError("route_ipi: Apparently sending from unregistered apic id=%d\n", 
-                  src_apic->core->cpu_id);
-       return -1;
-    }
-
-
     if ((icr->dst_mode == 0) && (icr->dst >= apic_dev->num_apics)) { 
        PrintError("route_ipi: Attempted send to unregistered apic id=%u\n", 
                   icr->dst);
@@ -712,7 +713,7 @@ static int route_ipi(struct guest_info * core, struct apic_dev_state * apic_dev,
            if (icr->dst_mode == 0) { 
                // physical delivery
 
-               if (deliver_ipi(core, src_apic, dest_apic, 
+               if (deliver_ipi(src_apic, dest_apic, 
                                icr->vec, icr->del_mode) == -1) {
                    PrintError("Error: Could not deliver IPI\n");
                    return -1;
@@ -731,7 +732,7 @@ static int route_ipi(struct guest_info * core, struct apic_dev_state * apic_dev,
                         PrintError("Error checking delivery mode\n");
                         return -1;
                     } else if (del_flag == 1) {
-                       if (deliver_ipi(core, src_apic, dest_apic, 
+                       if (deliver_ipi(src_apic, dest_apic, 
                                        icr->vec, icr->del_mode) == -1) {
                            PrintError("Error: Could not deliver IPI\n");
                            return -1;
@@ -744,8 +745,13 @@ static int route_ipi(struct guest_info * core, struct apic_dev_state * apic_dev,
            
        case 1:  // self
 
+           if (src_apic == NULL) {
+               PrintError("Sending IPI to self from generic IPI sender\n");
+               break;
+           }
+
            if (icr->dst_mode == 0) { 
-               if (deliver_ipi(core, src_apic, src_apic, icr->vec, icr->del_mode) == -1) {
+               if (deliver_ipi(src_apic, src_apic, icr->vec, icr->del_mode) == -1) {
                    PrintError("Could not deliver IPI\n");
                    return -1;
                }
@@ -766,7 +772,7 @@ static int route_ipi(struct guest_info * core, struct apic_dev_state * apic_dev,
                dest_apic = &(apic_dev->apics[i]);
 
                if ((dest_apic != src_apic) || (icr->dst_shorthand == 2)) { 
-                   if (deliver_ipi(core, src_apic, dest_apic, icr->vec, icr->del_mode) == -1) {
+                   if (deliver_ipi(src_apic, dest_apic, icr->vec, icr->del_mode) == -1) {
                        PrintError("Error: Could not deliver IPI\n");
                        return -1;
                    }
@@ -1220,7 +1226,7 @@ static int apic_write(struct guest_info * core, addr_t guest_addr, void * src, u
                       apic->lapic_id.val, core->cpu_id,
                       apic->int_cmd.val, apic->int_cmd.dst);
 
-           if (route_ipi(core, apic_dev, apic, apic->int_cmd.val) == -1) { 
+           if (route_ipi(apic_dev, apic, &(apic->int_cmd)) == -1) { 
                PrintError("IPI Routing failure\n");
                return -1;
            }
@@ -1284,6 +1290,28 @@ static int apic_get_intr_number(struct guest_info * core, void * private_data) {
 }
 
 
+int v3_apic_send_ipi(struct v3_vm_info * vm, struct vm_device * dev, 
+                    struct v3_gen_ipi * ipi) {
+    struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev->private_data);
+    struct int_cmd_reg tmp_icr;
+
+    // zero out all the fields
+    tmp_icr.val = 0;
+
+
+    tmp_icr.vec = ipi->vector;
+    tmp_icr.del_mode = ipi->mode;
+    tmp_icr.dst_mode = ipi->logical;
+    tmp_icr.trig_mode = ipi->trigger_mode;
+    tmp_icr.dst_shorthand = ipi->dst_shorthand;
+    tmp_icr.dst = ipi->dst;
+    
+
+    route_ipi(apic_dev, NULL, &tmp_icr);
+    return -1;
+}
+
+
 int v3_apic_raise_intr(struct v3_vm_info * vm, struct vm_device * dev, 
                       uint32_t irq, uint32_t dst) {
     struct apic_dev_state * apic_dev = (struct apic_dev_state *)(dev->private_data);

diff --git a/palacios/src/devices/io_apic.c b/palacios/src/devices/io_apic.c
index 506b7af..c725e86 100644 (file)
--- a/palacios/src/devices/io_apic.c
+++ b/palacios/src/devices/io_apic.c
@@ -274,20 +274,21 @@ static int ioapic_raise_irq(struct v3_vm_info * vm, void * private_data, int irq
     irq_entry = &(ioapic->redir_tbl[irq]);
 
     if (irq_entry->mask == 0) {
+       struct v3_gen_ipi ipi;
 
        PrintDebug("ioapic %u: IOAPIC Signalling APIC to raise INTR %d\n", 
                   ioapic->ioapic_id.id, irq_entry->vec);
 
-       
-       // May need these for future reference
-       //      icr.val = irq_entry->val;
-       //      icr.trig_mode = irq_entry->trig_mode;
 
-       PrintDebug("io apic: raising irq %u\n", irq);
+       ipi.vector = irq_entry->vec;
+       ipi.mode = irq_entry->del_mode;
+       ipi.logical = irq_entry->dst_mode;
+       ipi.trigger_mode = irq_entry->trig_mode;
+       ipi->dst = irq_entry->dst_field;
+       ipi->dst_shorthand = 0;
 
        // Need to add destination argument here...
-       v3_apic_raise_intr(vm, ioapic->apic_dev, irq, irq_entry->vec);
-
+       v3_apic_send_ipi(vm, ioapic->apic_dev, &ipi);
     }
 
     return 0;

diff --git a/test/geekos_test_vm/src/common/fmtout.c b/test/geekos_test_vm/src/common/fmtout.c
index c097eb4..ca7f6c0 100644 (file)
--- a/test/geekos_test_vm/src/common/fmtout.c
+++ b/test/geekos_test_vm/src/common/fmtout.c
@@ -78,7 +78,8 @@ enum ranks {
 #define PTRDIFF_T_RANK rank_long
 
 /* DHH */
-#define EMIT(x) do { (q)->Emit((q), (x)); } while (0)
+#include <geekos/vm_cons.h>
+#define EMIT(x) do { if (q == NULL) {(q)->Emit((q), (x));} } while (0)
 
 /*
  * DHH - As a hack, we buffer this many digits when generating

diff --git a/test/geekos_test_vm/src/geekos/bget.c b/test/geekos_test_vm/src/geekos/bget.c
index cccbe16..d13c3e0 100644 (file)
--- a/test/geekos_test_vm/src/geekos/bget.c
+++ b/test/geekos_test_vm/src/geekos/bget.c
@@ -525,10 +525,9 @@ struct bfhead {
 };
 #define BFH(p) ((struct bfhead *) (p))
 
-static struct bfhead freelist = {     /* List of free buffers */
-    {0, 0},
-    {&freelist, &freelist}
-};
+static struct bfhead freelist;     /* List of free buffers */
+
+
 
 
 #ifdef BufStats
@@ -1017,6 +1016,14 @@ void bpool(buf, len)
 
     assert(len - sizeof(struct bhead) <= -((bufsize) ESent + 1));
 
+    /* Initialize Free list since compile time static initializations appear to be broken */
+    freelist.bh.prevfree = 0;
+    freelist.bh.bsize = 0;
+    freelist.ql.flink = &freelist;
+    freelist.ql.blink = &freelist;
+
+
+
     /* Clear  the  backpointer at  the start of the block to indicate that
        there  is  no  free  block  prior  to  this   one.    That   blocks
        recombination when the first block in memory is released. */

diff --git a/test/geekos_test_vm/src/geekos/main.c b/test/geekos_test_vm/src/geekos/main.c
index a163378..8dd05ab 100644 (file)
--- a/test/geekos_test_vm/src/geekos/main.c
+++ b/test/geekos_test_vm/src/geekos/main.c
@@ -241,18 +241,15 @@ void Main(struct Boot_Info* bootInfo)
 {
   struct Kernel_Thread * key_thread;
   struct Kernel_Thread * spkr_thread;
-
-
-  //  VMConsPutLineN("hello\n", 6);
-
   ulong_t doIBuzz = 0;
 
   Init_BSS();
+  Init_VMCons();
   Init_Screen();
   InitSerial();
-
-  Init_VMCons();
+  Print("Initializing Memory\n");
   Init_Mem(bootInfo);
+  Print("Memory Done\n");
   Init_CRC32();
   Init_TSS();
   Init_Interrupts();
@@ -268,10 +265,6 @@ void Main(struct Boot_Info* bootInfo)
 
 
 
-
-
-
-
   PrintBoth("\n\nHello, Welcome to this horrid output-only serial interface\n");
   PrintBoth("Eventually, this will let us control the VMM\n\n");
  

diff --git a/test/geekos_test_vm/src/geekos/malloc.c b/test/geekos_test_vm/src/geekos/malloc.c
index ea76959..269f0a2 100644 (file)
--- a/test/geekos_test_vm/src/geekos/malloc.c
+++ b/test/geekos_test_vm/src/geekos/malloc.c
@@ -19,7 +19,7 @@
  */
 void Init_Heap(ulong_t start, ulong_t size)
 {
-    /*Print("Creating kernel heap: start=%lx, size=%ld\n", start, size);*/
+    Print("Creating kernel heap: start=%lx, size=%ld\n", start, size);
     bpool((void*) start, size);
 }
 

diff --git a/test/geekos_test_vm/src/geekos/mem.c b/test/geekos_test_vm/src/geekos/mem.c
index 2f44520..6ab2051 100644 (file)
--- a/test/geekos_test_vm/src/geekos/mem.c
+++ b/test/geekos_test_vm/src/geekos/mem.c
@@ -109,7 +109,11 @@ void Init_Mem(struct Boot_Info* bootInfo)
     ulong_t pageListAddr;
     ulong_t kernEnd;
 
+
+    memset(&s_freeList, 0, sizeof(struct Page_List));
+    
     KASSERT(bootInfo->memSizeKB > 0);
+    Print("Booting with %d KB memory\n", bootInfo->memSizeKB);
 
     /*
      * Before we do anything, switch from setup.asm's temporary GDT
@@ -180,10 +184,12 @@ void Init_Mem(struct Boot_Info* bootInfo)
 
     /* Initialize the kernel heap */
     //    Init_Heap(HIGHMEM_START, KERNEL_HEAP_SIZE);
+
+    Print("Initing heap\n");
     Init_Heap(kernEnd, KERNEL_HEAP_SIZE);
 
     Print("%uKB memory detected, %u pages in freelist, %d bytes in kernel heap\n",
-       bootInfo->memSizeKB, g_freePageCount, KERNEL_HEAP_SIZE);
+         bootInfo->memSizeKB, g_freePageCount, KERNEL_HEAP_SIZE);
 }
 
 /*

diff --git a/test/geekos_test_vm/src/geekos/screen.c b/test/geekos_test_vm/src/geekos/screen.c
index 077112f..5323e3c 100644 (file)
--- a/test/geekos_test_vm/src/geekos/screen.c
+++ b/test/geekos_test_vm/src/geekos/screen.c
@@ -14,6 +14,7 @@
 #include <geekos/int.h>
 #include <geekos/fmtout.h>
 #include <geekos/screen.h>
+#include <geekos/vm_cons.h>
 
 /*
  * Information sources for VT100 and ANSI escape sequences:
@@ -387,20 +388,6 @@ static void Update_Cursor(void)
  * Public functions
  * ---------------------------------------------------------------------- */
 
-/*
- * Initialize the screen module.
- */
-void Init_Screen(void)
-{
-    bool iflag = Begin_Int_Atomic();
-
-    s_cons.row = s_cons.col = 0;
-    s_cons.currentAttr = DEFAULT_ATTRIBUTE;
-    Clear_Screen();
-
-    End_Int_Atomic(iflag);
-    Print("Screen Inited\n");
-}
 
 /*
  * Clear the screen using the current attribute.
@@ -512,7 +499,7 @@ void Put_Buf(const char* buf, ulong_t length)
 /* Support for Print(). */
 static void Print_Emit(struct Output_Sink *o, int ch) { Put_Char_Imp(ch); }
 static void Print_Finish(struct Output_Sink *o) { Update_Cursor(); }
-static struct Output_Sink s_outputSink = { &Print_Emit, &Print_Finish };
+static struct Output_Sink s_outputSink;
 
 /*
  * Print to console using printf()-style formatting.
@@ -542,3 +529,22 @@ void PrintList(const char * fmt, va_list ap) {
     PrintInternal(fmt, ap);
     End_Int_Atomic(iflag);
 }
+
+
+/*
+ * Initialize the screen module.
+ */
+void Init_Screen(void)
+{
+    bool iflag = Begin_Int_Atomic();
+    
+    s_outputSink.Emit = &Print_Emit;
+    s_outputSink.Finish = &Print_Finish;
+
+    s_cons.row = s_cons.col = 0;
+    s_cons.currentAttr = DEFAULT_ATTRIBUTE;
+    Clear_Screen();
+
+    End_Int_Atomic(iflag);
+    Print("Screen Inited\n");
+}