build: Update vm-memory to 0.18.0

The main change is that `GuestMemory` can now handle virtual memory,
which requires passing the needed access permissions.

The previous `GuestMemory` is now called `GuestMemoryBackend`, so we
need to use that in the kani verification code.

As for getting the memory’s bitmap type, we need to use
`GuestMemory::Bitmap` instead of going through the region type.

Finally, there is no longer a `GuestMemory::get_slice()` (only
`get_slices()`), but the previous commits have already prepared for
that.

Signed-off-by: Hanna Czenczek <hreitz@redhat.com>

Author: XanClic

Cargo.toml

@@ -15,5 +15,5 @@ lto = true
 codegen-units = 1
 
 [workspace.dependencies]
-vm-memory = "0.17.1"
+vm-memory = "0.18.0"
 vmm-sys-util = "0.15.0"

fuzz/Cargo.toml

@@ -20,7 +20,7 @@ memfd = "0.6.3"
 virtio-queue = { path = "../virtio-queue", features = ["test-utils"] }
 virtio-vsock = { path = "../virtio-vsock" }
 virtio-queue-ser = { path = "../virtio-queue-ser" }
-vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
+vm-memory = { version = "0.18.0", features = ["backend-mmap", "backend-atomic"] }
 common = { path = "common" }
 virtio-blk = { path = "../virtio-blk", features = ["backend-stdio"] }
 

fuzz/common/Cargo.toml

@@ -13,4 +13,4 @@ virtio-queue = { path = "../../virtio-queue", features = ["test-utils"] }
 virtio-vsock = { path = "../../virtio-vsock" }
 virtio-queue-ser = { path = "../../virtio-queue-ser" }
 virtio-blk = { path = "../../virtio-blk" }
-vm-memory = { version = "0.17.1", features = ["backend-mmap", "backend-atomic"] }
+vm-memory = { version = "0.18.0", features = ["backend-mmap", "backend-atomic"] }

fuzz/common/src/vsock.rs

