[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] linux-user, x86: use target_mmap() to allocate idt,
From: |
Kirill A. Shutemov |
Subject: |
[Qemu-devel] [PATCH] linux-user, x86: use target_mmap() to allocate idt, gdt and ldt tables |
Date: |
Fri, 17 Oct 2008 09:34:24 +0300 |
env->*dt.base should fits target address space, so we should use
target_mmap to allocate it.
Signed-off-by: Kirill A. Shutemov <address@hidden>
---
linux-user/main.c | 23 +++++++++++++++--------
linux-user/syscall.c | 10 ++++++----
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 25b2867..61d497e 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -23,6 +23,7 @@
#include <string.h>
#include <errno.h>
#include <unistd.h>
+#include <sys/mman.h>
#include "qemu.h"
#include "qemu-common.h"
@@ -283,9 +284,8 @@ static void write_dt(void *ptr, unsigned long addr,
unsigned long limit,
p[1] = tswap32(e2);
}
+uint64_t *idt_table;
#ifdef TARGET_X86_64
-uint64_t idt_table[512];
-
static void set_gate64(void *ptr, unsigned int type, unsigned int dpl,
uint64_t addr, unsigned int sel)
{
@@ -304,8 +304,6 @@ static void set_idt(int n, unsigned int dpl)
set_gate64(idt_table + n * 2, 0, dpl, 0, 0);
}
#else
-uint64_t idt_table[256];
-
static void set_gate(void *ptr, unsigned int type, unsigned int dpl,
uint32_t addr, unsigned int sel)
{
@@ -2500,8 +2498,15 @@ int main(int argc, char **argv, char **envp)
#endif
/* linux interrupt setup */
- env->idt.base = h2g(idt_table);
- env->idt.limit = sizeof(idt_table) - 1;
+#ifndef TARGET_ABI32
+ env->idt.limit = 511;
+#else
+ env->idt.limit = 255;
+#endif
+ env->idt.base = target_mmap(0, sizeof(uint64_t) * (env->idt.limit + 1),
+ PROT_READ|PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+ idt_table = g2h(env->idt.base);
set_idt(0, 0);
set_idt(1, 0);
set_idt(2, 0);
@@ -2527,9 +2532,11 @@ int main(int argc, char **argv, char **envp)
/* linux segment setup */
{
uint64_t *gdt_table;
- gdt_table = qemu_mallocz(sizeof(uint64_t) * TARGET_GDT_ENTRIES);
- env->gdt.base = h2g((unsigned long)gdt_table);
+ env->gdt.base = target_mmap(0, sizeof(uint64_t) * TARGET_GDT_ENTRIES,
+ PROT_READ|PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
env->gdt.limit = sizeof(uint64_t) * TARGET_GDT_ENTRIES - 1;
+ gdt_table = g2h(env->gdt.base);
#ifdef TARGET_ABI32
write_dt(&gdt_table[__USER_CS >> 3], 0, 0xfffff,
DESC_G_MASK | DESC_B_MASK | DESC_P_MASK | DESC_S_MASK |
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index db3538b..27bd7e1 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2823,12 +2823,14 @@ static abi_long write_ldt(CPUX86State *env,
}
/* allocate the LDT */
if (!ldt_table) {
- ldt_table = malloc(TARGET_LDT_ENTRIES * TARGET_LDT_ENTRY_SIZE);
- if (!ldt_table)
+ env->ldt.base = target_mmap(0, TARGET_LDT_ENTRIES *
TARGET_LDT_ENTRY_SIZE,
+ PROT_READ|PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
+ if (env->ldt.base == -1)
return -TARGET_ENOMEM;
- memset(ldt_table, 0, TARGET_LDT_ENTRIES * TARGET_LDT_ENTRY_SIZE);
- env->ldt.base = h2g((unsigned long)ldt_table);
+ memset(g2h(env->ldt.base), 0, TARGET_LDT_ENTRIES *
TARGET_LDT_ENTRY_SIZE);
env->ldt.limit = 0xffff;
+ ldt_table = g2h(env->ldt.base);
}
/* NOTE: same code as Linux kernel */
--
1.5.6.5.GIT
- [Qemu-devel] [PATCH] Fix and cleanup IPCOP_sem* ipc calls handling, (continued)
- [Qemu-devel] [PATCH] Fix and cleanup IPCOP_sem* ipc calls handling, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] Implement sem* syscalls, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] Fix and cleanup IPCOP_shm* ipc calls handling, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] Implement shm* syscalls, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] Fix fstatat64()/newfstatat() syscall implementation, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] Introduce --enable-binfmt-misc configure option, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] Rewrite mmap_find_vma() to work fine on 64-bit hosts with 32-bit targets, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] mremap(): handle MREMAP_FIXED and MREMAP_MAYMOVE correctly, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] shmat(): use mmap_find_vma to find free memory area, Kirill A. Shutemov, 2008/10/13
- [Qemu-devel] [PATCH] mmap: add check if requested memory area fits target address space, Kirill A. Shutemov, 2008/10/17
- [Qemu-devel] [PATCH] linux-user, x86: use target_mmap() to allocate idt, gdt and ldt tables,
Kirill A. Shutemov <=
- Re: [Qemu-devel] [PATCH] mmap: add check if requested memory area fits target address space, andrzej zaborowski, 2008/10/27
- Re: [Qemu-devel] [PATCH] mmap: add check if requested memory area fits target address space, Kirill A. Shutemov, 2008/10/27
- Re: [Qemu-devel] [PATCH] mmap: add check if requested memory area fits target address space, Andreas Schwab, 2008/10/27
- Re: [Qemu-devel] [PATCH] mmap: add check if requested memory area fits target address space, Kirill A. Shutemov, 2008/10/27
- Re: [Qemu-devel] [PATCH] mmap: add check if requested memory area fits target address space, andrzej zaborowski, 2008/10/27
- Re: [Qemu-devel] [PATCH] mmap: add check if requested memory area fits target address space, Kirill A. Shutemov, 2008/10/27
- [Qemu-devel] [PATCH, v2] mmap: add check if requested memory area fits target address space, Kirill A. Shutemov, 2008/10/27
- Re: [Qemu-devel] [PATCH] mremap(): handle MREMAP_FIXED and MREMAP_MAYMOVE correctly, Vince Weaver, 2008/10/14
- Re: [Qemu-devel] [PATCH] mremap(): handle MREMAP_FIXED and MREMAP_MAYMOVE correctly, Kirill A. Shutemov, 2008/10/14
- Re: [Qemu-devel] [PATCH] Rewrite mmap_find_vma() to work fine on 64-bit hosts with 32-bit targets, Vince Weaver, 2008/10/26