[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/14] target-i386: Don't forbid NX bit on PAE PDEs a
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/14] target-i386: Don't forbid NX bit on PAE PDEs and PTEs |
Date: |
Thu, 28 Aug 2014 16:09:05 +0200 |
From: William Grant <address@hidden>
Commit e8f6d00c30ed88910d0d985f4b2bf41654172ceb ("target-i386: raise
page fault for reserved physical address bits") added a check that the
NX bit is not set on PAE PDPEs, but it also added it to rsvd_mask for
the rest of the function. This caused any PDEs or PTEs with NX set to be
erroneously rejected, making PAE guests with NX support unusable.
Signed-off-by: William Grant <address@hidden>
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
---
target-i386/helper.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 47b982b..30cb0d0 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -615,8 +615,8 @@ int x86_cpu_handle_mmu_fault(CPUState *cs, vaddr addr,
if (!(pdpe & PG_PRESENT_MASK)) {
goto do_fault;
}
- rsvd_mask |= PG_HI_USER_MASK | PG_NX_MASK;
- if (pdpe & rsvd_mask) {
+ rsvd_mask |= PG_HI_USER_MASK;
+ if (pdpe & (rsvd_mask | PG_NX_MASK)) {
goto do_fault_rsvd;
}
ptep = PG_NX_MASK | PG_USER_MASK | PG_RW_MASK;
--
1.8.3.1
- [Qemu-devel] [PULL 00/14] KVM changes for 2014-08-28, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 02/14] cpus: Define callback for QEMU "nmi" command, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 03/14] s390x: Convert QEMUMachine to MachineClass, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 04/14] s390x: Migrate to new NMI interface, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 01/14] kvm: run cpu state synchronization on target vcpu thread, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 05/14] spapr: Add support for new NMI interface, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 06/14] target-i386: Don't forbid NX bit on PAE PDEs and PTEs,
Paolo Bonzini <=
- [Qemu-devel] [PULL 07/14] x86: Use common variable range MTRR counts, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 09/14] x86: Clear MTRRs on vCPU reset, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 08/14] x86: kvm: Add MTRR support for kvm_get|put_msrs(), Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 11/14] vl: process -object after other backend options, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 10/14] checkpatch.pl: adjust typedef definition to QEMU coding style, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 12/14] target-i386: Add "mpx" CPU feature name, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 13/14] target-i386: Add "tsc_adjust" CPU feature name, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 14/14] mc146818rtc: reinitialize irq_reinject_on_ack_count on reset, Paolo Bonzini, 2014/08/28
- Re: [Qemu-devel] [PULL 00/14] KVM changes for 2014-08-28, Peter Maydell, 2014/08/28