mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/ppc: Fix VRMA to not check virtual page class key protection

Browse Source 
Hash virtual real mode addressing is defined by the architecture
to not perform virtual page class key protection checks.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
Nicholas Piggin 2024-08-06 23:13:17 +10:00
parent 87de77f6ae
commit fdd9cf281d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/ppc/mmu-hash64.c
View File

@ -993,6 +993,7 @@ bool ppc_hash64_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type,
int exec_prot, pp_prot, amr_prot, prot; int exec_prot, pp_prot, amr_prot, prot;
int need_prot; int need_prot;
hwaddr raddr; hwaddr raddr;
bool vrma = false;
/* /*
* Note on LPCR usage: 970 uses HID4, but our special variant of * Note on LPCR usage: 970 uses HID4, but our special variant of
@ -1022,6 +1023,7 @@ bool ppc_hash64_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type,
} }
} else if (ppc_hash64_use_vrma(env)) { } else if (ppc_hash64_use_vrma(env)) {
/* Emulated VRMA mode */ /* Emulated VRMA mode */
vrma = true;
slb = &vrma_slbe; slb = &vrma_slbe;
if (build_vrma_slbe(cpu, slb) != 0) { if (build_vrma_slbe(cpu, slb) != 0) {
/* Invalid VRMA setup, machine check */ /* Invalid VRMA setup, machine check */
@ -1136,7 +1138,12 @@ bool ppc_hash64_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type,
exec_prot = ppc_hash64_pte_noexec_guard(cpu, pte); exec_prot = ppc_hash64_pte_noexec_guard(cpu, pte);
pp_prot = ppc_hash64_pte_prot(mmu_idx, slb, pte); pp_prot = ppc_hash64_pte_prot(mmu_idx, slb, pte);
if (vrma) {
/* VRMA does not check keys */
amr_prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
} else {
amr_prot = ppc_hash64_amr_prot(cpu, pte); amr_prot = ppc_hash64_amr_prot(cpu, pte);
}
prot = exec_prot & pp_prot & amr_prot; prot = exec_prot & pp_prot & amr_prot;
need_prot = check_prot_access_type(PAGE_RWX, access_type); need_prot = check_prot_access_type(PAGE_RWX, access_type);