Received: from eggs.gnu.org ([2001:4830:134:3::10]:37279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vouta-0005b2-Fa for qemu-devel@nongnu.org; Fri, 06 Dec 2013 07:52:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoutU-0002VE-0d for qemu-devel@nongnu.org; Fri, 06 Dec 2013 07:52:38 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45979 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoutT-0002Uw-QF for qemu-devel@nongnu.org; Fri, 06 Dec 2013 07:52:31 -0500 From: Alexander Graf Date: Fri, 6 Dec 2013 13:52:24 +0100 Message-Id: <1386334344-24620-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH] x86: only allow real mode to access 32bit without LMA List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: Michael Tokarev When we're running in non-64bit mode with qemu-system-x86_64 we can still end up with virtual addresses that are above the 32bit boundary if a segment offset is set up. GNU Hurd does exactly that. It sets the segment offset to 0x80000000 and puts its EIP value to 0x8xxxxxxx to access low memory. This doesn't hit us when we enable paging, as there we just mask away the unused bits. But with real mode, we assume that vaddr == paddr which is wrong in this case. Real hardware wraps the virtual address around at the 32bit boundary. So let's do the same. This fixes booting GNU Hurd in qemu-system-x86_64 for me. Reported-by: Michael Tokarev Signed-off-by: Alexander Graf --- target-i386/helper.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target-i386/helper.c b/target-i386/helper.c index 7c196ff..ed965d6 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -531,6 +531,12 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, if (!(env->cr[0] & CR0_PG_MASK)) { pte = addr; +#ifdef TARGET_X86_64 + if (!(env->hflags & HF_LMA_MASK)) { + /* Without long mode we can only address 32bits in real mode */ + pte = (uint32_t)pte; + } +#endif virt_addr = addr & TARGET_PAGE_MASK; prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; page_size = 4096; -- 1.8.1.4