refactor(queue): remove mem parameter from add_used method

`mem` parameter was not used for anything

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

src/vmm/benches/queue.rs

@@ -146,7 +146,7 @@ pub fn queue_benchmark(c: &mut Criterion) {
             for i in 0_u16..1_u16 {
                 let index = std::hint::black_box(i);
                 let len = std::hint::black_box(i + 1);
-                _ = queue.add_used(&mem, index as u16, len as u32);
+                _ = queue.add_used(index as u16, len as u32);
             }
         })
     });
@@ -158,7 +158,7 @@ pub fn queue_benchmark(c: &mut Criterion) {
             for i in 0_u16..16_u16 {
                 let index = std::hint::black_box(i);
                 let len = std::hint::black_box(i + 1);
-                _ = queue.add_used(&mem, index as u16, len as u32);
+                _ = queue.add_used(index as u16, len as u32);
             }
         })
     });
@@ -170,7 +170,7 @@ pub fn queue_benchmark(c: &mut Criterion) {
             for i in 0_u16..256_u16 {
                 let index = std::hint::black_box(i);
                 let len = std::hint::black_box(i + 1);
-                _ = queue.add_used(&mem, index as u16, len as u32);
+                _ = queue.add_used(index as u16, len as u32);
             }
         })
     });

src/vmm/src/devices/virtio/balloon/device.rs

@@ -339,9 +339,7 @@ impl Balloon {
 
                 // Acknowledge the receipt of the descriptor.
                 // 0 is number of bytes the device has written to memory.
-                queue
-                    .add_used(mem, head.index, 0)
-                    .map_err(BalloonError::Queue)?;
+                queue.add_used(head.index, 0).map_err(BalloonError::Queue)?;
                 needs_interrupt = true;
             }
 
