wip - mana: save/restore for keepalive support #1033
Draft
Conversation
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
| dma_mode: GuestDmaMode, | ||
| dma_client: Arc<dyn DmaClient>, | ||
| ) -> anyhow::Result<( | ||
| Self, | ||
| Vec<HclNetworkVFManagerEndpointInfo>, | ||
| RuntimeSavedState, | ||
| )> { | ||
| tracing::info!("creating mana device. mana_state: {:?}", mana_state); | ||
|
|
||
| let mana_state = mana_state.as_ref().map(|mana_state| mana_state[0].clone()); |
There was a problem hiding this comment.
This is certainly wrong - need to revisit what kind of relationship this is (does this need to be a vec at all?)
Comment on lines
-164
to
-217
| impl<T: DeviceBacking> Drop for GdmaDriver<T> { | ||
| fn drop(&mut self) { | ||
| if self.hwc_failure { | ||
| return; | ||
| } | ||
| let data = self | ||
| .bar0 | ||
| .mem | ||
| .read_u32(self.bar0.map.vf_gdma_sriov_shared_reg_start as usize + 28); | ||
| if data == u32::MAX { | ||
| tracing::error!("Device no longer present"); | ||
| return; | ||
| } | ||
|
|
||
| let hdr = SmcProtoHdr::new() | ||
| .with_msg_type(SmcMessageType::SMC_MSG_TYPE_DESTROY_HWC.0) | ||
| .with_msg_version(SMC_MSG_TYPE_DESTROY_HWC_VERSION); | ||
|
|
||
| let hdr = u32::from_le_bytes(hdr.as_bytes().try_into().expect("known size")); | ||
| self.bar0.mem.write_u32( | ||
| self.bar0.map.vf_gdma_sriov_shared_reg_start as usize + 28, | ||
| hdr, | ||
| ); | ||
| // Wait for the device to respond. | ||
| let max_wait_time = | ||
| std::time::Instant::now() + Duration::from_millis(HWC_POLL_TIMEOUT_IN_MS); | ||
| let header = loop { | ||
| let data = self | ||
| .bar0 | ||
| .mem | ||
| .read_u32(self.bar0.map.vf_gdma_sriov_shared_reg_start as usize + 28); | ||
| if data == u32::MAX { | ||
| tracing::error!("Device no longer present"); | ||
| return; | ||
| } | ||
| let header = SmcProtoHdr::from(data); | ||
| if !header.owner_is_pf() { | ||
| break header; | ||
| } | ||
| if std::time::Instant::now() > max_wait_time { | ||
| tracing::error!("MANA request timed out. SMC_MSG_TYPE_DESTROY_HWC"); | ||
| return; | ||
| } | ||
| std::hint::spin_loop(); | ||
| }; | ||
|
|
||
| if !header.is_response() { | ||
| tracing::error!("expected response"); | ||
| } | ||
| if header.status() != 0 { | ||
| tracing::error!("DESTROY_HWC failed: {}", header.status()); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This drop impl needs to be re-added and run conditionally based on if we're servicing or not - what's the best way to do that?
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.
Opening this early to get ahead of feedback while I work on save/restore for mana queues. I've merged #945 into this branch in the interest of writing a unit test, but it hasn't actually been implemented yet.
Some open questions:
test_eqso I'm relatively confident the GDMA driver is being restored at least somewhat properly.nvme_keepalive's lead - is there any interest in changing how enablement works?info!logging I was using for testing - will remove or move to debug level if interest in keeping them aroundIs there interest in staging these changes rather than merging one large change in the interest of smaller reviews?