feat: support virtio-vsock-mmio

.github/workflows/ci.yml

@@ -269,7 +269,11 @@ jobs:
       - run: cargo clean
         working-directory: .
       - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package vsock qemu ${{ matrix.qemu_flags }} --sudo --devices virtio-vsock-pci
-        if: matrix.arch != 'riscv64' && matrix.arch != 'aarch64_be'
+        if: matrix.arch != 'riscv64'
+      - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package vsock --no-default-features --features hermit/virtio-vsock qemu ${{ matrix.qemu_flags }} --sudo --devices virtio-vsock-mmio --microvm
+        if: matrix.arch == 'x86_64'
+      - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package vsock --no-default-features --features hermit/virtio-vsock qemu ${{ matrix.qemu_flags }} --sudo --devices virtio-vsock-mmio
+        if: matrix.arch != 'x86_64'
       - run: cargo xtask ci rs --arch ${{ matrix.arch }} --profile ${{ matrix.profile }} ${{ matrix.rs_flags }} --package httpd --features ci,hermit/dhcpv4,hermit/virtio-net qemu ${{ matrix.qemu_flags }} --devices virtio-net-pci
         if: matrix.arch != 'riscv64'
       # FIXME: this is broken on QEMU 8.2.2

Cargo.toml

@@ -189,7 +189,7 @@ virtio-console = ["virtio"]
 virtio-fs = ["virtio", "dep:fuse-abi", "fuse-abi/num_enum"]
 
 ## Enables the virtio-vsock driver.
-virtio-vsock = ["virtio", "pci"]
+virtio-vsock = ["virtio"]
 
 #! ### Other Drivers
 

src/arch/aarch64/kernel/mmio.rs

@@ -3,7 +3,11 @@ use core::ptr::NonNull;
 
 use align_address::Align;
 use arm_gic::{IntId, Trigger};
-#[cfg(any(feature = "virtio-console", feature = "virtio-fs"))]
+#[cfg(any(
+	feature = "virtio-console",
+	feature = "virtio-fs",
+	feature = "virtio-vsock",
+))]
 use hermit_sync::InterruptTicketMutex;
 use hermit_sync::without_interrupts;
 use virtio::mmio::{DeviceRegisters, DeviceRegistersVolatileFieldAccess};
@@ -26,8 +30,11 @@ use crate::drivers::virtio::transport::mmio as mmio_virtio;
 	feature = "virtio-console",
 	feature = "virtio-fs",
 	feature = "virtio-net",
+	feature = "virtio-vsock",
 ))]
 use crate::drivers::virtio::transport::mmio::VirtioDriver;
+#[cfg(feature = "virtio-vsock")]
+use crate::drivers::vsock::VirtioVsockDriver;
 #[cfg(feature = "virtio-net")]
 use crate::executor::device::NETWORK_DEVICE;
 use crate::init_cell::InitCell;
@@ -40,6 +47,8 @@ pub(crate) enum MmioDriver {
 	VirtioConsole(InterruptTicketMutex<VirtioConsoleDriver>),
 	#[cfg(feature = "virtio-fs")]
 	VirtioFs(InterruptTicketMutex<VirtioFsDriver>),
+	#[cfg(feature = "virtio-vsock")]
+	VirtioVsock(InterruptTicketMutex<VirtioVsockDriver>),
 }
 
 impl MmioDriver {
@@ -56,9 +65,16 @@ impl MmioDriver {
 			Self::VirtioFs(drv) => Some(drv),
 		}
 	}
+
+	#[cfg(feature = "virtio-vsock")]
+	fn get_vsock_driver(&self) -> Option<&InterruptTicketMutex<VirtioVsockDriver>> {
+		match self {
+			Self::VirtioVsock(drv) => Some(drv),
+		}
+	}
 }
 
-#[cfg(any(feature = "virtio-console", feature = "virtio-fs"))]
+#[cfg(any(feature = "virtio-console", feature = "virtio-fs", feature = "virtio-vsock"))]
 pub(crate) fn register_driver(drv: MmioDriver) {
 	MMIO_DRIVERS.with(|mmio_drivers| mmio_drivers.unwrap().push(drv));
 }
@@ -82,6 +98,14 @@ pub(crate) fn get_filesystem_driver() -> Option<&'static InterruptTicketMutex<Vi
 		.find_map(|drv| drv.get_filesystem_driver())
 }
 
