fix(virtio-net): Only initialize virtqueues after feature negotiation

This refactors the initialization sequence using type state.

Signed-off-by: Jens Reidel <[email protected]>

Author: Gelbpunkt

src/arch/x86_64/kernel/mmio.rs

@@ -13,7 +13,7 @@ use crate::arch::x86_64::mm::paging;
 use crate::arch::x86_64::mm::paging::{
 	BasePageSize, PageSize, PageTableEntryFlags, PageTableEntryFlagsExt,
 };
-use crate::drivers::net::virtio::VirtioNetDriver;
+use crate::drivers::net::virtio::{Init, VirtioNetDriver};
 use crate::drivers::virtio::transport::mmio as mmio_virtio;
 use crate::drivers::virtio::transport::mmio::VirtioDriver;
 use crate::env;
@@ -28,12 +28,12 @@ const IRQ_NUMBER: u8 = 44 - 32;
 static MMIO_DRIVERS: InitCell<Vec<MmioDriver>> = InitCell::new(Vec::new());
 
 pub(crate) enum MmioDriver {
-	VirtioNet(InterruptTicketMutex<VirtioNetDriver>),
+	VirtioNet(InterruptTicketMutex<VirtioNetDriver<Init>>),
 }
 
 impl MmioDriver {
 	#[allow(unreachable_patterns)]
-	fn get_network_driver(&self) -> Option<&InterruptTicketMutex<VirtioNetDriver>> {
+	fn get_network_driver(&self) -> Option<&InterruptTicketMutex<VirtioNetDriver<Init>>> {
 		match self {
 			Self::VirtioNet(drv) => Some(drv),
 			_ => None,
@@ -186,7 +186,7 @@ pub(crate) fn register_driver(drv: MmioDriver) {
 	MMIO_DRIVERS.with(|mmio_drivers| mmio_drivers.unwrap().push(drv));
 }
 
-pub(crate) fn get_network_driver() -> Option<&'static InterruptTicketMutex<VirtioNetDriver>> {
+pub(crate) fn get_network_driver() -> Option<&'static InterruptTicketMutex<VirtioNetDriver<Init>>> {
 	MMIO_DRIVERS
 		.get()?
 		.iter()

src/drivers/net/virtio/mmio.rs

@@ -2,22 +2,19 @@
 //!
 //! The module contains ...
 
-use alloc::boxed::Box;
-use alloc::vec::Vec;
 use core::str::FromStr;
 
 use smoltcp::phy::ChecksumCapabilities;
 use virtio::mmio::{DeviceRegisters, DeviceRegistersVolatileFieldAccess};
 use volatile::VolatileRef;
 
 use crate::drivers::InterruptLine;
-use crate::drivers::net::virtio::{CtrlQueue, NetDevCfg, RxQueues, TxQueues, VirtioNetDriver};
+use crate::drivers::net::virtio::{Init, NetDevCfg, Uninit, VirtioNetDriver};
 use crate::drivers::virtio::error::{VirtioError, VirtioNetError};
 use crate::drivers::virtio::transport::mmio::{ComCfg, IsrStatus, NotifCfg};
-use crate::drivers::virtio::virtqueue::Virtq;
 
 // Backend-dependent interface for Virtio network driver
-impl VirtioNetDriver {
+impl VirtioNetDriver<Uninit> {
 	pub fn new(
 		dev_id: u16,
 		mut registers: VolatileRef<'static, DeviceRegisters>,
@@ -48,30 +45,19 @@ impl VirtioNetDriver {
 			1514
 		};
 
-		let send_vqs = TxQueues::new(Vec::<Box<dyn Virtq>>::new(), &dev_cfg);
-		let recv_vqs = RxQueues::new(Vec::<Box<dyn Virtq>>::new(), &dev_cfg);
 		Ok(VirtioNetDriver {
 			dev_cfg,
 			com_cfg: ComCfg::new(registers, 1),
 			isr_stat,
 			notif_cfg,
-			ctrl_vq: CtrlQueue::new(None),
-			recv_vqs,
-			send_vqs,
+			inner: Uninit,
 			num_vqs: 0,
 			mtu,
 			irq,
 			checksums: ChecksumCapabilities::default(),
 		})
 	}
 
-	pub fn print_information(&mut self) {
-		self.com_cfg.print_information();
-		if self.dev_status() == virtio::net::S::LINK_UP {
-			info!("The link of the network device is up!");
-		}
-	}
-
 	/// Initializes virtio network device by mapping configuration layout to
 	/// respective structs (configuration structs are:
 	///
@@ -81,13 +67,13 @@ impl VirtioNetDriver {
 		dev_id: u16,
 		registers: VolatileRef<'static, DeviceRegisters>,
 		irq: InterruptLine,
-	) -> Result<VirtioNetDriver, VirtioError> {
-		if let Ok(mut drv) = VirtioNetDriver::new(dev_id, registers, irq) {
+	) -> Result<VirtioNetDriver<Init>, VirtioError> {
+		if let Ok(drv) = VirtioNetDriver::new(dev_id, registers, irq) {
 			match drv.init_dev() {
 				Err(error_code) => Err(VirtioError::NetDriver(error_code)),
-				_ => {
-					drv.print_information();
-					Ok(drv)
+				Ok(mut initialized_drv) => {
+					initialized_drv.print_information();
+					Ok(initialized_drv)
 				}
 			}
 		} else {
@@ -96,3 +82,12 @@ impl VirtioNetDriver {
 		}
 	}
 }
+
+impl VirtioNetDriver<Init> {
+	pub fn print_information(&mut self) {
+		self.com_cfg.print_information();
+		if self.dev_status() == virtio::net::S::LINK_UP {
+			info!("The link of the network device is up!");
+		}
+	}
+}