fix fd_read and fd_write for wasm32-wasi-threads#7750
Merged
Conversation
Previously, `first_non_empty_{c}io_vec` always returned `Ok(None)` for buffers
residing in shared memories since they cannot, in general, safely be represented
as slices. That caused e.g. `wasi-libc` to spin forever when trying to write to
stdout using `fd_write` since it always got `Ok(0)` and never made progress.
This commit changes the return type of both functions to use `GuestPtr` instead
of `GuestSlice{Mut}`, allowing safe access to shared guest memory.
Big thanks to Alex Crichton for narrowing this down and suggesting the fix.
Fixes bytecodealliance#7745
Signed-off-by: Joel Dice <joel.dice@fermyon.com>
dicej
requested review from
alexcrichton and
pchickey
and removed request for
a team and
pchickey
pchickey
approved these changes
Jan 4, 2024
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
dicej
added a commit
to dicej/wasmtime
that referenced
this pull request
Jan 5, 2024
…ds` (bytecodealliance#7750) Previously, `first_non_empty_{c}io_vec` always returned `Ok(None)` for buffers residing in shared memories since they cannot, in general, safely be represented as slices. That caused e.g. `wasi-libc` to spin forever when trying to write to stdout using `fd_write` since it always got `Ok(0)` and never made progress. This commit changes the return type of both functions to use `GuestPtr` instead of `GuestSlice{Mut}`, allowing safe access to shared guest memory. Big thanks to Alex Crichton for narrowing this down and suggesting the fix. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
dicej
added a commit
that referenced
this pull request
Jan 5, 2024
…ds` (#7750) (#7755) Previously, `first_non_empty_{c}io_vec` always returned `Ok(None)` for buffers residing in shared memories since they cannot, in general, safely be represented as slices. That caused e.g. `wasi-libc` to spin forever when trying to write to stdout using `fd_write` since it always got `Ok(0)` and never made progress. This commit changes the return type of both functions to use `GuestPtr` instead of `GuestSlice{Mut}`, allowing safe access to shared guest memory. Big thanks to Alex Crichton for narrowing this down and suggesting the fix. Signed-off-by: Joel Dice <joel.dice@fermyon.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously,
first_non_empty_{c}io_vecalways returnedOk(None)for buffers residing in shared memories since they cannot, in general, safely be represented as slices. That caused e.g.wasi-libcto spin forever when trying to write to stdout usingfd_writesince it always gotOk(0)and never made progress.This commit changes the return type of both functions to use
GuestPtrinstead ofGuestSlice{Mut}, allowing safe access to shared guest memory.Big thanks to Alex Crichton for narrowing this down and suggesting the fix.
Fixes #7745