@@ -177,7 +177,7 @@ mod tests {
     use virtio_queue::desc::RawDescriptor;
     use virtio_queue::mock::MockSplitQueue;
     use virtio_vsock::packet::VsockPacket;
-    use vm_memory::{Bytes, GuestAddress, GuestMemory, GuestMemoryMmap};
+    use vm_memory::{Bytes, GuestAddress, GuestMemory, GuestMemoryMmap, Permissions};
 
     // Random values to be used by the tests for the header fields.
     const SRC_CID: u64 = 1;
@@ -214,11 +214,17 @@ mod tests {
         mem: &M,
         addr: GuestAddress,
         length: usize,
-        _rx_tx: RxTx,
+        rx_tx: RxTx,
     ) -> *const u8 {
+        let access = match rx_tx {
+            RxTx::Rx => Permissions::Write,
+            RxTx::Tx => Permissions::Read,
+        };
+
         assert!(length > 0);
         let slice = mem
-            .get_slices(addr, length)
+            .get_slices(addr, length, access)
+            .unwrap()
             .next()
             .unwrap()
             .unwrap();

virtio-blk/src/request.rs

@@ -37,7 +37,7 @@ use virtio_queue::{
     desc::{split::Descriptor as SplitDescriptor, RawDescriptor},
     DescriptorChain,
 };
-use vm_memory::{ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryError};
+use vm_memory::{ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryError, Permissions};
 
 /// Block request parsing errors.
 #[derive(Debug)]
@@ -180,7 +180,7 @@ impl Request {
 
         // Check that the address of the status is valid in guest memory.
         // We will write an u8 status here after executing the request.
-        if !mem.check_range(desc.addr(), size_of::<u8>()) {
+        if !mem.check_range(desc.addr(), size_of::<u8>(), Permissions::Write) {
             return Err(Error::GuestMemory(GuestMemoryError::InvalidGuestAddress(
                 desc.addr(),
             )));

virtio-queue-ser/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## Changed
 
+- Updated vm-memory from 0.17.1 to 0.18.0
+
 ## Fixed
 
 # v0.14.0

virtio-queue/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ## Changed
 
+- Updated vm-memory from 0.17.1 to 0.18.0
+
 ## Fixed
 
 # v0.17.0

virtio-queue/src/chain.rs

@@ -15,7 +15,7 @@ use std::mem::size_of;
 use std::ops::Deref;
 
 use vm_memory::bitmap::{BitmapSlice, WithBitmapSlice};
-use vm_memory::{Address, Bytes, GuestAddress, GuestMemory, GuestMemoryRegion};
+use vm_memory::{Address, Bytes, GuestAddress, GuestMemory};
 
 use crate::{desc::split::Descriptor, Error, Reader, Writer};
 use virtio_bindings::bindings::virtio_ring::VRING_DESC_ALIGN_SIZE;
@@ -92,7 +92,7 @@ where
     pub fn writer<'a, B: BitmapSlice>(self, mem: &'a M::Target) -> Result<Writer<'a, B>, Error>
     where
         M::Target: Sized,
-        <<M::Target as GuestMemory>::R as GuestMemoryRegion>::B: WithBitmapSlice<'a, S = B>,
+        <M::Target as GuestMemory>::Bitmap: WithBitmapSlice<'a, S = B>,
     {
         Writer::new(mem, self).map_err(|_| Error::InvalidChain)
     }
@@ -101,7 +101,7 @@ where
     pub fn reader<'a, B: BitmapSlice>(self, mem: &'a M::Target) -> Result<Reader<'a, B>, Error>
     where
         M::Target: Sized,
-        <<M::Target as GuestMemory>::R as GuestMemoryRegion>::B: WithBitmapSlice<'a, S = B>,
+        <M::Target as GuestMemory>::Bitmap: WithBitmapSlice<'a, S = B>,
     {
         Reader::new(mem, self).map_err(|_| Error::InvalidChain)
     }

virtio-queue/src/descriptor_utils.rs

@@ -15,7 +15,7 @@ use std::{cmp, result};
 
 use crate::{DescriptorChain, Error};
 use vm_memory::bitmap::{BitmapSlice, WithBitmapSlice};
-use vm_memory::{ByteValued, GuestMemory, GuestMemoryRegion, VolatileSlice};
+use vm_memory::{ByteValued, GuestMemory, Permissions, VolatileSlice};
 
 pub type Result<T> = result::Result<T, Error>;
 
@@ -158,7 +158,7 @@ impl<'a, B: BitmapSlice> Reader<'a, B> {
     pub fn new<M, T>(mem: &'a M, desc_chain: DescriptorChain<T>) -> Result<Reader<'a, B>>
     where
         M: GuestMemory,
-        <<M as GuestMemory>::R as GuestMemoryRegion>::B: WithBitmapSlice<'a, S = B>,
+        <M as GuestMemory>::Bitmap: WithBitmapSlice<'a, S = B>,
         T: Deref,
         T::Target: GuestMemory + Sized,
     {
@@ -173,7 +173,9 @@ impl<'a, B: BitmapSlice> Reader<'a, B> {
                 .checked_add(desc.len() as usize)
                 .ok_or(Error::DescriptorChainOverflow)?;
 
-            let slices = mem.get_slices(desc.addr(), desc.len() as usize);
+            let slices = mem
+                .get_slices(desc.addr(), desc.len() as usize, Permissions::Read)
+                .map_err(Error::GuestMemoryError)?;
             for slice in slices {
                 buffers.push_back(slice.map_err(Error::GuestMemoryError)?);
             }
@@ -264,7 +266,7 @@ impl<'a, B: BitmapSlice> Writer<'a, B> {
     pub fn new<M, T>(mem: &'a M, desc_chain: DescriptorChain<T>) -> Result<Writer<'a, B>>
     where
         M: GuestMemory,
-        <<M as GuestMemory>::R as GuestMemoryRegion>::B: WithBitmapSlice<'a, S = B>,
+        <M as GuestMemory>::Bitmap: WithBitmapSlice<'a, S = B>,
         T: Deref,
         T::Target: GuestMemory + Sized,
     {
@@ -279,7 +281,9 @@ impl<'a, B: BitmapSlice> Writer<'a, B> {
                 .checked_add(desc.len() as usize)
                 .ok_or(Error::DescriptorChainOverflow)?;
 
-            let slices = mem.get_slices(desc.addr(), desc.len() as usize);
+            let slices = mem
+                .get_slices(desc.addr(), desc.len() as usize, Permissions::Write)
+                .map_err(Error::GuestMemoryError)?;
             for slice in slices {
                 buffers.push_back(slice.map_err(Error::GuestMemoryError)?);
             }

virtio-queue/src/queue.rs

@@ -12,7 +12,7 @@ use std::num::Wrapping;
 use std::ops::Deref;
 use std::sync::atomic::{fence, Ordering};
 
-use vm_memory::{Address, Bytes, GuestAddress, GuestMemory};
+use vm_memory::{Address, Bytes, GuestAddress, GuestMemory, Permissions};
 
 use crate::defs::{
     DEFAULT_AVAIL_RING_ADDR, DEFAULT_DESC_TABLE_ADDR, DEFAULT_USED_RING_ADDR,
@@ -313,21 +313,21 @@ impl QueueT for Queue {
         if !self.ready {
             error!("attempt to use virtio queue that is not marked ready");
             false
-        } else if !mem.check_range(desc_table, desc_table_size as usize) {
+        } else if !mem.check_range(desc_table, desc_table_size as usize, Permissions::Read) {
             error!(
                 "virtio queue descriptor table is not accessible: start:0x{:08x} size:0x{:08x}",
                 desc_table.raw_value(),
                 desc_table_size
             );
             false
-        } else if !mem.check_range(avail_ring, avail_ring_size as usize) {
+        } else if !mem.check_range(avail_ring, avail_ring_size as usize, Permissions::Read) {
             error!(
                 "virtio queue available ring is not accessible: start:0x{:08x} size:0x{:08x}",
                 avail_ring.raw_value(),
                 avail_ring_size
             );
             false
-        } else if !mem.check_range(used_ring, used_ring_size as usize) {
+        } else if !mem.check_range(used_ring, used_ring_size as usize, Permissions::Write) {
             error!(
                 "virtio queue used ring is not accessible: start:0x{:08x} size:0x{:08x}",
                 used_ring.raw_value(),