Browse Source
Merge pull request #1866 from chihminchao/prioritize-misaligned-superpage
mmu: raise the prioity of misaligned superpage
pull/1474/merge
Andrew Waterman
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
2 additions and
2 deletions
-
riscv/mmu.cc
|
|
|
@ -553,6 +553,8 @@ reg_t mmu_t::walk(mem_access_info_t access_info) |
|
|
|
// not shadow stack access xwr=110 or xwr=010 page cause page fault
|
|
|
|
// shadow stack access with PTE_X moved to following check
|
|
|
|
break; |
|
|
|
} else if ((ppn & ((reg_t(1) << ptshift) - 1)) != 0) { |
|
|
|
break; |
|
|
|
} else if (ss_page && ((type == STORE && !ss_access) || access_info.flags.clean_inval)) { |
|
|
|
// non-shadow-stack store or CBO with xwr = 010 causes access-fault
|
|
|
|
throw trap_store_access_fault(virt, addr, 0, 0); |
|
|
|
@ -566,8 +568,6 @@ reg_t mmu_t::walk(mem_access_info_t access_info) |
|
|
|
type == LOAD ? !(sse && ss_page) && !(pte & PTE_R) && !(mxr && (pte & PTE_X)) : |
|
|
|
!(pte & PTE_W)) { |
|
|
|
break; |
|
|
|
} else if ((ppn & ((reg_t(1) << ptshift) - 1)) != 0) { |
|
|
|
break; |
|
|
|
} else { |
|
|
|
reg_t ad = PTE_A | ((type == STORE) * PTE_D); |
|
|
|
|
|
|
|
|
