X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fapic.c;h=d83f0bd2ebe539fddc4b0fa23a65746cb9d77675;hp=6b21f81ae48193d026c5cd0d96f9f7b1c03f098f;hb=f88a692d094459f0326c5c891df5ea81b5476ba6;hpb=357fde035281e8fac28241b2f8c32d12ee3d63fb

diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 6b21f81..d83f0bd 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -220,7 +220,7 @@ struct apic_state {
 
     uint32_t tmr_cur_cnt;
     uint32_t tmr_init_cnt;
-
+    uint32_t missed_ints;
 
     struct local_vec_tbl_reg ext_intr_vec_tbl[4];
 
@@ -295,6 +295,7 @@ static void init_apic_state(struct apic_state * apic, uint32_t id) {
     apic->rem_rd_data = 0x00000000;
     apic->tmr_init_cnt = 0x00000000;
     apic->tmr_cur_cnt = 0x00000000;
+    apic->missed_ints = 0;
 
     apic->lapic_id.val = id;
     
@@ -1562,10 +1563,33 @@ static int apic_begin_irq(struct guest_info * core, void * private_data, int irq
 }
 
 
+/* Timer Functions */
+
+static void apic_inject_timer_intr(struct guest_info *core,
+			           void * priv_data) {
+    struct apic_dev_state * apic_dev = (struct apic_dev_state *)(priv_data);
+    struct apic_state * apic = &(apic_dev->apics[core->vcpu_id]); 
+    // raise irq
+    PrintDebug("apic %u: core %u: Raising APIC Timer interrupt (periodic=%d) (icnt=%d) (div=%d)\n",
+	       apic->lapic_id.val, core->vcpu_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, core->vcpu_id, 
+	           apic_get_intr_number(core, priv_data));
+    }
 
+    if (activate_internal_irq(apic, APIC_TMR_INT) == -1) {
+	PrintError("apic %u: core %u: Could not raise Timer interrupt\n",
+		   apic->lapic_id.val, core->vcpu_id);
+    }
+
+    return;
+}
+	
 
 
-/* Timer Functions */
 
 static void apic_update_time(struct guest_info * core, 
 			     uint64_t cpu_cycles, uint64_t cpu_freq, 
@@ -1631,40 +1655,18 @@ static void apic_update_time(struct guest_info * core,
 
     if (tmr_ticks < apic->tmr_cur_cnt) {
 	apic->tmr_cur_cnt -= tmr_ticks;
+	if (apic->missed_ints) {
+	    apic_inject_timer_intr(core, priv_data);
+	    apic->missed_ints--;
+	}
     } else {
 	tmr_ticks -= apic->tmr_cur_cnt;
 	apic->tmr_cur_cnt = 0;
 
-	// raise irq
-	PrintDebug("apic %u: core %u: Raising APIC Timer interrupt (periodic=%d) (icnt=%d) (div=%d)\n",
-		   apic->lapic_id.val, core->vcpu_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, core->vcpu_id, 
-		       apic_get_intr_number(core, priv_data));
-	}
+	apic_inject_timer_intr(core, priv_data);
 
-	if (activate_internal_irq(apic, APIC_TMR_INT) == -1) {
-	    PrintError("apic %u: core %u: Could not raise Timer interrupt\n",
-		       apic->lapic_id.val, core->vcpu_id);
-	}
-    
 	if (apic->tmr_vec_tbl.tmr_mode == APIC_TMR_PERIODIC) {
-	    static unsigned int nexits = 0;
-	    static unsigned int missed_ints = 0;
-
-	    nexits++;
-	    missed_ints += tmr_ticks / apic->tmr_init_cnt;
-
-	    if ((missed_ints > 0) && (nexits >= 5000)) {
-	        V3_Print("apic %u: core %u: missed %u timer interrupts total in last %u exits.\n",
-		         apic->lapic_id.val, core->vcpu_id, missed_ints, nexits); 
-		missed_ints = 0;
-		nexits = 0;
-	    }
-
+	    apic->missed_ints += tmr_ticks / apic->tmr_init_cnt;
 	    tmr_ticks = tmr_ticks % apic->tmr_init_cnt;
 	    apic->tmr_cur_cnt = apic->tmr_init_cnt - tmr_ticks;
 	}
@@ -1673,7 +1675,6 @@ static void apic_update_time(struct guest_info * core,
     return;
 }
 
-
 static struct intr_ctrl_ops intr_ops = {
     .intr_pending = apic_intr_pending,
     .get_intr_number = apic_get_intr_number,