@@ -380,9 +378,7 @@ impl Balloon {
         let mut needs_interrupt = false;
 
         while let Some(head) = queue.pop(mem) {
-            queue
-                .add_used(mem, head.index, 0)
-                .map_err(BalloonError::Queue)?;
+            queue.add_used(head.index, 0).map_err(BalloonError::Queue)?;
             needs_interrupt = true;
         }
 
@@ -404,7 +400,7 @@ impl Balloon {
                 // the protocol, but return it if we find one.
                 error!("balloon: driver is not compliant, more than one stats buffer received");
                 self.queues[STATS_INDEX]
-                    .add_used(mem, prev_stats_desc, 0)
+                    .add_used(prev_stats_desc, 0)
                     .map_err(BalloonError::Queue)?;
             }
             for index in (0..head.len).step_by(SIZE_OF_STAT) {
@@ -450,14 +446,11 @@ impl Balloon {
     }
 
     fn trigger_stats_update(&mut self) -> Result<(), BalloonError> {
-        // This is safe since we checked in the event handler that the device is activated.
-        let mem = self.device_state.mem().unwrap();
-
         // The communication is driven by the device by using the buffer
         // and sending a used buffer notification
         if let Some(index) = self.stats_desc_index.take() {
             self.queues[STATS_INDEX]
-                .add_used(mem, index, 0)
+                .add_used(index, 0)
                 .map_err(BalloonError::Queue)?;
             self.signal_used_queue()
         } else {

src/vmm/src/devices/virtio/block/virtio/device.rs

@@ -392,7 +392,7 @@ impl VirtioBlock {
         irq_trigger: &IrqTrigger,
         block_metrics: &BlockDeviceMetrics,
     ) {
-        queue.add_used(mem, index, len).unwrap_or_else(|err| {
+        queue.add_used(index, len).unwrap_or_else(|err| {
             error!("Failed to add available descriptor head {}: {}", index, err)
         });
 

src/vmm/src/devices/virtio/net/device.rs

@@ -409,7 +409,7 @@ impl Net {
             // Safe to unwrap because a frame must be smaller than 2^16 bytes.
             u32::try_from(self.rx_bytes_read).unwrap()
         };
-        queue.add_used(mem, head_index, used_len).map_err(|err| {
+        queue.add_used(head_index, used_len).map_err(|err| {
             error!("Failed to add available descriptor {}: {}", head_index, err);
             FrontendError::AddUsed
         })?;
@@ -606,7 +606,7 @@ impl Net {
             if unsafe { self.tx_buffer.load_descriptor_chain(head).is_err() } {
                 self.metrics.tx_fails.inc();
                 tx_queue
-                    .add_used(mem, head_index, 0)
+                    .add_used(head_index, 0)
                     .map_err(DeviceError::QueueError)?;
                 continue;
             };
@@ -616,7 +616,7 @@ impl Net {
                 error!("net: received too big frame from driver");
                 self.metrics.tx_malformed_frames.inc();
                 tx_queue
-                    .add_used(mem, head_index, 0)
+                    .add_used(head_index, 0)
                     .map_err(DeviceError::QueueError)?;
                 continue;
             }
@@ -646,7 +646,7 @@ impl Net {
             }
 
             tx_queue
-                .add_used(mem, head_index, 0)
+                .add_used(head_index, 0)
                 .map_err(DeviceError::QueueError)?;
             used_any = true;
         }

src/vmm/src/devices/virtio/queue.rs

@@ -621,14 +621,7 @@ impl Queue {
     }
 
     /// Puts an available descriptor head into the used ring for use by the guest.
-    pub fn add_used<M: GuestMemory>(
-        &mut self,
-        mem: &M,
-        desc_index: u16,
-        len: u32,
-    ) -> Result<(), QueueError> {
-        debug_assert!(self.is_valid(mem));
-
+    pub fn add_used(&mut self, desc_index: u16, len: u32) -> Result<(), QueueError> {
         if self.actual_size() <= desc_index {
             error!(
                 "attempted to add out of bounds descriptor to used ring: {}",
@@ -1528,13 +1521,13 @@ mod tests {
         // Valid queue addresses configuration
         {
             // index too large
-            match q.add_used(m, 16, 0x1000) {
+            match q.add_used(16, 0x1000) {
                 Err(DescIndexOutOfBounds(16)) => (),
                 _ => unreachable!(),
             }
 
             // should be ok
-            q.add_used(m, 1, 0x1000).unwrap();
+            q.add_used(1, 0x1000).unwrap();
             assert_eq!(vq.used.idx.get(), 1);
             let x = vq.used.ring[0].get();
             assert_eq!(x.id, 1);

src/vmm/src/devices/virtio/rng/device.rs

@@ -165,7 +165,7 @@ impl Entropy {
                 }
             };
 
-            match self.queues[RNG_QUEUE].add_used(mem, index, bytes) {
+            match self.queues[RNG_QUEUE].add_used(index, bytes) {
                 Ok(_) => {
                     used_any = true;
                     METRICS.entropy_bytes.add(bytes.into());

src/vmm/src/devices/virtio/vsock/device.rs

@@ -180,7 +180,7 @@ where
 
             have_used = true;
             self.queues[RXQ_INDEX]
-                .add_used(mem, index, used_len)
+                .add_used(index, used_len)
                 .unwrap_or_else(|err| {
                     error!("Failed to add available descriptor {}: {}", index, err)
                 });
@@ -206,7 +206,7 @@ where
                     error!("vsock: error reading TX packet: {:?}", err);
                     have_used = true;
                     self.queues[TXQ_INDEX]
-                        .add_used(mem, index, 0)
+                        .add_used(index, 0)
                         .unwrap_or_else(|err| {
                             error!("Failed to add available descriptor {}: {}", index, err);
                         });
@@ -221,7 +221,7 @@ where
 
             have_used = true;
             self.queues[TXQ_INDEX]
-                .add_used(mem, index, 0)
+                .add_used(index, 0)
                 .unwrap_or_else(|err| {
                     error!("Failed to add available descriptor {}: {}", index, err);
                 });
@@ -246,7 +246,7 @@ where
             .unwrap_or_else(|err| error!("Failed to write virtio vsock reset event: {:?}", err));
 
         self.queues[EVQ_INDEX]
-            .add_used(mem, head.index, head.len)
+            .add_used(head.index, head.len)
             .unwrap_or_else(|err| {
                 error!("Failed to add used descriptor {}: {}", head.index, err);
             });