+#[cfg(feature = "virtio-vsock")]
+pub(crate) fn get_vsock_driver() -> Option<&'static InterruptTicketMutex<VirtioVsockDriver>> {
+	MMIO_DRIVERS
+		.get()?
+		.iter()
+		.find_map(|drv| drv.get_vsock_driver())
+}
+
 pub fn init_drivers() {
 	without_interrupts(|| {
 		let Some(fdt) = crate::env::fdt() else {
@@ -199,6 +223,10 @@ pub fn init_drivers() {
 						)),
 						#[cfg(feature = "virtio-net")]
 						VirtioDriver::Net(drv) => *NETWORK_DEVICE.lock() = Some(*drv),
+						#[cfg(feature = "virtio-vsock")]
+						VirtioDriver::Vsock(drv) => register_driver(MmioDriver::VirtioVsock(
+							hermit_sync::InterruptTicketMutex::new(*drv),
+						)),
 					}
 				}
 			}

src/arch/riscv64/kernel/devicetree.rs

@@ -11,7 +11,11 @@ use volatile::VolatileRef;
 
 use crate::arch::riscv64::kernel::interrupts::init_plic;
 #[cfg(all(
-	any(feature = "virtio-console", feature = "virtio-fs"),
+	any(
+		feature = "virtio-console",
+		feature = "virtio-fs",
+		feature = "virtio-vsock",
+	),
 	not(feature = "pci"),
 ))]
 use crate::arch::riscv64::kernel::mmio::MmioDriver;
@@ -33,6 +37,7 @@ use crate::drivers::virtio::transport::mmio as mmio_virtio;
 		feature = "virtio-console",
 		feature = "virtio-fs",
 		feature = "virtio-net",
+		feature = "virtio-vsock",
 	),
 	not(feature = "pci"),
 ))]
@@ -41,7 +46,11 @@ use crate::env;
 #[cfg(all(any(feature = "gem-net", feature = "virtio-net"), not(feature = "pci")))]
 use crate::executor::device::NETWORK_DEVICE;
 #[cfg(all(
-	any(feature = "virtio-console", feature = "virtio-fs"),
+	any(
+		feature = "virtio-console",
+		feature = "virtio-fs",
+		feature = "virtio-vsock",
+	),
 	not(feature = "pci")
 ))]
 use crate::kernel::mmio::register_driver;
@@ -260,6 +269,12 @@ pub fn init_drivers() {
 					Ok(VirtioDriver::Net(drv)) => {
 						*NETWORK_DEVICE.lock() = Some(*drv);
 					}
+					#[cfg(feature = "virtio-vsock")]
+					Ok(VirtioDriver::Vsock(drv)) => {
+						register_driver(MmioDriver::VirtioVsock(
+							hermit_sync::InterruptSpinMutex::new(*drv),
+						));
+					}
 					Err(err) => error!("Could not initialize virtio-mmio device: {err}"),
 				}
 			}

src/arch/riscv64/kernel/mmio.rs

@@ -1,6 +1,10 @@
 use alloc::vec::Vec;
 
-#[cfg(any(feature = "virtio-console", feature = "virtio-fs"))]
+#[cfg(any(
+	feature = "virtio-console",
+	feature = "virtio-fs",
+	feature = "virtio-vsock",
+))]
 use hermit_sync::InterruptSpinMutex;
 
 #[cfg(feature = "virtio-console")]
@@ -11,6 +15,8 @@ use crate::drivers::fs::VirtioFsDriver;
 use crate::drivers::net::gem::GEMDriver;
 #[cfg(all(not(feature = "gem-net"), feature = "virtio-net"))]
 use crate::drivers::net::virtio::VirtioNetDriver;
+#[cfg(feature = "virtio-vsock")]
+use crate::drivers::vsock::VirtioVsockDriver;
 use crate::init_cell::InitCell;
 
 pub(crate) static MMIO_DRIVERS: InitCell<Vec<MmioDriver>> = InitCell::new(Vec::new());
@@ -20,6 +26,8 @@ pub(crate) enum MmioDriver {
 	VirtioConsole(InterruptSpinMutex<VirtioConsoleDriver>),
 	#[cfg(feature = "virtio-fs")]
 	VirtioFs(InterruptSpinMutex<VirtioFsDriver>),
+	#[cfg(feature = "virtio-vsock")]
+	VirtioVsock(InterruptSpinMutex<VirtioVsockDriver>),
 }
 
 impl MmioDriver {
@@ -36,9 +44,20 @@ impl MmioDriver {
 			Self::VirtioFs(drv) => Some(drv),
 		}
 	}
