Change IoVecBuffer[Mut] len to u32 #4556
Open
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
brandonpike
force-pushed
the
desc_chain_lens
branch
from
ad3f4c2
to
d829d68
Compare
|
Fixing lint/build errors... |
brandonpike
force-pushed
the
desc_chain_lens
branch
from
a0fab40
to
9e7f47b
Compare
This commit changes the iovec len primitive to match descriptor chain's (u32). This removes some ugly casting and potential overflow problems, and allows us to upcast when needed in a non-lossy manor. Signed-off-by: Brandon Pike <bpike@amazon.com>
brandonpike
force-pushed
the
desc_chain_lens
branch
from
9e7f47b
to
2c51bdd
Compare
Local Tests on R7g.metal:CheckstyleIntegration testsPerformance TestsPerformance tests fail on R7g because of the graviton 3 processors having a different cpu register set? |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4556 +/- ##
==========================================
- Coverage 82.13% 82.13% -0.01%
==========================================
Files 255 255
Lines 31274 31276 +2
==========================================
+ Hits 25688 25689 +1
- Misses 5586 5587 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
roypat
reviewed
Apr 29, 2024
There was a problem hiding this comment.
Hi @brandonpike,
Thanks for picking this up! The changes generally look good, but I think we can go a bit further in the vsock module. The specification states that everything size related about vsock buffers is u32, so we can do the following changes to function signatures:
VsockConnection::peer_avail_creditcan returnu32VsockPacket::buf_sizecan returnu32VsockPacket::read_at_offset_fromshould be(&self, &mut T, u32, u32) -> Result<u32, VsockError>(e..g. the conversion to usize should only happen right around thewrite_volatile_atcall- ditto for
VsockPacket::write_from_offset_to
Although, maybe we can even get away with changing the argumentsIoVecBuffer[Mut]::{read,write}_volatile_attou32s?
That being said, the changes in this PR as-is are already a huge improvement, so am also happy to approve/merge and track the above as a follow up. Just please fix the errors in the cfg(kani) modules :)
| @@ -139,7 +139,7 @@ impl VsockPacket { | |||
| return Err(VsockError::InvalidPktLen(hdr.len)); | |||
| } | |||
|
|
|||
| if (hdr.len as usize) > buffer.len() - VSOCK_PKT_HDR_SIZE as usize { | |||
| if (hdr.len) > buffer.len() - VSOCK_PKT_HDR_SIZE { | |||
There was a problem hiding this comment.
nit:
Suggested change
| if (hdr.len) > buffer.len() - VSOCK_PKT_HDR_SIZE { | |
| if hdr.len > buffer.len() - VSOCK_PKT_HDR_SIZE { |
| @@ -363,7 +363,7 @@ pub mod tests { | |||
|
|
|||
| tap.write_iovec(&scattered).unwrap(); | |||
|
|
|||
| let mut read_buf = vec![0u8; scattered.len()]; | |||
| let mut read_buf = vec![0u8; scattered.len().try_into().unwrap()]; | |||
There was a problem hiding this comment.
does the stdlib really not have impl From<u32> for usize? .-.
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.
Changes
Closes #4548
Reason
Protect against overflows and use a consistent data type for virtio files.
License Acceptance
By submitting this pull request, I confirm that my contribution is made under
the terms of the Apache 2.0 license. For more information on following Developer
Certificate of Origin and signing off your commits, please check
CONTRIBUTING.md.PR Checklist
PR.
CHANGELOG.md.TODOs link to an issue.contribution quality standards.
rust-vmm.