wiggle: copy guest slices back to shared memory (#5471)
This change upgrades `UnsafeGuestSlice` in Wiggle to expose more functionality to be able to use `std::ptr::copy` for writing bytes into Wasm shared memory. Additionally, it adds a new `GuestCow` type for delineating between Wasm memory regions that can be borrowed (non-shared memory) or must be copied (shared memory) in order to maintain Rust guarantees. With these in place, it is now possible to implement the `preview1` "read" functions for shared memory. Previously, these would panic if attempting to copy to a shared memory. This change removes the panic and introduces some (rather complex) logic for handling both the shared and non-shared cases: - if reading into a Wasm non-shared memory, Wiggle guarantees that no other guest pointers will touch the memory region and, in the absence of concurrency, a WASI function can write directly to this memory - if reading into a Wasm shared memory, the memory region can be concurrently modified. At @alexcrichton's request re: Rust safety, this change copies all of the bytes into an intermediate buffer before using `std::ptr::copy` to move them into Wasm memory. This change only applies to the `preview0` and `preview1` implementations of `wasi-common`. Fixing up other WASI implementations (esp. wasi-crypto) is left for later.
This commit is contained in:
@@ -5,6 +5,7 @@ use crate::sched::{
|
||||
};
|
||||
use crate::snapshots::preview_1::types as snapshot1_types;
|
||||
use crate::snapshots::preview_1::wasi_snapshot_preview1::WasiSnapshotPreview1 as Snapshot1;
|
||||
use crate::snapshots::preview_1::MAX_SHARED_BUFFER_SIZE;
|
||||
use crate::{ErrorExt, WasiCtx};
|
||||
use cap_std::time::Duration;
|
||||
use std::collections::HashSet;
|
||||
@@ -532,23 +533,69 @@ impl wasi_unstable::WasiUnstable for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::READ)?;
|
||||
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> =
|
||||
iovs.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_slice_mut()?.expect(
|
||||
"cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)",
|
||||
))
|
||||
})
|
||||
let iovs: Vec<wiggle::UnsafeGuestSlice<u8>> = iovs
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_unsafe_slice_mut()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
// If the first iov structure is from shared memory we can safely assume
|
||||
// all the rest will be. We then read into memory based on the memory's
|
||||
// shared-ness:
|
||||
// - if not shared, we copy directly into the Wasm memory
|
||||
// - if shared, we use an intermediate buffer; this avoids Rust unsafety
|
||||
// due to holding on to a `&mut [u8]` of Wasm memory when we cannot
|
||||
// guarantee the `&mut` exclusivity--other threads could be modifying
|
||||
// the data as this functions writes to it. Though likely there is no
|
||||
// issue with OS writing to io structs in multi-threaded scenarios,
|
||||
// since we do not know here if `&dyn WasiFile` does anything else
|
||||
// (e.g., read), we cautiously incur some performance overhead by
|
||||
// copying twice.
|
||||
let is_shared_memory = iovs
|
||||
.iter()
|
||||
.next()
|
||||
.and_then(|s| Some(s.is_shared_memory()))
|
||||
.unwrap_or(false);
|
||||
let bytes_read: u64 = if is_shared_memory {
|
||||
// Read into an intermediate buffer.
|
||||
let total_available_size = iovs.iter().fold(0, |a, s| a + s.len());
|
||||
let mut buffer = vec![0; total_available_size.min(MAX_SHARED_BUFFER_SIZE)];
|
||||
let bytes_read = f.read_vectored(&mut [IoSliceMut::new(&mut buffer)]).await?;
|
||||
|
||||
// Copy the intermediate buffer into the Wasm shared memory--`iov`
|
||||
// by `iov`.
|
||||
let mut data_to_write = &buffer[0..];
|
||||
for iov in iovs.into_iter() {
|
||||
let len = data_to_write.len().min(iov.len());
|
||||
iov.copy_from_slice(&data_to_write[0..len])?;
|
||||
data_to_write = &data_to_write[len..];
|
||||
if data_to_write.is_empty() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
bytes_read
|
||||
} else {
|
||||
// Convert all of the unsafe guest slices to safe ones--this uses
|
||||
// Wiggle's internal borrow checker to ensure no overlaps. We assume
|
||||
// here that, because the memory is not shared, there are no other
|
||||
// threads to access it while it is written to.
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> = iovs
|
||||
.into_iter()
|
||||
.map(|iov| Ok(iov.as_slice_mut()?.unwrap()))
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
// Read directly into the Wasm memory.
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
f.read_vectored(&mut ioslices).await?
|
||||
};
|
||||
|
||||
let bytes_read = f.read_vectored(&mut ioslices).await?;
|
||||
Ok(types::Size::try_from(bytes_read)?)
|
||||
}
|
||||
|
||||
@@ -563,23 +610,71 @@ impl wasi_unstable::WasiUnstable for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::READ | FileCaps::SEEK)?;
|
||||
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> =
|
||||
iovs.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_slice_mut()?.expect(
|
||||
"cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)",
|
||||
))
|
||||
})
|
||||
let iovs: Vec<wiggle::UnsafeGuestSlice<u8>> = iovs
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_unsafe_slice_mut()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
// If the first iov structure is from shared memory we can safely assume
|
||||
// all the rest will be. We then read into memory based on the memory's
|
||||
// shared-ness:
|
||||
// - if not shared, we copy directly into the Wasm memory
|
||||
// - if shared, we use an intermediate buffer; this avoids Rust unsafety
|
||||
// due to holding on to a `&mut [u8]` of Wasm memory when we cannot
|
||||
// guarantee the `&mut` exclusivity--other threads could be modifying
|
||||
// the data as this functions writes to it. Though likely there is no
|
||||
// issue with OS writing to io structs in multi-threaded scenarios,
|
||||
// since we do not know here if `&dyn WasiFile` does anything else
|
||||
// (e.g., read), we cautiously incur some performance overhead by
|
||||
// copying twice.
|
||||
let is_shared_memory = iovs
|
||||
.iter()
|
||||
.next()
|
||||
.and_then(|s| Some(s.is_shared_memory()))
|
||||
.unwrap_or(false);
|
||||
let bytes_read: u64 = if is_shared_memory {
|
||||
// Read into an intermediate buffer.
|
||||
let total_available_size = iovs.iter().fold(0, |a, s| a + s.len());
|
||||
let mut buffer = vec![0; total_available_size.min(MAX_SHARED_BUFFER_SIZE)];
|
||||
let bytes_read = f
|
||||
.read_vectored_at(&mut [IoSliceMut::new(&mut buffer)], offset)
|
||||
.await?;
|
||||
|
||||
// Copy the intermediate buffer into the Wasm shared memory--`iov`
|
||||
// by `iov`.
|
||||
let mut data_to_write = &buffer[0..];
|
||||
for iov in iovs.into_iter() {
|
||||
let len = data_to_write.len().min(iov.len());
|
||||
iov.copy_from_slice(&data_to_write[0..len])?;
|
||||
data_to_write = &data_to_write[len..];
|
||||
if data_to_write.is_empty() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
bytes_read
|
||||
} else {
|
||||
// Convert all of the unsafe guest slices to safe ones--this uses
|
||||
// Wiggle's internal borrow checker to ensure no overlaps. We assume
|
||||
// here that, because the memory is not shared, there are no other
|
||||
// threads to access it while it is written to.
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> = iovs
|
||||
.into_iter()
|
||||
.map(|iov| Ok(iov.as_slice_mut()?.unwrap()))
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
// Read directly into the Wasm memory.
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
f.read_vectored_at(&mut ioslices, offset).await?
|
||||
};
|
||||
|
||||
let bytes_read = f.read_vectored_at(&mut ioslices, offset).await?;
|
||||
Ok(types::Size::try_from(bytes_read)?)
|
||||
}
|
||||
|
||||
@@ -593,16 +688,12 @@ impl wasi_unstable::WasiUnstable for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::WRITE)?;
|
||||
|
||||
let guest_slices: Vec<wiggle::GuestSlice<u8>> = ciovs
|
||||
let guest_slices: Vec<wiggle::GuestCow<u8>> = ciovs
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Ciovec = iov_ptr.read()?;
|
||||
Ok(iov
|
||||
.buf
|
||||
.as_array(iov.buf_len)
|
||||
.as_slice()?
|
||||
.expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"))
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_cow()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
@@ -626,16 +717,12 @@ impl wasi_unstable::WasiUnstable for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::WRITE | FileCaps::SEEK)?;
|
||||
|
||||
let guest_slices: Vec<wiggle::GuestSlice<u8>> = ciovs
|
||||
let guest_slices: Vec<wiggle::GuestCow<u8>> = ciovs
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Ciovec = iov_ptr.read()?;
|
||||
Ok(iov
|
||||
.buf
|
||||
.as_array(iov.buf_len)
|
||||
.as_slice()?
|
||||
.expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"))
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_cow()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
|
||||
@@ -13,12 +13,16 @@ use crate::{
|
||||
use cap_std::time::{Duration, SystemClock};
|
||||
use std::convert::{TryFrom, TryInto};
|
||||
use std::io::{IoSlice, IoSliceMut};
|
||||
use std::ops::{Deref, DerefMut};
|
||||
use std::ops::Deref;
|
||||
use wiggle::GuestPtr;
|
||||
|
||||
pub mod error;
|
||||
use error::{Error, ErrorExt};
|
||||
|
||||
// Limit the size of intermediate buffers when copying to WebAssembly shared
|
||||
// memory.
|
||||
pub(crate) const MAX_SHARED_BUFFER_SIZE: usize = 1 << 16;
|
||||
|
||||
wiggle::from_witx!({
|
||||
witx: ["$WASI_ROOT/phases/snapshot/witx/wasi_snapshot_preview1.witx"],
|
||||
errors: { errno => trappable Error },
|
||||
@@ -295,23 +299,69 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::READ)?;
|
||||
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> =
|
||||
iovs.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_slice_mut()?.expect(
|
||||
"cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)",
|
||||
))
|
||||
})
|
||||
let iovs: Vec<wiggle::UnsafeGuestSlice<u8>> = iovs
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_unsafe_slice_mut()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
// If the first iov structure is from shared memory we can safely assume
|
||||
// all the rest will be. We then read into memory based on the memory's
|
||||
// shared-ness:
|
||||
// - if not shared, we copy directly into the Wasm memory
|
||||
// - if shared, we use an intermediate buffer; this avoids Rust unsafety
|
||||
// due to holding on to a `&mut [u8]` of Wasm memory when we cannot
|
||||
// guarantee the `&mut` exclusivity--other threads could be modifying
|
||||
// the data as this functions writes to it. Though likely there is no
|
||||
// issue with OS writing to io structs in multi-threaded scenarios,
|
||||
// since we do not know here if `&dyn WasiFile` does anything else
|
||||
// (e.g., read), we cautiously incur some performance overhead by
|
||||
// copying twice.
|
||||
let is_shared_memory = iovs
|
||||
.iter()
|
||||
.next()
|
||||
.and_then(|s| Some(s.is_shared_memory()))
|
||||
.unwrap_or(false);
|
||||
let bytes_read: u64 = if is_shared_memory {
|
||||
// Read into an intermediate buffer.
|
||||
let total_available_size = iovs.iter().fold(0, |a, s| a + s.len());
|
||||
let mut buffer = vec![0; total_available_size.min(MAX_SHARED_BUFFER_SIZE)];
|
||||
let bytes_read = f.read_vectored(&mut [IoSliceMut::new(&mut buffer)]).await?;
|
||||
|
||||
// Copy the intermediate buffer into the Wasm shared memory--`iov`
|
||||
// by `iov`.
|
||||
let mut data_to_write = &buffer[0..];
|
||||
for iov in iovs.into_iter() {
|
||||
let len = data_to_write.len().min(iov.len());
|
||||
iov.copy_from_slice(&data_to_write[0..len])?;
|
||||
data_to_write = &data_to_write[len..];
|
||||
if data_to_write.is_empty() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
bytes_read
|
||||
} else {
|
||||
// Convert all of the unsafe guest slices to safe ones--this uses
|
||||
// Wiggle's internal borrow checker to ensure no overlaps. We assume
|
||||
// here that, because the memory is not shared, there are no other
|
||||
// threads to access it while it is written to.
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> = iovs
|
||||
.into_iter()
|
||||
.map(|iov| Ok(iov.as_slice_mut()?.unwrap()))
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
// Read directly into the Wasm memory.
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
f.read_vectored(&mut ioslices).await?
|
||||
};
|
||||
|
||||
let bytes_read = f.read_vectored(&mut ioslices).await?;
|
||||
Ok(types::Size::try_from(bytes_read)?)
|
||||
}
|
||||
|
||||
@@ -326,23 +376,71 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::READ | FileCaps::SEEK)?;
|
||||
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> =
|
||||
iovs.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_slice_mut()?.expect(
|
||||
"cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)",
|
||||
))
|
||||
})
|
||||
let iovs: Vec<wiggle::UnsafeGuestSlice<u8>> = iovs
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_unsafe_slice_mut()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
// If the first iov structure is from shared memory we can safely assume
|
||||
// all the rest will be. We then read into memory based on the memory's
|
||||
// shared-ness:
|
||||
// - if not shared, we copy directly into the Wasm memory
|
||||
// - if shared, we use an intermediate buffer; this avoids Rust unsafety
|
||||
// due to holding on to a `&mut [u8]` of Wasm memory when we cannot
|
||||
// guarantee the `&mut` exclusivity--other threads could be modifying
|
||||
// the data as this functions writes to it. Though likely there is no
|
||||
// issue with OS writing to io structs in multi-threaded scenarios,
|
||||
// since we do not know here if `&dyn WasiFile` does anything else
|
||||
// (e.g., read), we cautiously incur some performance overhead by
|
||||
// copying twice.
|
||||
let is_shared_memory = iovs
|
||||
.iter()
|
||||
.next()
|
||||
.and_then(|s| Some(s.is_shared_memory()))
|
||||
.unwrap_or(false);
|
||||
let bytes_read: u64 = if is_shared_memory {
|
||||
// Read into an intermediate buffer.
|
||||
let total_available_size = iovs.iter().fold(0, |a, s| a + s.len());
|
||||
let mut buffer = vec![0; total_available_size.min(MAX_SHARED_BUFFER_SIZE)];
|
||||
let bytes_read = f
|
||||
.read_vectored_at(&mut [IoSliceMut::new(&mut buffer)], offset)
|
||||
.await?;
|
||||
|
||||
// Copy the intermediate buffer into the Wasm shared memory--`iov`
|
||||
// by `iov`.
|
||||
let mut data_to_write = &buffer[0..];
|
||||
for iov in iovs.into_iter() {
|
||||
let len = data_to_write.len().min(iov.len());
|
||||
iov.copy_from_slice(&data_to_write[0..len])?;
|
||||
data_to_write = &data_to_write[len..];
|
||||
if data_to_write.is_empty() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
bytes_read
|
||||
} else {
|
||||
// Convert all of the unsafe guest slices to safe ones--this uses
|
||||
// Wiggle's internal borrow checker to ensure no overlaps. We assume
|
||||
// here that, because the memory is not shared, there are no other
|
||||
// threads to access it while it is written to.
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> = iovs
|
||||
.into_iter()
|
||||
.map(|iov| Ok(iov.as_slice_mut()?.unwrap()))
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
// Read directly into the Wasm memory.
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
f.read_vectored_at(&mut ioslices, offset).await?
|
||||
};
|
||||
|
||||
let bytes_read = f.read_vectored_at(&mut ioslices, offset).await?;
|
||||
Ok(types::Size::try_from(bytes_read)?)
|
||||
}
|
||||
|
||||
@@ -356,16 +454,12 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::WRITE)?;
|
||||
|
||||
let guest_slices: Vec<wiggle::GuestSlice<u8>> = ciovs
|
||||
let guest_slices: Vec<wiggle::GuestCow<u8>> = ciovs
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Ciovec = iov_ptr.read()?;
|
||||
Ok(iov
|
||||
.buf
|
||||
.as_array(iov.buf_len)
|
||||
.as_slice()?
|
||||
.expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"))
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_cow()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
@@ -389,16 +483,12 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::WRITE | FileCaps::SEEK)?;
|
||||
|
||||
let guest_slices: Vec<wiggle::GuestSlice<u8>> = ciovs
|
||||
let guest_slices: Vec<wiggle::GuestCow<u8>> = ciovs
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Ciovec = iov_ptr.read()?;
|
||||
Ok(iov
|
||||
.buf
|
||||
.as_array(iov.buf_len)
|
||||
.as_slice()?
|
||||
.expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"))
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_cow()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
@@ -440,11 +530,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
if path_len < path_max_len as usize {
|
||||
return Err(Error::name_too_long());
|
||||
}
|
||||
let mut p_memory = path
|
||||
.as_array(path_len as u32)
|
||||
.as_slice_mut()?
|
||||
.expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)");
|
||||
p_memory.copy_from_slice(path_bytes);
|
||||
path.as_array(path_len as u32).copy_from_slice(path_bytes)?;
|
||||
Ok(())
|
||||
} else {
|
||||
Err(Error::not_supported())
|
||||
@@ -737,11 +823,7 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
if link_len > buf_len as usize {
|
||||
return Err(Error::range());
|
||||
}
|
||||
let mut buf = buf
|
||||
.as_array(link_len as u32)
|
||||
.as_slice_mut()?
|
||||
.expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)");
|
||||
buf.copy_from_slice(link_bytes);
|
||||
buf.as_array(link_len as u32).copy_from_slice(link_bytes)?;
|
||||
Ok(link_len as types::Size)
|
||||
}
|
||||
|
||||
@@ -1029,11 +1111,30 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
buf: &GuestPtr<'a, u8>,
|
||||
buf_len: types::Size,
|
||||
) -> Result<(), Error> {
|
||||
let mut buf = buf
|
||||
.as_array(buf_len)
|
||||
.as_slice_mut()?
|
||||
.expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)");
|
||||
self.random.try_fill_bytes(buf.deref_mut())?;
|
||||
let buf = buf.as_array(buf_len);
|
||||
if buf.is_shared_memory() {
|
||||
// If the Wasm memory is shared, copy to an intermediate buffer to
|
||||
// avoid Rust unsafety (i.e., the called function could rely on
|
||||
// `&mut [u8]`'s exclusive ownership which is not guaranteed due to
|
||||
// potential access from other threads).
|
||||
let mut copied: u32 = 0;
|
||||
while copied < buf.len() {
|
||||
let len = (buf.len() - copied).min(MAX_SHARED_BUFFER_SIZE as u32);
|
||||
let mut tmp = vec![0; len as usize];
|
||||
self.random.try_fill_bytes(&mut tmp)?;
|
||||
let dest = buf
|
||||
.get_range(copied..copied + len)
|
||||
.unwrap()
|
||||
.as_unsafe_slice_mut()?;
|
||||
dest.copy_from_slice(&tmp)?;
|
||||
copied += len;
|
||||
}
|
||||
} else {
|
||||
// If the Wasm memory is non-shared, copy directly into the linear
|
||||
// memory.
|
||||
let mem = &mut buf.as_slice_mut()?.unwrap();
|
||||
self.random.try_fill_bytes(mem)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -1069,25 +1170,72 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::READ)?;
|
||||
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> =
|
||||
ri_data
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_slice_mut()?.expect(
|
||||
"cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)",
|
||||
))
|
||||
})
|
||||
let iovs: Vec<wiggle::UnsafeGuestSlice<u8>> = ri_data
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Iovec = iov_ptr.read()?;
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_unsafe_slice_mut()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
// If the first iov structure is from shared memory we can safely assume
|
||||
// all the rest will be. We then read into memory based on the memory's
|
||||
// shared-ness:
|
||||
// - if not shared, we copy directly into the Wasm memory
|
||||
// - if shared, we use an intermediate buffer; this avoids Rust unsafety
|
||||
// due to holding on to a `&mut [u8]` of Wasm memory when we cannot
|
||||
// guarantee the `&mut` exclusivity--other threads could be modifying
|
||||
// the data as this functions writes to it. Though likely there is no
|
||||
// issue with OS writing to io structs in multi-threaded scenarios,
|
||||
// since we do not know here if `&dyn WasiFile` does anything else
|
||||
// (e.g., read), we cautiously incur some performance overhead by
|
||||
// copying twice.
|
||||
let is_shared_memory = iovs
|
||||
.iter()
|
||||
.next()
|
||||
.and_then(|s| Some(s.is_shared_memory()))
|
||||
.unwrap_or(false);
|
||||
let (bytes_read, ro_flags) = if is_shared_memory {
|
||||
// Read into an intermediate buffer.
|
||||
let total_available_size = iovs.iter().fold(0, |a, s| a + s.len());
|
||||
let mut buffer = vec![0; total_available_size.min(MAX_SHARED_BUFFER_SIZE)];
|
||||
let (bytes_read, ro_flags) = f
|
||||
.sock_recv(&mut [IoSliceMut::new(&mut buffer)], RiFlags::from(ri_flags))
|
||||
.await?;
|
||||
|
||||
// Copy the intermediate buffer into the Wasm shared memory--`iov`
|
||||
// by `iov`.
|
||||
let mut data_to_write = &buffer[0..];
|
||||
for iov in iovs.into_iter() {
|
||||
let len = data_to_write.len().min(iov.len());
|
||||
iov.copy_from_slice(&data_to_write[0..len])?;
|
||||
data_to_write = &data_to_write[len..];
|
||||
if data_to_write.is_empty() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
(bytes_read, ro_flags)
|
||||
} else {
|
||||
// Convert all of the unsafe guest slices to safe ones--this uses
|
||||
// Wiggle's internal borrow checker to ensure no overlaps. We assume
|
||||
// here that, because the memory is not shared, there are no other
|
||||
// threads to access it while it is written to.
|
||||
let mut guest_slices: Vec<wiggle::GuestSliceMut<u8>> = iovs
|
||||
.into_iter()
|
||||
.map(|iov| Ok(iov.as_slice_mut()?.unwrap()))
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
// Read directly into the Wasm memory.
|
||||
let mut ioslices: Vec<IoSliceMut> = guest_slices
|
||||
.iter_mut()
|
||||
.map(|s| IoSliceMut::new(&mut *s))
|
||||
.collect();
|
||||
f.sock_recv(&mut ioslices, RiFlags::from(ri_flags)).await?
|
||||
};
|
||||
|
||||
let (bytes_read, roflags) = f.sock_recv(&mut ioslices, RiFlags::from(ri_flags)).await?;
|
||||
Ok((types::Size::try_from(bytes_read)?, roflags.into()))
|
||||
Ok((types::Size::try_from(bytes_read)?, ro_flags.into()))
|
||||
}
|
||||
|
||||
async fn sock_send<'a>(
|
||||
@@ -1101,16 +1249,12 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
|
||||
.get_file_mut(u32::from(fd))?
|
||||
.get_cap_mut(FileCaps::WRITE)?;
|
||||
|
||||
let guest_slices: Vec<wiggle::GuestSlice<u8>> = si_data
|
||||
let guest_slices: Vec<wiggle::GuestCow<u8>> = si_data
|
||||
.iter()
|
||||
.map(|iov_ptr| {
|
||||
let iov_ptr = iov_ptr?;
|
||||
let iov: types::Ciovec = iov_ptr.read()?;
|
||||
Ok(iov
|
||||
.buf
|
||||
.as_array(iov.buf_len)
|
||||
.as_slice()?
|
||||
.expect("cannot use with shared memories; see https://github.com/bytecodealliance/wasmtime/issues/5235 (TODO)"))
|
||||
Ok(iov.buf.as_array(iov.buf_len).as_cow()?)
|
||||
})
|
||||
.collect::<Result<_, Error>>()?;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user