Use hypercall definitions from uhyve-interface #1393
+573
−349
Conversation
This file contains 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
|
Depends on #1442 |
jounathaen
force-pushed
the
uhyve-interface
branch
from
c08658a to
9720732
Compare
jounathaen
force-pushed
the
uhyve-interface
branch
from
9720732 to
9a16274
Compare
stlankes
approved these changes
Nov 25, 2024
mkroening
requested changes
Nov 26, 2024
Comment on lines
38
to
79
| #[inline] | ||
| fn uhyve_send<T>(port: u16, data: &mut T) { | ||
| let ptr = VirtAddr::from_ptr(data); | ||
| let physical_address = paging::virtual_to_physical(ptr).unwrap(); | ||
| #[cfg(target_arch = "x86_64")] | ||
| /// Perform a hypercall to the uhyve hypervisor | ||
| pub(crate) fn uhyve_hypercall(hypercall: Hypercall<'_>) { | ||
| let port = HypercallAddress::from(&hypercall) as u16; | ||
| let data = hypercall_data(&hypercall); | ||
|
|
||
| #[cfg(target_arch = "x86_64")] | ||
| unsafe { | ||
| x86::io::outl(port, physical_address.as_u64() as u32); | ||
| outl( | ||
| port, | ||
| data.try_into() | ||
| .expect("Hypercall data must lie in the first 4GiB of memory"), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| #[inline] | ||
| #[cfg(target_arch = "aarch64")] | ||
| /// Perform a hypercall to the uhyve hypervisor | ||
| pub(crate) fn uhyve_hypercall(hypercall: Hypercall<'_>) { | ||
| let ptr = HypercallAddress::from(&hypercall) as u16; | ||
| let data = hypercall_data(&hypercall); | ||
| use core::arch::asm; | ||
|
|
||
| #[cfg(target_arch = "aarch64")] | ||
| unsafe { | ||
| core::arch::asm!( | ||
| "str x8, [{port}]", | ||
| port = in(reg) u64::from(port), | ||
| in("x8") physical_address.as_u64(), | ||
| asm!( | ||
| "str x8, [{ptr}]", | ||
| ptr = in(reg) u64::from(ptr), | ||
| in("x8") data, | ||
| options(nostack), | ||
| ); | ||
| } | ||
|
|
||
| #[cfg(target_arch = "riscv64")] | ||
| todo!("uhyve_send(port = {port}, physical_address = {physical_address:p})"); | ||
| } | ||
|
|
||
| #[repr(C, packed)] | ||
| struct SysExit { | ||
| arg: i32, | ||
| } | ||
|
|
||
| impl SysExit { | ||
| fn new(arg: i32) -> SysExit { | ||
| SysExit { arg } | ||
| } | ||
| #[inline] | ||
| #[cfg(target_arch = "riscv64")] | ||
| /// Perform a hypercall to the uhyve hypervisor | ||
| pub(crate) fn uhyve_hypercall(hypercall: Hypercall<'_>) { | ||
| let _ptr = HypercallAddress::from(&hypercall) as u16; | ||
| let _data = hypercall_data(&hypercall); | ||
| todo!() | ||
| } |
There was a problem hiding this comment.
Why not share a common function definition across architectures like before?
Comment on lines
+11
to
+13
| #[inline] | ||
| /// calculates the physical address of the struct passed as reference. | ||
| fn data_addr<T>(data: &T) -> u64 { |
There was a problem hiding this comment.
Nit regarding all doc comments: the doc comments should come before attributes. Also, the beginning of doc comments should be capitalized.
Comment on lines
+76
to
+78
| let mut close_params = CloseParams { fd: self.0, ret: 0 }; | ||
| // TODO: Panic on ret != 0? | ||
| uhyve_hypercall(Hypercall::FileClose(&mut close_params)); |
There was a problem hiding this comment.
Should we resolve this TODO before merging the PR?
There was a problem hiding this comment.
Cargo.lock should be updated separately. I have opened #1474.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This depends on hermit-os/uhyve#757 (and a publication of uhyve interface V0.1.2)
This is the final step of putting the hypercall definitions in a central crate.
This PR should just deduplicate code without changing functionality.