[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 3/3] target-arm: Implement the S2 MMU inputsize > p
From: |
Edgar E. Iglesias |
Subject: |
[Qemu-arm] [PATCH v2 3/3] target-arm: Implement the S2 MMU inputsize > pamax check |
Date: |
Thu, 21 Jan 2016 12:18:28 +0100 |
From: "Edgar E. Iglesias" <address@hidden>
Implement the inputsize > pamax check for Stage 2 translations.
We have multiple choices for how to respond to errors and
choose to fault.
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
target-arm/helper.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 4abeb4d..9a7ff5e 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -6808,7 +6808,7 @@ static bool get_phys_addr_lpae(CPUARMState *env,
target_ulong address,
*/
int startlevel = extract32(tcr->raw_tcr, 6, 2);
unsigned int pamax = arm_pamax(cpu);
- bool ok;
+ bool ok = true;
if (va_size == 32 || stride == 9) {
/* AArch32 or 4KB pages */
@@ -6818,9 +6818,17 @@ static bool get_phys_addr_lpae(CPUARMState *env,
target_ulong address,
level = 3 - startlevel;
}
- /* Check that the starting level is valid. */
- ok = check_s2_startlevel(cpu, va_size == 64, level,
- inputsize, stride, pamax);
+ if (va_size == 64 &&
+ inputsize > pamax &&
+ (arm_el_is_aa64(env, 1) || inputsize > 40)) {
+ /* We have multiple choices but choose to fault. */
+ ok = false;
+ }
+ if (ok) {
+ /* Check that the starting level is valid. */
+ ok = check_s2_startlevel(cpu, va_size == 64, level,
+ inputsize, stride, pamax);
+ }
if (!ok) {
/* AArch64 reports these as level 0 faults.
* AArch32 reports these as level 1 faults.
--
1.9.1
[Qemu-arm] [PATCH v2 2/3] target-arm: Make pamax an argument to check_s2_startlevel, Edgar E. Iglesias, 2016/01/21