2006-07-10 05:45:13 -06:00
|
|
|
/*
|
2007-10-16 02:27:00 -06:00
|
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
2005-04-16 16:20:36 -06:00
|
|
|
* Licensed under the GPL
|
|
|
|
*/
|
|
|
|
|
2011-08-18 13:14:10 -06:00
|
|
|
#include <linux/stddef.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/ptrace.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/current.h>
|
|
|
|
#include <asm/processor.h>
|
|
|
|
#include <asm/uaccess.h>
|
uml: fix stub address calculations
The calculation of CONFIG_STUB_CODE and CONFIG_STUB_DATA didn't take into
account anything but 3G/1G and 2G/2G, leaving the other vmsplits out in the
cold.
I'd rather not duplicate the four known host vmsplit cases for each of these
symbols. I'd also like to calculate them based on the highest userspace
address.
The Kconfig language seems not to allow calculation of hex constants, so I
moved this to as-layout.h. CONFIG_STUB_CODE, CONFIG_STUB_DATA, and
CONFIG_STUB_START are now gone. In their place are STUB_CODE, STUB_DATA, and
STUB_START in as-layout.h.
i386 and x86_64 seem to differ as to whether an unadorned constant is an int
or a long, so I cast them to unsigned long so they can be printed
consistently. However, they are also used in stub.S, where C types don't work
so well. So, there are ASM_ versions of these constants for use in stub.S. I
also ifdef-ed the non-asm-friendly portion of as-layout.h.
With this in place, most of the rest of this patch is changing CONFIG_STUB_*
to STUB_*, except in stub.S, where they are changed to ASM_STUB_*.
defconfig has the old symbols deleted.
I also print these addresses out in case there is any problem mapping them on
the host.
The two stub.S files had some trailing whitespace, so that is cleaned up here.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-16 02:27:33 -06:00
|
|
|
#include "as-layout.h"
|
2005-04-16 16:20:36 -06:00
|
|
|
#include "mem_user.h"
|
2007-10-16 02:27:00 -06:00
|
|
|
#include "skas.h"
|
2005-04-16 16:20:36 -06:00
|
|
|
#include "os.h"
|
2008-08-18 02:01:47 -06:00
|
|
|
#include "internal.h"
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
void flush_thread(void)
|
|
|
|
{
|
2007-10-16 02:26:58 -06:00
|
|
|
void *data = NULL;
|
|
|
|
int ret;
|
|
|
|
|
2006-03-31 03:30:22 -07:00
|
|
|
arch_flush_thread(¤t->thread.arch);
|
2007-10-16 02:26:58 -06:00
|
|
|
|
uml: cover stubs with a VMA
Give the stubs a VMA. This allows the removal of a truly nasty kludge to make
sure that mm->nr_ptes was correct in exit_mmap. The underlying problem was
always that the stubs, which have ptes, and thus allocated a page table,
weren't covered by a VMA.
This patch fixes that by using install_special_mapping in arch_dup_mmap and
activate_context to create the VMA. The stubs have to be moved, since
shift_arg_pages seems to assume that the stack is the only VMA present at that
point during exec, and uses vma_adjust to fiddle its VMA. However, that
extends the stub VMA by the amount removed from the stack VMA.
To avoid this problem, the stubs were moved to a different fixed location at
the start of the address space.
The init_stub_pte calls were moved from init_new_context to arch_dup_mmap
because I was occasionally seeing arch_dup_mmap not being called, causing
exit_mmap to die. Rather than figure out what was really happening, I decided
it was cleaner to just move the calls so that there's no doubt that both the
pte and VMA creation happen, no matter what. arch_exit_mmap is used to clear
the stub ptes at exit time.
The STUB_* constants in as-layout.h no longer depend on UM_TASK_SIZE, that
that definition is removed, along with the comments complaining about gcc.
Because the stubs are no longer at the top of the address space, some care is
needed while flushing TLBs. update_pte_range checks for addresses in the stub
range and skips them. flush_thread now issues two unmaps, one for the range
before STUB_START and one for the range after STUB_END.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-02-04 23:31:01 -07:00
|
|
|
ret = unmap(¤t->mm->context.id, 0, STUB_START, 0, &data);
|
|
|
|
ret = ret || unmap(¤t->mm->context.id, STUB_END,
|
2008-02-08 05:22:07 -07:00
|
|
|
host_task_size - STUB_END, 1, &data);
|
2007-10-16 02:27:00 -06:00
|
|
|
if (ret) {
|
|
|
|
printk(KERN_ERR "flush_thread - clearing address space failed, "
|
2007-10-16 02:26:58 -06:00
|
|
|
"err = %d\n", ret);
|
|
|
|
force_sig(SIGKILL, current);
|
|
|
|
}
|
|
|
|
|
2007-10-16 02:27:06 -06:00
|
|
|
__switch_mm(¤t->mm->context.id);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
|
|
|
|
{
|
2012-09-05 21:20:33 -06:00
|
|
|
get_safe_registers(regs->regs.gp, regs->regs.fp);
|
2007-10-16 02:26:58 -06:00
|
|
|
PT_REGS_IP(regs) = eip;
|
|
|
|
PT_REGS_SP(regs) = esp;
|
2012-09-03 01:24:18 -06:00
|
|
|
current->ptrace &= ~PT_DTRACE;
|
2006-07-10 05:45:13 -06:00
|
|
|
#ifdef SUBARCH_EXECVE1
|
2012-09-03 01:24:18 -06:00
|
|
|
SUBARCH_EXECVE1(regs->regs);
|
2006-07-10 05:45:13 -06:00
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2012-09-03 01:24:18 -06:00
|
|
|
EXPORT_SYMBOL(start_thread);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2010-09-22 14:05:07 -06:00
|
|
|
long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
long err;
|
|
|
|
|
2012-09-03 01:24:18 -06:00
|
|
|
err = do_execve(file, argv, env, ¤t->thread.regs);
|
2007-10-16 02:27:00 -06:00
|
|
|
if (!err)
|
2007-10-16 02:27:05 -06:00
|
|
|
UML_LONGJMP(current->thread.exec_buf, 1);
|
2007-10-16 02:27:00 -06:00
|
|
|
return err;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2010-09-22 14:05:07 -06:00
|
|
|
long sys_execve(const char __user *file, const char __user *const __user *argv,
|
|
|
|
const char __user *const __user *env)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
long error;
|
|
|
|
char *filename;
|
|
|
|
|
2006-03-31 03:30:15 -07:00
|
|
|
filename = getname(file);
|
2005-04-16 16:20:36 -06:00
|
|
|
error = PTR_ERR(filename);
|
|
|
|
if (IS_ERR(filename)) goto out;
|
2012-09-03 01:24:18 -06:00
|
|
|
error = do_execve(filename, argv, env, ¤t->thread.regs);
|
2005-04-16 16:20:36 -06:00
|
|
|
putname(filename);
|
|
|
|
out:
|
2007-10-16 02:27:00 -06:00
|
|
|
return error;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|