fix(page-fault): remove redundant CR2 read that panics on error #81
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
The page fault handler was reading CR2 twice: 1. Line 894: Cr2::read().unwrap_or(...) - handles errors gracefully 2. Line 923: Cr2::read().expect(...) - panics on error The second read is redundant and uses .expect() which causes panics when CR2::read() returns Err. This was causing CI failures at [80/138] SIGTERM kill test with KERNEL PANIC at interrupts.rs:923:37. Fix: Reuse the cr2 value already read safely on line 894 by converting it back to a VirtAddr instead of reading CR2 again. Co-Authored-By: Ryan Breen <ryanbreen@gmail.com> Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
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.
Summary
unwrap_or().expect()which panics when CR2::read() returns ErrRoot Cause
After the CoW fork merge (PR #79), CI was failing at [80/138] SIGTERM kill test with:
The panic was
Cr2::read().expect("Failed to read accessed address from CR2").Test plan
🤖 Generated with Claude Code