Use GSI constants

Author: ALSchwalm

mythril/src/interrupt/mod.rs

@@ -1,8 +1,15 @@
 pub mod idt;
 
-pub const UART_VECTOR: u8 = 36;
-pub const TIMER_VECTOR: u8 = 48;
-pub const IPC_VECTOR: u8 = 49;
+pub mod vector {
+    pub const UART: u8 = 36;
+    pub const TIMER: u8 = 48;
+    pub const IPC: u8 = 49;
+}
+
+pub mod gsi {
+    pub const PIT: u32 = 0;
+    pub const UART: u32 = 4;
+}
 
 pub unsafe fn enable_interrupts() {
     llvm_asm!("sti" :::: "volatile");

mythril/src/kmain.rs

@@ -250,7 +250,7 @@ unsafe fn kmain(mut boot_info: BootInfo) -> ! {
         apic::LocalApic::init().expect("Failed to initialize local APIC");
 
     ioapic::init_ioapics(&madt).expect("Failed to initialize IOAPICs");
-    ioapic::map_gsi_vector(4, interrupt::UART_VECTOR, 0)
+    ioapic::map_gsi_vector(interrupt::gsi::UART, interrupt::vector::UART, 0)
         .expect("Failed to map com0 gsi");
 
     let mut builder = vm::VirtualMachineBuilder::new();

mythril/src/time.rs

@@ -333,7 +333,7 @@ impl TimerWheel {
         if let Some((when, _)) = soonest {
             unsafe {
                 apic::get_local_apic_mut()
-                    .schedule_interrupt(when, interrupt::TIMER_VECTOR);
+                    .schedule_interrupt(when, interrupt::vector::TIMER);
             }
         }
     }

mythril/src/vcpu.rs

@@ -626,10 +626,10 @@ impl VCpu {
             vmexit::ExitInformation::InterruptWindow => {}
             vmexit::ExitInformation::ExternalInterrupt(info) => unsafe {
                 match info.vector {
-                    interrupt::UART_VECTOR => {
+                    interrupt::vector::UART => {
                         self.handle_uart_keypress(&mut responses)?
                     }
-                    interrupt::IPC_VECTOR => {
+                    interrupt::vector::IPC => {
                         let msg =
                             vm::recv_msg().ok_or_else(|| Error::NotFound)?;
                         match msg {
@@ -698,8 +698,8 @@ impl VCpu {
 
                     //FIXME(alschwalm): this should be the APIC id of the bsp, not the core id
                     ioapic::map_gsi_vector(
-                        4,
-                        interrupt::UART_VECTOR,
+                        interrupt::gsi::UART,
+                        interrupt::vector::UART,
                         next_bsp.raw as u8,
                     )
                     .map_err(|_| {

mythril/src/virtdev/com.rs

@@ -1,6 +1,6 @@
 use crate::error::Result;
+use crate::interrupt;
 use crate::physdev::com::*;
-use crate::vcpu;
 use crate::virtdev::{
     DeviceEvent, DeviceEventResponse, DeviceRegion, EmulatedDevice, Event, Port,
 };
@@ -61,7 +61,9 @@ impl EmulatedDevice for Uart8250 {
     fn on_event(&mut self, event: Event) -> Result<()> {
         match event.kind {
             DeviceEvent::HostUartReceived(key) => {
-                event.responses.push(DeviceEventResponse::GSI(4));
+                event
+                    .responses
+                    .push(DeviceEventResponse::GSI(interrupt::gsi::UART));
                 if key == 0x01 {
                     // ctrl+a
                     self.ctrl_a_count += 1;
@@ -130,7 +132,9 @@ impl EmulatedDevice for Uart8250 {
                             .interrupt_enable_register
                             .contains(IerFlags::THR_EMPTY_INTERRUPT)
                         {
-                            event.responses.push(DeviceEventResponse::GSI(4));
+                            event.responses.push(DeviceEventResponse::GSI(
+                                interrupt::gsi::UART,
+                            ));
                         }
                         self.interrupt_identification_register = 0b10;
                     }

mythril/src/virtdev/pit.rs

@@ -1,4 +1,5 @@
 use crate::error::{Error, Result};
+use crate::interrupt;
 use crate::physdev::pit::*;
 use crate::time;
 use crate::virtdev::{
@@ -227,7 +228,9 @@ impl Pit8254 {
                         if port == PIT_COUNTER_0 {
                             *timer = Some(time::set_oneshot_timer(
                                 duration,
-                                time::TimerInterruptType::GSI(0),
+                                time::TimerInterruptType::GSI(
+                                    interrupt::gsi::PIT,
+                                ),
                             ));
                         }
                     }
@@ -243,7 +246,9 @@ impl Pit8254 {
                         if port == PIT_COUNTER_0 {
                             *timer = Some(time::set_periodic_timer(
                                 duration,
-                                time::TimerInterruptType::GSI(0),
+                                time::TimerInterruptType::GSI(
+                                    interrupt::gsi::PIT,
+                                ),
                             ));
                         }
                     }

mythril/src/vm.rs

@@ -178,7 +178,7 @@ impl VirtualMachines {
                 apic::Level::Assert,
                 apic::DstMode::Physical,
                 apic::DeliveryMode::Fixed,
-                interrupt::IPC_VECTOR,
+                interrupt::vector::IPC,
             );
         }
 
@@ -435,7 +435,7 @@ impl VirtualMachine {
         // guest IO APICs. For now just blindly translate GSI to vector based
         // on this basic formula.
         let vector = (gsi + 48) as u8;
-        if gsi == 4 {
+        if gsi == interrupt::gsi::UART {
             Ok((
                 self.config.bsp_id(),
                 vector,