Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Minor debugging print changes/fixups
[palacios.git] / palacios / src / devices / apic.c
index 31099b5..b8e2fef 100644 (file)
 #define PrintDebug(fmt, args...)
 #endif
 
+#ifdef CONFIG_DEBUG_APIC
+static char *shorthand_str[] = { 
+    "(no shorthand)",
+    "(self)",
+    "(all)",
+    "(all-but-me)",
+};
+
+static char *deliverymode_str[] = { 
+    "(fixed)",
+    "(lowest priority)",
+    "(SMI)",
+    "(reserved)",
+    "(NMI)",
+    "(INIT)",
+    "(Start Up)",
+    "(ExtInt)",
+};
+#endif
 
 typedef enum { APIC_TMR_INT, APIC_THERM_INT, APIC_PERF_INT, 
               APIC_LINT0_INT, APIC_LINT1_INT, APIC_ERR_INT } apic_irq_type_t;
@@ -116,10 +135,6 @@ typedef enum { APIC_TMR_INT, APIC_THERM_INT, APIC_PERF_INT,
 #define EXT_INT_LOC_VEC_TBL_OFFSET2       0x520   // 0x500 - 0x530
 #define EXT_INT_LOC_VEC_TBL_OFFSET3       0x530   // 0x500 - 0x530
 
-
-
-
-
 struct apic_msr {
     union {
        uint64_t value;
@@ -128,15 +143,17 @@ 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;
 
@@ -240,7 +257,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;
@@ -304,7 +321,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);
@@ -327,22 +346,23 @@ static int activate_apic_irq(struct apic_state * apic, uint32_t irq_num) {
 
 
     if (irq_num <= 15) {
-//     PrintError("apic %u: core ?: Attempting to raise an invalid interrupt: %d\n", apic->lapic_id.val,irq_num);
+       PrintError("apic %u: core %d: Attempting to raise an invalid interrupt: %d\n", 
+                  apic->lapic_id.val, apic->core->cpu_id, irq_num);
        return -1;
     }
 
 
-    PrintDebug("apic %u: core ?: Raising APIC IRQ %d\n", apic->lapic_id.val, irq_num);
+    PrintDebug("apic %u: core %d: Raising APIC IRQ %d\n", apic->lapic_id.val, apic->core->cpu_id, irq_num);
 
     if (*req_location & flag) {
-       //V3_Print("Interrupts coallescing\n");
+       PrintDebug("Interrupt %d  coallescing\n", irq_num);
     }
 
     if (*en_location & flag) {
        *req_location |= flag;
     } else {
-       PrintDebug("apic %u: core ?: Interrupt  not enabled... %.2x\n", 
-                  apic->lapic_id.val, *en_location);
+       PrintDebug("apic %u: core %d: Interrupt  not enabled... %.2x\n", 
+                  apic->lapic_id.val, apic->core->cpu_id,*en_location);
        return 0;
     }
 
@@ -500,7 +520,7 @@ static inline int should_deliver_cluster_ipi(struct guest_info * dst_core,
        return 1;
     } else {
        PrintDebug("apic %u core %u: rejecting clustered IRQ (mda 0x%x != log_dst 0x%x)\n",
-                  dst_apic->lapic_id.val, dst_core->cpu_id, mda, dst_
+                  dst_apic->lapic_id.val, dst_core->cpu_id, mda, 
                   dst_apic->log_dst.dst_log_id);
        return 0;
     }
@@ -528,15 +548,23 @@ 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) {
-       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 if (dst_apic->dst_fmt.model == 0x0) {
+
+       if (mda == 0xff) {
+           // always deliver broadcast
+           return 1;
+       }
+
+       return should_deliver_cluster_ipi(dst_core, dst_apic, mda);
     } else {
        PrintError("apic %u core %u: invalid destination format register value 0x%x for logical mode delivery.\n", 
                   dst_apic->lapic_id.val, dst_core->cpu_id, dst_apic->dst_fmt.model);
@@ -545,8 +573,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) {
 
@@ -556,7 +583,7 @@ static int deliver_ipi(struct guest_info * core,
 
        case 0:  //fixed
        case 1: // lowest priority
-           PrintDebug(" delivering IRQ to core %u\n", dst_core->cpu_id); 
+           PrintDebug("delivering IRQ %d to core %u\n", vector, dst_core->cpu_id); 
 
            activate_apic_irq(dst_apic, vector);
 
@@ -568,7 +595,7 @@ static int deliver_ipi(struct guest_info * core,
                //     host maitains logical proc->phsysical proc
                PrintDebug(" non-local core, forcing it to exit\n"); 
 
-               v3_interrupt_cpu(core->vm_info, dst_core->cpu_id, 0);
+               v3_interrupt_cpu(dst_core->vm_info, dst_core->cpu_id, 0);
            }
 
            break;
@@ -579,9 +606,9 @@ 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);
+                          dst_core->cpu_id, dst_apic->ipi_state);
                // Only a warning, since INIT INIT SIPI is common
                break;
            }
@@ -604,7 +631,7 @@ static int deliver_ipi(struct guest_info * core,
            // Sanity check
            if (dst_apic->ipi_state != SIPI) { 
                PrintError(" core %u is not in SIPI state (mode = %d), ignored!\n",
-                          dst_core->cpu_id, dst_core->cpu_mode);
+                          dst_core->cpu_id, dst_apic->ipi_state);
                break;
            }
 
@@ -624,7 +651,7 @@ static int deliver_ipi(struct guest_info * core,
            dst_core->segments.cs.base = vector << 12;
 
            PrintDebug(" SIPI delivery (0x%x -> 0x%x:0x0) to core %u\n",
-                      vec, dst_core->segments.cs.selector, dst_core->cpu_id);
+                      vector, dst_core->segments.cs.selector, dst_core->cpu_id);
            // Maybe need to adjust the APIC?
            
            // We transition the target core to SIPI state
@@ -651,25 +678,17 @@ 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("icc_bus: icc_bus=%p, src_apic=%u, icr_data=%llx, extirq=%u\n", 
-              icc_bus, src_apic, icr_data, extirq);
-
-
-    // initial sanity checks
-    if (src_apic == NULL) { 
-       PrintError("icc_bus: Apparently sending from unregistered apic id=%d\n", 
-                  src_apic->core->cpu_id);
-       return -1;
-    }
+    PrintDebug("route_ipi: src_apic=%p, icr_data=%p\n", 
+              src_apic, (void *)(addr_t)icr->val);
 
 
     if ((icr->dst_mode == 0) && (icr->dst >= apic_dev->num_apics)) { 
-       PrintError("icc_bus: Attempted send to unregistered apic id=%u\n", 
+       PrintError("route_ipi: Attempted send to unregistered apic id=%u\n", 
                   icr->dst);
        return -1;
     }
@@ -677,17 +696,14 @@ static int route_ipi(struct guest_info * core, struct apic_dev_state * apic_dev,
     dest_apic =  &(apic_dev->apics[icr->dst]);
 
 
-    PrintDebug("icc_bus: IPI %s %u from %s %u to %s %s %u (icr=0x%llx, extirq=%u)\n",
+    PrintDebug("route_ipi: IPI %s %u from apic %p to %s %s %u (icr=0x%llx)\n",
               deliverymode_str[icr->del_mode], 
               icr->vec, 
-              (src_apic == state->ioapic_id) ? "ioapic" : "apic",
               src_apic,               
               (icr->dst_mode == 0) ? "(physical)" : "(logical)", 
               shorthand_str[icr->dst_shorthand], 
               icr->dst,
-              icr->val,
-              extirq);
-
+              icr->val);
 
     switch (icr->dst_shorthand) {
 
@@ -695,7 +711,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;
@@ -714,7 +730,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;
@@ -727,14 +743,19 @@ 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;
                }
            } else {
                // logical delivery
-               PrintError("icc_bus: use of logical delivery in self is not yet supported.\n");
+               PrintError("use of logical delivery in self is not yet supported.\n");
                return -1;
            }
            break;
@@ -749,7 +770,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;
                    }
@@ -1043,8 +1064,8 @@ static int apic_write(struct guest_info * core, addr_t guest_addr, void * src, u
     PrintDebug("apic %u: core %u: at %p and priv_data is at %p\n",
               apic->lapic_id.val, core->cpu_id, apic, priv_data);
 
-    PrintDebug("Write to address space (%p) (val=%x)\n", 
-              (void *)guest_addr, *(uint32_t *)src);
+    PrintDebug("apic %u: core %u: write to address space (%p) (val=%x)\n", 
+              apic->lapic_id.val, core->cpu_id, (void *)guest_addr, *(uint32_t *)src);
 
     if (msr->apic_enable == 0) {
        PrintError("apic %u: core %u: Write to APIC address space with disabled APIC, apic msr=0x%llx\n",
@@ -1203,7 +1224,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;
            }
@@ -1267,11 +1288,34 @@ 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;
+    
+
+    return route_ipi(apic_dev, NULL, &tmp_icr);
+}
+
+
 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);
     struct apic_state * apic = &(apic_dev->apics[dst]); 
 
+    PrintDebug("apic %u core ?: raising interrupt IRQ %u (dst = %u).\n", apic->lapic_id.val, irq, dst); 
+
     activate_apic_irq(apic, irq);
 
     if (V3_Get_CPU() != dst) {
@@ -1299,8 +1343,8 @@ static int apic_begin_irq(struct guest_info * core, void * private_data, int irq
        *req_location &= ~flag;
     } else {
        // do nothing... 
-       PrintDebug("apic %u: core %u: begin irq for %d ignored since I don't own it\n",
-                  apic->lapic_id.val, info->cpu_id, irq);
+       //PrintDebug("apic %u: core %u: begin irq for %d ignored since I don't own it\n",
+       //         apic->lapic_id.val, core->cpu_id, irq);
     }
 
     return 0;
@@ -1380,13 +1424,13 @@ static void apic_update_time(struct guest_info * core,
 
        // raise irq
        PrintDebug("apic %u: core %u: Raising APIC Timer interrupt (periodic=%d) (icnt=%d) (div=%d)\n",
-                  apic->lapic_id.val, info->cpu_id,
+                  apic->lapic_id.val, core->cpu_id,
                   apic->tmr_vec_tbl.tmr_mode, apic->tmr_init_cnt, shift_num);
 
        if (apic_intr_pending(core, priv_data)) {
            PrintDebug("apic %u: core %u: Overriding pending IRQ %d\n", 
-                      apic->lapic_id.val, info->cpu_id, 
-                      apic_get_intr_number(info, priv_data));
+                      apic->lapic_id.val, core->cpu_id, 
+                      apic_get_intr_number(core, priv_data));
        }
 
        if (activate_internal_irq(apic, APIC_TMR_INT) == -1) {