[PATCH] uml: separate libc-dependent uaccess code
The serial UML OS-abstraction layer patch (um/kernel dir). This moves all systemcalls from uaccess_user.c file under os-Linux dir Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com> Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
0e76422ca5
commit
bb57842625
|
@ -199,6 +199,12 @@ extern void forward_pending_sigio(int target);
|
||||||
extern int start_fork_tramp(void *arg, unsigned long temp_stack,
|
extern int start_fork_tramp(void *arg, unsigned long temp_stack,
|
||||||
int clone_flags, int (*tramp)(void *));
|
int clone_flags, int (*tramp)(void *));
|
||||||
|
|
||||||
|
/* uaccess.c */
|
||||||
|
extern unsigned long __do_user_copy(void *to, const void *from, int n,
|
||||||
|
void **fault_addr, void **fault_catcher,
|
||||||
|
void (*op)(void *to, const void *from,
|
||||||
|
int n), int *faulted_out);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -8,10 +8,6 @@
|
||||||
|
|
||||||
extern int __do_copy_to_user(void *to, const void *from, int n,
|
extern int __do_copy_to_user(void *to, const void *from, int n,
|
||||||
void **fault_addr, void **fault_catcher);
|
void **fault_addr, void **fault_catcher);
|
||||||
extern unsigned long __do_user_copy(void *to, const void *from, int n,
|
|
||||||
void **fault_addr, void **fault_catcher,
|
|
||||||
void (*op)(void *to, const void *from,
|
|
||||||
int n), int *faulted_out);
|
|
||||||
void __do_copy(void *to, const void *from, int n);
|
void __do_copy(void *to, const void *from, int n);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -10,7 +10,7 @@ obj-y = config.o exec_kern.o exitcode.o \
|
||||||
helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o physmem.o \
|
helper.o init_task.o irq.o irq_user.o ksyms.o main.o mem.o physmem.o \
|
||||||
process_kern.o ptrace.o reboot.o resource.o sigio_user.o sigio_kern.o \
|
process_kern.o ptrace.o reboot.o resource.o sigio_user.o sigio_kern.o \
|
||||||
signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o time.o \
|
signal_kern.o signal_user.o smp.o syscall_kern.o sysrq.o time.o \
|
||||||
time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o um_arch.o \
|
time_kern.o tlb.o trap_kern.o trap_user.o uaccess.o um_arch.o \
|
||||||
umid.o user_util.o
|
umid.o user_util.o
|
||||||
|
|
||||||
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
|
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
#include "uml_uaccess.h"
|
#include "uml_uaccess.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
#include "kern_util.h"
|
#include "kern_util.h"
|
||||||
|
#include "os.h"
|
||||||
|
|
||||||
int __do_copy_from_user(void *to, const void *from, int n,
|
int __do_copy_from_user(void *to, const void *from, int n,
|
||||||
void **fault_addr, void **fault_catcher)
|
void **fault_addr, void **fault_catcher)
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk)
|
||||||
|
* Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
|
||||||
|
* Licensed under the GPL
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* These are here rather than tt/uaccess.c because skas mode needs them in
|
||||||
|
* order to do SIGBUS recovery when a tmpfs mount runs out of room.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/string.h>
|
||||||
|
#include "os.h"
|
||||||
|
|
||||||
|
void __do_copy(void *to, const void *from, int n)
|
||||||
|
{
|
||||||
|
memcpy(to, from, n);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int __do_copy_to_user(void *to, const void *from, int n,
|
||||||
|
void **fault_addr, void **fault_catcher)
|
||||||
|
{
|
||||||
|
unsigned long fault;
|
||||||
|
int faulted;
|
||||||
|
|
||||||
|
fault = __do_user_copy(to, from, n, fault_addr, fault_catcher,
|
||||||
|
__do_copy, &faulted);
|
||||||
|
if(!faulted) return(0);
|
||||||
|
else return(n - (fault - (unsigned long) to));
|
||||||
|
}
|
|
@ -1,64 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk)
|
|
||||||
* Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
|
|
||||||
* Licensed under the GPL
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <setjmp.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
/* These are here rather than tt/uaccess.c because skas mode needs them in
|
|
||||||
* order to do SIGBUS recovery when a tmpfs mount runs out of room.
|
|
||||||
*/
|
|
||||||
|
|
||||||
unsigned long __do_user_copy(void *to, const void *from, int n,
|
|
||||||
void **fault_addr, void **fault_catcher,
|
|
||||||
void (*op)(void *to, const void *from,
|
|
||||||
int n), int *faulted_out)
|
|
||||||
{
|
|
||||||
unsigned long *faddrp = (unsigned long *) fault_addr, ret;
|
|
||||||
|
|
||||||
sigjmp_buf jbuf;
|
|
||||||
*fault_catcher = &jbuf;
|
|
||||||
if(sigsetjmp(jbuf, 1) == 0){
|
|
||||||
(*op)(to, from, n);
|
|
||||||
ret = 0;
|
|
||||||
*faulted_out = 0;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ret = *faddrp;
|
|
||||||
*faulted_out = 1;
|
|
||||||
}
|
|
||||||
*fault_addr = NULL;
|
|
||||||
*fault_catcher = NULL;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void __do_copy(void *to, const void *from, int n)
|
|
||||||
{
|
|
||||||
memcpy(to, from, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int __do_copy_to_user(void *to, const void *from, int n,
|
|
||||||
void **fault_addr, void **fault_catcher)
|
|
||||||
{
|
|
||||||
unsigned long fault;
|
|
||||||
int faulted;
|
|
||||||
|
|
||||||
fault = __do_user_copy(to, from, n, fault_addr, fault_catcher,
|
|
||||||
__do_copy, &faulted);
|
|
||||||
if(!faulted) return(0);
|
|
||||||
else return(n - (fault - (unsigned long) to));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Overrides for Emacs so that we follow Linus's tabbing style.
|
|
||||||
* Emacs will notice this stuff at the end of the file and automatically
|
|
||||||
* adjust the settings for this buffer only. This must remain at the end
|
|
||||||
* of the file.
|
|
||||||
* ---------------------------------------------------------------------------
|
|
||||||
* Local variables:
|
|
||||||
* c-file-style: "linux"
|
|
||||||
* End:
|
|
||||||
*/
|
|
|
@ -4,10 +4,10 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
obj-y = aio.o elf_aux.o file.o mem.o process.o signal.o start_up.o time.o \
|
obj-y = aio.o elf_aux.o file.o mem.o process.o signal.o start_up.o time.o \
|
||||||
tt.o tty.o user_syms.o drivers/ sys-$(SUBARCH)/
|
tt.o tty.o uaccess.o user_syms.o drivers/ sys-$(SUBARCH)/
|
||||||
|
|
||||||
USER_OBJS := aio.o elf_aux.o file.o mem.o process.o signal.o start_up.o \
|
USER_OBJS := aio.o elf_aux.o file.o mem.o process.o signal.o start_up.o \
|
||||||
time.o tt.o tty.o
|
time.o tt.o tty.o uaccess.o
|
||||||
|
|
||||||
elf_aux.o: $(ARCH_DIR)/kernel-offsets.h
|
elf_aux.o: $(ARCH_DIR)/kernel-offsets.h
|
||||||
CFLAGS_elf_aux.o += -I$(objtree)/arch/um
|
CFLAGS_elf_aux.o += -I$(objtree)/arch/um
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk)
|
||||||
|
* Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
|
||||||
|
* Licensed under the GPL
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <setjmp.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
unsigned long __do_user_copy(void *to, const void *from, int n,
|
||||||
|
void **fault_addr, void **fault_catcher,
|
||||||
|
void (*op)(void *to, const void *from,
|
||||||
|
int n), int *faulted_out)
|
||||||
|
{
|
||||||
|
unsigned long *faddrp = (unsigned long *) fault_addr, ret;
|
||||||
|
|
||||||
|
sigjmp_buf jbuf;
|
||||||
|
*fault_catcher = &jbuf;
|
||||||
|
if(sigsetjmp(jbuf, 1) == 0){
|
||||||
|
(*op)(to, from, n);
|
||||||
|
ret = 0;
|
||||||
|
*faulted_out = 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ret = *faddrp;
|
||||||
|
*faulted_out = 1;
|
||||||
|
}
|
||||||
|
*fault_addr = NULL;
|
||||||
|
*fault_catcher = NULL;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue