Use EntryStoreContext to manage state when entering and exiting Wasm#10626
Merged
fitzgen merged 5 commits intobytecodealliance:mainfrom Apr 22, 2025
Merged
Use EntryStoreContext to manage state when entering and exiting Wasm#10626fitzgen merged 5 commits intobytecodealliance:mainfrom
fitzgen merged 5 commits intobytecodealliance:mainfrom
Conversation
Contributor
Author
|
CC @fitzgen |
github-actions
bot
added
the
wasmtime:api
fitzgen
approved these changes
Apr 22, 2025
Member
fitzgen
left a comment
fitzgen
left a comment
There was a problem hiding this comment.
Looks great, will merge once our collective nitpicks are addressed. Thanks a ton for this clean up!
Member
|
Initial comparison to DetailsLooks like an improvement for most things! Going to look into the regressions a little bit. |
Co-authored-by: Nick Fitzgerald <fitzgen@gmail.com>
Member
|
Okay I've got a few Details |
frank-emrich
commented
Apr 22, 2025
| // same store and `self.vm_store_context == self.prev.vm_store_context`) and we must to | ||
| // maintain the list of contiguous-Wasm-frames stack regions for | ||
| // backtracing purposes. | ||
| // FIXME(frank-emrich) Does this need to be an (Unsafe)Cell? |
Contributor
Author
There was a problem hiding this comment.
Following the reasoning about UnsafeCell elsewhere, I guess the answer is "no" here then as well
Member
There was a problem hiding this comment.
Correct, because nothing is mutating this pointer in such a way that violates Rust's regular borrowing discipline.
Contributor
Author
There was a problem hiding this comment.
Actually, I remember now why I put this comment here: The previous old_* fields were Cells. Maybe that was just some leftover.
Member
There was a problem hiding this comment.
Yeah, should be fine to remove.
Member
|
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.
Currently, there are two places that perform some updates to the runtime when entering and exiting Wasm: In
runtime::vm::catch_traps(together withCallThreadState'sdrop) and infunc.rs(using theenter_wasm/exit_wasmfunctions there). I believe @alexcrichton mentioned that this split is mostly for legacy reasons due to how to things were separated into different crates until recently.As a result, both of these places need to store different parts of the runtime state, and then restore it at the right moment.
This PR consolidates all of this into one place using a new type,
EntryStoreContext, whoseenter_wasmandexit_wasmfunctions mimic the original functions, but also subsume what previously happened inCallThreadState. The code is just moved around with minimal changes. The name of the type reflects that we are storing a subset of theStoreContextupon entry into Wasm.The motivation for this refactoring is the following (discussed here): For the implementation of the stack switching proposal, we need to save and restore even more context. Using either of the places mentioned above lead to awkward code. Thus, this PR contains the necessary preparation work, without any stack-switching specific code.