fix(riscv): trap on machine-level CSR accesses from U-mode - #302
Closed
carlosqwqqwq wants to merge 1 commit into
Closed
fix(riscv): trap on machine-level CSR accesses from U-mode#302carlosqwqqwq wants to merge 1 commit into
carlosqwqqwq wants to merge 1 commit into
Conversation
Member
|
Thank you for the report and implementation proposal. I independently reproduced and validated the accepted behavior, then reimplemented it with direct and SMIR/JIT coverage in #296 at commit 9027ae1. No contributor patch was imported; the consolidation commit records @carlosqwqqwq as co-author. I am closing this implementation PR because it is now consolidated into #296. Please review the rollup there. |
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
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
The RISC-V privileged spec encodes the minimum privilege for a CSR in the two high bits of its address; machine-level CSRs (bits 9:8 = 0b11) must raise an illegal-instruction exception when accessed from U-mode. RAX's
exec_csr(src/isa/riscv/cpu/csr_ops.rs) had no privilege check, so U-modecsrrw mtvec/csrrs misa/csrr mhartidwere silently accepted.This change adds a U-mode gate at the top of
exec_csrfor machine-level CSR addresses. U-level and supervisor-level CSR accesses are unchanged.Validation
cargo test --lib: the targeted U-mode CSR-access tests pass, and the full library test suite passes with no regressions;-cpu maxreference shows SIGILL (132) for the same encodings in U-mode.Closes #297