fix: Move rate_limiter into module under vmm

Moved `rate_limiter` into module under `vmm`.

Signed-off-by: Jonathan Woollett-Light <jcawl@amazon.co.uk>

Author: Jonathan Woollett-Light

Cargo.lock

@@ -34,7 +34,6 @@ dumbo = { path = "../dumbo" }
 logger = { path = "../logger" }
 mmds = { path = "../mmds" }
 net_gen = { path = "../net_gen" }
-rate_limiter = { path = "../rate_limiter" }
 seccompiler = { path = "../seccompiler" }
 snapshot = { path = "../snapshot"}
 utils = { path = "../utils" }

src/rate_limiter/Cargo.toml

@@ -15,9 +15,7 @@ use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 
 use block_io::FileEngine;
-use log::{error, warn};
-use logger::{IncMetric, METRICS};
-use rate_limiter::{BucketUpdate, RateLimiter};
+use logger::{error, warn, IncMetric, METRICS};
 use serde::{Deserialize, Serialize};
 use utils::eventfd::EventFd;
 use utils::kernel_version::{min_kernel_version_for_io_uring, KernelVersion};
@@ -35,6 +33,7 @@ use super::{
     SECTOR_SIZE,
 };
 use crate::devices::virtio::{IrqTrigger, IrqType};
+use crate::rate_limiter::{BucketUpdate, RateLimiter};
 
 /// Configuration options for disk caching.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Deserialize, Serialize)]
@@ -639,7 +638,6 @@ mod tests {
     use std::time::Duration;
     use std::{thread, u32};
 
-    use rate_limiter::TokenType;
     use utils::skip_if_io_uring_unsupported;
     use utils::tempfile::TempFile;
     use utils::vm_memory::{Address, Bytes, GuestAddress};
@@ -653,6 +651,7 @@ mod tests {
     };
     use crate::devices::virtio::test_utils::{default_mem, VirtQueue};
     use crate::devices::virtio::{IO_URING_NUM_ENTRIES, VIRTQ_DESC_F_NEXT, VIRTQ_DESC_F_WRITE};
+    use crate::rate_limiter::TokenType;
 
     #[test]
     fn test_disk_backing_file_helper() {

src/vmm/Cargo.toml

@@ -6,9 +6,7 @@
 use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 
-use log::warn;
-use rate_limiter::persist::RateLimiterState;
-use rate_limiter::RateLimiter;
+use logger::warn;
 use snapshot::Persist;
 use utils::vm_memory::GuestMemoryMmap;
 use versionize::{VersionMap, Versionize, VersionizeError, VersionizeResult};
@@ -19,6 +17,8 @@ use super::*;
 use crate::devices::virtio::block::device::FileEngineType;
 use crate::devices::virtio::persist::VirtioDeviceState;
 use crate::devices::virtio::{DeviceState, TYPE_BLOCK};
+use crate::rate_limiter::persist::RateLimiterState;
+use crate::rate_limiter::RateLimiter;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Versionize)]
 // NOTICE: Any changes to this structure require a snapshot version bump.

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

@@ -7,9 +7,7 @@
 
 use std::convert::From;
 