+
+	#[cfg(feature = "virtio-vsock")]
+	fn get_vsock_driver(&self) -> Option<&InterruptSpinMutex<VirtioVsockDriver>> {
+		match self {
+			Self::VirtioVsock(drv) => Some(drv),
+		}
+	}
 }
 
-#[cfg(any(feature = "virtio-console", feature = "virtio-fs"))]
+#[cfg(any(
+	feature = "virtio-console",
+	feature = "virtio-fs",
+	feature = "virtio-vsock",
+))]
 pub(crate) fn register_driver(drv: MmioDriver) {
 	MMIO_DRIVERS.with(|mmio_drivers| mmio_drivers.unwrap().push(drv));
 }
@@ -64,3 +83,11 @@ pub(crate) fn get_filesystem_driver() -> Option<&'static InterruptSpinMutex<Virt
 		.iter()
 		.find_map(|drv| drv.get_filesystem_driver())
 }
+
+#[cfg(feature = "virtio-vsock")]
+pub(crate) fn get_vsock_driver() -> Option<&'static InterruptSpinMutex<VirtioVsockDriver>> {
+	MMIO_DRIVERS
+		.get()?
+		.iter()
+		.find_map(|drv| drv.get_vsock_driver())
+}

src/arch/x86_64/kernel/mmio.rs

@@ -5,7 +5,11 @@ use core::{ptr, str};
 
 use align_address::Align;
 use free_list::{PageLayout, PageRange};
-#[cfg(any(feature = "virtio-console", feature = "virtio-fs"))]
+#[cfg(any(
+	feature = "virtio-console",
+	feature = "virtio-fs",
+	feature = "virtio-vsock",
+))]
 use hermit_sync::InterruptTicketMutex;
 use hermit_sync::without_interrupts;
 use memory_addresses::{PhysAddr, VirtAddr};
@@ -26,9 +30,12 @@ use crate::drivers::virtio::transport::mmio as mmio_virtio;
 #[cfg(any(
 	feature = "virtio-console",
 	feature = "virtio-fs",
-	feature = "virtio-net"
+	feature = "virtio-net",
+	feature = "virtio-vsock",
 ))]
 use crate::drivers::virtio::transport::mmio::VirtioDriver;
+#[cfg(feature = "virtio-vsock")]
+use crate::drivers::vsock::VirtioVsockDriver;
 use crate::env;
 #[cfg(any(feature = "rtl8139", feature = "virtio-net"))]
 use crate::executor::device::NETWORK_DEVICE;
@@ -48,6 +55,8 @@ pub(crate) enum MmioDriver {
 	VirtioConsole(InterruptTicketMutex<VirtioConsoleDriver>),
 	#[cfg(feature = "virtio-fs")]
 	VirtioFs(InterruptTicketMutex<VirtioFsDriver>),
+	#[cfg(feature = "virtio-vsock")]
+	VirtioVsock(InterruptTicketMutex<VirtioVsockDriver>),
 }
 
 impl MmioDriver {
@@ -64,6 +73,13 @@ impl MmioDriver {
 			Self::VirtioFs(drv) => Some(drv),
 		}
 	}
+
+	#[cfg(feature = "virtio-vsock")]
+	fn get_vsock_driver(&self) -> Option<&InterruptTicketMutex<VirtioVsockDriver>> {
+		match self {
+			Self::VirtioVsock(drv) => Some(drv),
+		}
+	}
 }
 
 unsafe fn check_ptr(ptr: *mut u8) -> Option<VolatileRef<'static, DeviceRegisters>> {
@@ -210,7 +226,11 @@ fn detect_devices() -> Vec<(VolatileRef<'static, DeviceRegisters>, u8)> {
 	}
 }
 
-#[cfg(any(feature = "virtio-console", feature = "virtio-fs"))]
+#[cfg(any(
+	feature = "virtio-console",
+	feature = "virtio-fs",
+	feature = "virtio-vsock",
+))]
 pub(crate) fn register_driver(drv: MmioDriver) {
 	MMIO_DRIVERS.with(|mmio_drivers| mmio_drivers.unwrap().push(drv));
 }
@@ -234,6 +254,14 @@ pub(crate) fn get_filesystem_driver() -> Option<&'static InterruptTicketMutex<Vi
 		.find_map(|drv| drv.get_filesystem_driver())
 }
 
