x86: only allow real mode to access 32bit without LMA
PATCH 1/1 x86: only allow real mode to access 32bit without LMA
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.
--- target-i386/helper.c | 6 ++++++ 1 file changed, 6 insertions(+)
target-i386/helper.c +6 -0
@@ -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 ;
Signature · 1 line
1.8.1.4
Quoted 12 lines · Alexander Graf
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
0x80000000and 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.
Quoted 7 lines
This fixes booting GNU Hurd in qemu-system-x86_64 for me.
Reported-by Michael Tokarev <[email protected]>Signed-off-by Alexander Graf <[email protected]>--- target-i386/helper.c | 6 ++++++ 1 file changed, 6 insertions(+)
r~
Quoted 27 lines · Alexander Graf
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
0x80000000and 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 <[email protected]>Signed-off-by Alexander Graf <[email protected]>--- target-i386/helper.c | 6 ++++++ 1 file changed, 6 insertions(+)target-i386/helper.c +0
-0@@ -531,6 +531,12 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,if (!(env->cr[0 ] &CR0_PG_MASK )) {
target-i386/helper.c int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, · line 542
Quoted 10 lines
target-i386/helper.c +6
-0pte = 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 ;
Well, it isn't much of testing, I too just run hurd image and see that it can work in qemu-x86_64 tcg mode, while without this patch it segfaults.
Should I apply this to trivial queue? :)
Thanks,
/mjt
Am 06.12.2013 19:48, schrieb Michael Tokarev:
Quoted 45 lines
Quoted 27 lines · Alexander Graf
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
0x80000000and 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 <[email protected]>Signed-off-by Alexander Graf <[email protected]>--- target-i386/helper.c | 6 ++++++ 1 file changed, 6 insertions(+)target-i386/helper.c +0
-0@@ -531,6 +531,12 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr,if (!(env->cr[0 ] &CR0_PG_MASK )) {target-i386/helper.c int cpu_x86_handle_mmu_fault(CPUX86State *env, target_ulong addr, · line 542
Quoted 10 lines
target-i386/helper.c +6
-0pte = 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 ;Tested-by Michael Tokarev <[email protected]>Well, it isn't much of testing, I too just run hurd image and see that it can work in qemu-x86_64 tcg mode, while without this patch it segfaults.
Quoted 5 lines
Should I apply this to trivial queue? :)
Thanks,
/mjt
Maybe your trivial queue would be the fasted way to get it into the official repository. :-)
I added qemu-stable to the addressees, because this is useful for the stable branches as well.
Regards,
Stefan
Quoted 7 lines · Alexander Graf
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
0x80000000and puts its EIP value to 0x8xxxxxxx to access low memory.
Quoted 6 lines
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.
Since i386 tcg code has no active maintainer and since this is a rather simple change, I'll queue it up to trivial-patches.
Thank you!
/mjt