-use log::error;
-use logger::{IncMetric, METRICS};
-use rate_limiter::{RateLimiter, TokenType};
+use logger::{error, IncMetric, METRICS};
 use utils::vm_memory::{ByteValued, Bytes, GuestAddress, GuestMemoryError, GuestMemoryMmap};
 pub use virtio_gen::virtio_blk::{
     VIRTIO_BLK_ID_BYTES, VIRTIO_BLK_S_IOERR, VIRTIO_BLK_S_OK, VIRTIO_BLK_S_UNSUPP,
@@ -20,6 +18,7 @@ use super::super::DescriptorChain;
 use super::{io as block_io, BlockError, SECTOR_SHIFT};
 use crate::devices::virtio::block::device::DiskProperties;
 use crate::devices::virtio::SECTOR_SIZE;
+use crate::rate_limiter::{RateLimiter, TokenType};
 
 #[derive(Debug, derive_more::From)]
 pub enum IoErr {

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

@@ -8,7 +8,6 @@ use std::thread;
 #[cfg(test)]
 use std::time::Duration;
 
-use rate_limiter::RateLimiter;
 use utils::kernel_version::{min_kernel_version_for_io_uring, KernelVersion};
 use utils::tempfile::TempFile;
 use utils::vm_memory::{Bytes, GuestAddress};
@@ -21,6 +20,7 @@ use crate::devices::virtio::test_utils::{VirtQueue, VirtqDesc};
 #[cfg(test)]
 use crate::devices::virtio::IrqType;
 use crate::devices::virtio::{Block, CacheType, Queue, RequestHeader};
+use crate::rate_limiter::RateLimiter;
 
 /// Create a default Block instance to be used in tests.
 pub fn default_block(file_engine_type: FileEngineType) -> Block {

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

@@ -18,7 +18,6 @@ use log::{error, warn};
 use logger::{IncMetric, METRICS};
 use mmds::data_store::Mmds;
 use mmds::ns::MmdsNetworkStack;
-use rate_limiter::{BucketUpdate, RateLimiter, TokenType};
 use utils::eventfd::EventFd;
 use utils::net::mac::MacAddr;
 use utils::vm_memory::{ByteValued, Bytes, GuestMemoryError, GuestMemoryMmap};
@@ -29,6 +28,8 @@ use virtio_gen::virtio_net::{
 };
 use virtio_gen::virtio_ring::VIRTIO_RING_F_EVENT_IDX;
 
+use crate::rate_limiter::{BucketUpdate, RateLimiter, TokenType};
+
 const FRAME_HEADER_MAX_LEN: usize = PAYLOAD_OFFSET + ETH_IPV4_FRAME_LEN;
 
 use crate::devices::virtio::iovec::IoVecBuffer;
@@ -841,7 +842,6 @@ pub mod tests {
     use dumbo::pdu::arp::{EthIPv4ArpFrame, ETH_IPV4_FRAME_LEN};
     use dumbo::pdu::ethernet::ETHERTYPE_ARP;
     use logger::{IncMetric, METRICS};
-    use rate_limiter::{RateLimiter, TokenBucket, TokenType};
     use utils::net::mac::MAC_ADDR_LEN;
     use utils::vm_memory::{Address, GuestMemory};
     use virtio_gen::virtio_net::{
@@ -864,6 +864,7 @@ pub mod tests {
     use crate::devices::virtio::{
         Net, VirtioDevice, MAX_BUFFER_SIZE, RX_INDEX, TX_INDEX, TYPE_NET, VIRTQ_DESC_F_WRITE,
     };
+    use crate::rate_limiter::{RateLimiter, TokenBucket, TokenType};
 
     impl Net {
         pub(crate) fn read_tap(&mut self) -> io::Result<usize> {

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

@@ -11,8 +11,6 @@ use log::warn;
 use mmds::data_store::Mmds;
 use mmds::ns::MmdsNetworkStack;
 use mmds::persist::MmdsNetworkStackState;
-use rate_limiter::persist::RateLimiterState;
-use rate_limiter::RateLimiter;
 use snapshot::Persist;
 use utils::net::mac::{MacAddr, MAC_ADDR_LEN};
 use utils::vm_memory::GuestMemoryMmap;
@@ -23,6 +21,8 @@ use super::device::Net;
 use super::{NET_NUM_QUEUES, NET_QUEUE_SIZE};
 use crate::devices::virtio::persist::{PersistError as VirtioStateError, VirtioDeviceState};
 use crate::devices::virtio::{DeviceState, TYPE_NET};
+use crate::rate_limiter::persist::RateLimiterState;
+use crate::rate_limiter::RateLimiter;
 
 #[derive(Debug, Default, Clone, Versionize)]
 // NOTICE: Any changes to this structure require a snapshot version bump.

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

@@ -15,7 +15,6 @@ use std::sync::{Arc, Mutex};
 
 use mmds::data_store::Mmds;
 use mmds::ns::MmdsNetworkStack;
-use rate_limiter::RateLimiter;
 use utils::net::mac::MacAddr;
 use utils::vm_memory::{GuestAddress, GuestMemoryMmap};
 
@@ -25,6 +24,7 @@ use crate::devices::virtio::net::tap::{IfReqBuilder, Tap};
 use crate::devices::virtio::test_utils::VirtQueue;
 use crate::devices::virtio::{Net, Queue, QueueError};
 use crate::devices::DeviceError;
+use crate::rate_limiter::RateLimiter;
 
 static NEXT_INDEX: AtomicUsize = AtomicUsize::new(1);