+#[cfg(feature = "virtio-vsock")]
+pub(crate) fn get_vsock_driver() -> Option<&'static InterruptTicketMutex<VirtioVsockDriver>> {
+	MMIO_DRIVERS
+		.get()?
+		.iter()
+		.find_map(|drv| drv.get_vsock_driver())
+}
+
 pub(crate) fn init_drivers() {
 	without_interrupts(|| {
 		let devices = detect_devices();
@@ -252,6 +280,10 @@ pub(crate) fn init_drivers() {
 				Ok(VirtioDriver::Net(drv)) => {
 					*NETWORK_DEVICE.lock() = Some(*drv);
 				}
+				#[cfg(feature = "virtio-vsock")]
+				Ok(VirtioDriver::Vsock(drv)) => {
+					register_driver(MmioDriver::VirtioVsock(InterruptTicketMutex::new(*drv)));
+				}
 				Err(err) => error!("Could not initialize virtio-mmio device: {err}"),
 			}
 		}

src/drivers/mmio.rs

@@ -5,11 +5,14 @@ use hashbrown::HashMap;
 pub(crate) use crate::arch::kernel::mmio::get_console_driver;
 #[cfg(feature = "virtio-fs")]
 pub(crate) use crate::arch::kernel::mmio::get_filesystem_driver;
+#[cfg(feature = "virtio-vsock")]
+pub(crate) use crate::arch::kernel::mmio::get_vsock_driver;
 #[cfg(any(
 	feature = "virtio-console",
 	all(target_arch = "riscv64", feature = "gem-net", not(feature = "pci")),
 	feature = "virtio-net",
 	feature = "virtio-fs",
+	feature = "virtio-vsock",
 ))]
 use crate::drivers::Driver;
 use crate::drivers::{InterruptHandlerQueue, InterruptLine};
@@ -71,5 +74,22 @@ pub(crate) fn get_interrupt_handlers() -> HashMap<InterruptLine, InterruptHandle
 			.push_back(virtio_fs_handler);
 	}
 
+	#[cfg(feature = "virtio-vsock")]
+	if let Some(drv) = get_vsock_driver() {
+		fn vsock_handler() {
+			let Some(driver) = get_vsock_driver() else {
+				return;
+			};
+
+			driver.lock().handle_interrupt();
+		}
+
+		let irq_number = drv.lock().get_interrupt_number();
+		handlers
+			.entry(irq_number)
+			.or_default()
+			.push_back(vsock_handler);
+	}
+
 	handlers
 }

src/drivers/virtio/transport/mmio.rs

@@ -26,6 +26,8 @@ use crate::drivers::fs::VirtioFsDriver;
 use crate::drivers::net::virtio::VirtioNetDriver;
 use crate::drivers::virtio::error::VirtioError;
 use crate::drivers::virtio::{ControlRegisters, VirtioIdExt};
+#[cfg(feature = "virtio-vsock")]
+use crate::drivers::vsock::VirtioVsockDriver;
 
 pub struct VqCfgHandler<'a> {
 	vq_index: u16,
@@ -317,6 +319,8 @@ pub(crate) enum VirtioDriver {
 	Fs(alloc::boxed::Box<VirtioFsDriver>),
 	#[cfg(feature = "virtio-net")]
 	Net(alloc::boxed::Box<VirtioNetDriver>),
+	#[cfg(feature = "virtio-vsock")]
+	Vsock(alloc::boxed::Box<VirtioVsockDriver>),
 }
 
 #[allow(unused_variables)]
@@ -385,13 +389,13 @@ pub(crate) fn init_device(
 		},
 		#[cfg(feature = "virtio-vsock")]
 		virtio::Id::Vsock => match VirtioVsockDriver::init(dev_id, registers, irq_no) {
-			Ok(virt_net_drv) => {
+			Ok(virt_vsock_drv) => {
 				info!("Virtio sock driver initialized.");
 
 				crate::arch::interrupts::add_irq_name(irq_no, "virtio");
 				info!("Virtio interrupt handler at line {irq_no}");
 
-				Ok(VirtioDriver::Vsock(virt_vsock_drv))
+				Ok(VirtioDriver::Vsock(alloc::boxed::Box::new(virt_vsock_drv)))
 			}
 			Err(virtio_error) => {
 				error!("Virtio sock driver could not be initialized with device");