Merge pull request #1345 from cagatay-y/is-multi

refactor(virtio-net): remove unused is_multi field
hermit-os · Aug 4, 2024 · b4832ed · b4832ed
2 parents b2d8af5 + 71e97e9
commit b4832ed
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 59 deletions.
diff --git a/src/drivers/net/virtio/mmio.rs b/src/drivers/net/virtio/mmio.rs
@@ -47,8 +47,8 @@ impl VirtioNetDriver {
 			1514
 		};
 
-		let send_vqs = TxQueues::new(Vec::<Box<dyn Virtq>>::new(), false, &dev_cfg);
-		let recv_vqs = RxQueues::new(Vec::<Box<dyn Virtq>>::new(), false, &dev_cfg);
+		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),

diff --git a/src/drivers/net/virtio/mod.rs b/src/drivers/net/virtio/mod.rs
@@ -61,12 +61,11 @@ pub struct RxQueues {
 	vqs: Vec<Box<dyn Virtq>>,
 	poll_sender: async_channel::Sender<UsedBufferToken>,
 	poll_receiver: async_channel::Receiver<UsedBufferToken>,
-	is_multi: bool,
 	packet_size: u32,
 }
 
 impl RxQueues {
-	pub fn new(vqs: Vec<Box<dyn Virtq>>, is_multi: bool, dev_cfg: &NetDevCfg) -> Self {
+	pub fn new(vqs: Vec<Box<dyn Virtq>>, dev_cfg: &NetDevCfg) -> Self {
 		let (poll_sender, poll_receiver) = async_channel::unbounded();
 
 		// See Virtio specification v1.1 - 5.1.6.3.1
@@ -81,7 +80,6 @@ impl RxQueues {
 			vqs,
 			poll_sender,
 			poll_receiver,
-			is_multi,
 			packet_size,
 		}
 	}
@@ -107,9 +105,6 @@ impl RxQueues {
 			self.poll_sender.clone(),
 		);
 		self.vqs.push(vq);
-		if self.vqs.len() > 1 {
-			self.is_multi = true;
-		}
 	}
 
 	fn get_next(&mut self) -> Option<UsedBufferToken> {
@@ -126,32 +121,20 @@ impl RxQueues {
 	}
 
 	fn poll(&mut self) {
-		if self.is_multi {
-			for vq in &mut self.vqs {
-				vq.poll();
-			}
-		} else {
-			self.vqs[0].poll();
+		for vq in &mut self.vqs {
+			vq.poll();
 		}
 	}
 
 	fn enable_notifs(&mut self) {
-		if self.is_multi {
-			for vq in &mut self.vqs {
-				vq.enable_notifs();
-			}
-		} else {
-			self.vqs[0].enable_notifs();
+		for vq in &mut self.vqs {
+			vq.enable_notifs();
 		}
 	}
 
 	fn disable_notifs(&mut self) {
-		if self.is_multi {
-			for vq in &mut self.vqs {
-				vq.disable_notifs();
-			}
-		} else {
-			self.vqs[0].disable_notifs();
+		for vq in &mut self.vqs {
+			vq.disable_notifs();
 		}
 	}
 
@@ -208,12 +191,11 @@ pub struct TxQueues {
 	vqs: Vec<Box<dyn Virtq>>,
 	/// Indicates, whether the Driver/Device are using multiple
 	/// queues for communication.
-	is_multi: bool,
 	packet_length: u32,
 }
 
 impl TxQueues {
-	pub fn new(vqs: Vec<Box<dyn Virtq>>, is_multi: bool, dev_cfg: &NetDevCfg) -> Self {
+	pub fn new(vqs: Vec<Box<dyn Virtq>>, dev_cfg: &NetDevCfg) -> Self {
 		let packet_length = if dev_cfg.features.contains(virtio::net::F::GUEST_TSO4)
 			| dev_cfg.features.contains(virtio::net::F::GUEST_TSO6)
 			| dev_cfg.features.contains(virtio::net::F::GUEST_UFO)
@@ -223,52 +205,32 @@ impl TxQueues {
 			dev_cfg.raw.as_ptr().mtu().read().to_ne().into()
 		};
 
-		Self {
-			vqs,
-			is_multi,
-			packet_length,
-		}
+		Self { vqs, packet_length }
 	}
 	#[allow(dead_code)]
 	fn enable_notifs(&mut self) {
-		if self.is_multi {
-			for vq in &mut self.vqs {
-				vq.enable_notifs();
-			}
-		} else {
-			self.vqs[0].enable_notifs();
+		for vq in &mut self.vqs {
+			vq.enable_notifs();
 		}
 	}
 
 	#[allow(dead_code)]
 	fn disable_notifs(&mut self) {
-		if self.is_multi {
-			for vq in &mut self.vqs {
-				vq.disable_notifs();
-			}
-		} else {
-			self.vqs[0].disable_notifs();
+		for vq in &mut self.vqs {
+			vq.disable_notifs();
 		}
 	}
 
 	fn poll(&mut self) {
-		if self.is_multi {
-			for vq in &mut self.vqs {
-				vq.poll();
-			}
-		} else {
-			self.vqs[0].poll();
+		for vq in &mut self.vqs {
+			vq.poll();
 		}
 	}
 
 	fn add(&mut self, vq: Box<dyn Virtq>) {
-		// Safe virtqueue
+		// Currently we are doing nothing with the additional queues. They are inactive and might be used in the
+		// future
 		self.vqs.push(vq);
-		if self.vqs.len() != 1 {
-			self.is_multi = true;
-			// Currently we are doing nothing with the additional queues. They are inactive and might be used in the
-			// future
-		}
 	}
 }
 

diff --git a/src/drivers/net/virtio/pci.rs b/src/drivers/net/virtio/pci.rs
@@ -86,8 +86,8 @@ impl VirtioNetDriver {
 			1514
 		};
 
-		let send_vqs = TxQueues::new(Vec::new(), false, &dev_cfg);
-		let recv_vqs = RxQueues::new(Vec::new(), false, &dev_cfg);
+		let send_vqs = TxQueues::new(Vec::new(), &dev_cfg);
+		let recv_vqs = RxQueues::new(Vec::new(), &dev_cfg);
 		Ok(VirtioNetDriver {
 			dev_cfg,
 			com_cfg,