On 2 January 2015 at 17:33, Andrew Jones <drjo...@redhat.com> wrote: > D4.5.1 "Memory access control:Access permissions for instruction > execution" states > "... > In addition: > * For the EL1&0 translation regime, if the value of the AP[2:1] bits > is 0b01, permitting write access from EL0, then the PXN bit is > treated as if it has the value 1, regardless of its actual value. > ..."
As far as I can see this only applies to 64-bit translations (there is no equivalent wording in the 32-bit VMSA section of the ARM ARM), so I think the condition should be on va_size == 64, not on ARM_FEATURE_V8. > @@ -4960,6 +4960,8 @@ static int get_phys_addr_lpae(CPUARMState *env, > target_ulong address, > *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; > if ((arm_feature(env, ARM_FEATURE_V8) && is_user && (attrs & (1 << 12))) > || > (!arm_feature(env, ARM_FEATURE_V8) && (attrs & (1 << 12))) || > + (arm_feature(env, ARM_FEATURE_V8) && !is_user && > + ((attrs & (3 << 4)) == (1 << 4) /* AP[2:1] == 0b01 */)) || > (!is_user && (attrs & (1 << 11)))) { > /* XN/UXN or PXN. Since we only implement EL0/EL1 we unconditionally > * treat XN/UXN as UXN for v8. This condition is becoming pretty badly overweight. I think that rather than just add another clause to it (especially one which needs an embedded /* comment */ !) we should split it up somehow. (Consider also that as per the comment we're going to need to distinguish UXN from XN shortly for EL2/EL3.) We don't implement the SCTLR.UWXN/WXN bits either -- don't know if you care about those. thanks -- PMM