uml: throw out CHOOSE_MODE
The next stage after removing code which depends on CONFIG_MODE_TT is removing the CHOOSE_MODE abstraction, which provided both compile-time and run-time branching to either tt-mode or skas-mode code. This patch removes choose-mode.h and all inclusions of it, and replaces all CHOOSE_MODE invocations with the skas branch. This leaves a number of trivial functions which will be dealt with in a later patch. There are some changes in the uaccess and tls support which go somewhat beyond this and eliminate some of the now-redundant functions. 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>
This commit is contained in:
Jeff Dike
committed by
Linus Torvalds
Linus Torvalds
parent
4c9e138513
commit
6aa802ce6a
@@ -1,20 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
#ifndef __CHOOSE_MODE_H__
|
||||
#define __CHOOSE_MODE_H__
|
||||
|
||||
#include "uml-config.h"
|
||||
|
||||
#define CHOOSE_MODE(tt, skas) (skas)
|
||||
|
||||
#define CHOOSE_MODE_PROC(tt, skas, args...) \
|
||||
CHOOSE_MODE(tt(args), skas(args))
|
||||
|
||||
#ifndef __CHOOSE_MODE
|
||||
#define __CHOOSE_MODE(tt, skas) CHOOSE_MODE(tt, skas)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@@ -1,21 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
#ifndef __SKAS_UACCESS_H
|
||||
#define __SKAS_UACCESS_H
|
||||
|
||||
#include "asm/errno.h"
|
||||
|
||||
/* No SKAS-specific checking. */
|
||||
#define access_ok_skas(type, addr, size) 0
|
||||
|
||||
extern int copy_from_user_skas(void *to, const void __user *from, int n);
|
||||
extern int copy_to_user_skas(void __user *to, const void *from, int n);
|
||||
extern int strncpy_from_user_skas(char *dst, const char __user *src, int count);
|
||||
extern int __clear_user_skas(void __user *mem, int len);
|
||||
extern int clear_user_skas(void __user *mem, int len);
|
||||
extern int strnlen_user_skas(const void __user *str, int len);
|
||||
|
||||
#endif
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
|
||||
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
||||
* Licensed under the GPL
|
||||
*/
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#include "uml-config.h"
|
||||
#include "user_constants.h"
|
||||
#include "sysdep/faultinfo.h"
|
||||
#include "choose-mode.h"
|
||||
|
||||
#define MAX_REG_NR (UM_FRAME_SIZE / sizeof(unsigned long))
|
||||
#define MAX_REG_OFFSET (UM_FRAME_SIZE)
|
||||
@@ -67,40 +66,23 @@ union uml_pt_regs {
|
||||
#define EMPTY_UML_PT_REGS { }
|
||||
|
||||
#define UPT_SC(r) ((r)->tt.sc)
|
||||
#define UPT_IP(r) \
|
||||
__CHOOSE_MODE(SC_IP(UPT_SC(r)), REGS_IP((r)->skas.regs))
|
||||
#define UPT_SP(r) \
|
||||
__CHOOSE_MODE(SC_SP(UPT_SC(r)), REGS_SP((r)->skas.regs))
|
||||
#define UPT_EFLAGS(r) \
|
||||
__CHOOSE_MODE(SC_EFLAGS(UPT_SC(r)), REGS_EFLAGS((r)->skas.regs))
|
||||
#define UPT_EAX(r) \
|
||||
__CHOOSE_MODE(SC_EAX(UPT_SC(r)), REGS_EAX((r)->skas.regs))
|
||||
#define UPT_EBX(r) \
|
||||
__CHOOSE_MODE(SC_EBX(UPT_SC(r)), REGS_EBX((r)->skas.regs))
|
||||
#define UPT_ECX(r) \
|
||||
__CHOOSE_MODE(SC_ECX(UPT_SC(r)), REGS_ECX((r)->skas.regs))
|
||||
#define UPT_EDX(r) \
|
||||
__CHOOSE_MODE(SC_EDX(UPT_SC(r)), REGS_EDX((r)->skas.regs))
|
||||
#define UPT_ESI(r) \
|
||||
__CHOOSE_MODE(SC_ESI(UPT_SC(r)), REGS_ESI((r)->skas.regs))
|
||||
#define UPT_EDI(r) \
|
||||
__CHOOSE_MODE(SC_EDI(UPT_SC(r)), REGS_EDI((r)->skas.regs))
|
||||
#define UPT_EBP(r) \
|
||||
__CHOOSE_MODE(SC_EBP(UPT_SC(r)), REGS_EBP((r)->skas.regs))
|
||||
#define UPT_ORIG_EAX(r) \
|
||||
__CHOOSE_MODE((r)->tt.syscall, (r)->skas.syscall)
|
||||
#define UPT_CS(r) \
|
||||
__CHOOSE_MODE(SC_CS(UPT_SC(r)), REGS_CS((r)->skas.regs))
|
||||
#define UPT_SS(r) \
|
||||
__CHOOSE_MODE(SC_SS(UPT_SC(r)), REGS_SS((r)->skas.regs))
|
||||
#define UPT_DS(r) \
|
||||
__CHOOSE_MODE(SC_DS(UPT_SC(r)), REGS_DS((r)->skas.regs))
|
||||
#define UPT_ES(r) \
|
||||
__CHOOSE_MODE(SC_ES(UPT_SC(r)), REGS_ES((r)->skas.regs))
|
||||
#define UPT_FS(r) \
|
||||
__CHOOSE_MODE(SC_FS(UPT_SC(r)), REGS_FS((r)->skas.regs))
|
||||
#define UPT_GS(r) \
|
||||
__CHOOSE_MODE(SC_GS(UPT_SC(r)), REGS_GS((r)->skas.regs))
|
||||
#define UPT_IP(r) REGS_IP((r)->skas.regs)
|
||||
#define UPT_SP(r) REGS_SP((r)->skas.regs)
|
||||
#define UPT_EFLAGS(r) REGS_EFLAGS((r)->skas.regs)
|
||||
#define UPT_EAX(r) REGS_EAX((r)->skas.regs)
|
||||
#define UPT_EBX(r) REGS_EBX((r)->skas.regs)
|
||||
#define UPT_ECX(r) REGS_ECX((r)->skas.regs)
|
||||
#define UPT_EDX(r) REGS_EDX((r)->skas.regs)
|
||||
#define UPT_ESI(r) REGS_ESI((r)->skas.regs)
|
||||
#define UPT_EDI(r) REGS_EDI((r)->skas.regs)
|
||||
#define UPT_EBP(r) REGS_EBP((r)->skas.regs)
|
||||
#define UPT_ORIG_EAX(r) ((r)->skas.syscall)
|
||||
#define UPT_CS(r) REGS_CS((r)->skas.regs)
|
||||
#define UPT_SS(r) REGS_SS((r)->skas.regs)
|
||||
#define UPT_DS(r) REGS_DS((r)->skas.regs)
|
||||
#define UPT_ES(r) REGS_ES((r)->skas.regs)
|
||||
#define UPT_FS(r) REGS_FS((r)->skas.regs)
|
||||
#define UPT_GS(r) REGS_GS((r)->skas.regs)
|
||||
|
||||
#define UPT_SYSCALL_ARG1(r) UPT_EBX(r)
|
||||
#define UPT_SYSCALL_ARG2(r) UPT_ECX(r)
|
||||
@@ -111,8 +93,7 @@ union uml_pt_regs {
|
||||
|
||||
extern int user_context(unsigned long sp);
|
||||
|
||||
#define UPT_IS_USER(r) \
|
||||
CHOOSE_MODE(user_context(UPT_SP(r)), (r)->skas.is_user)
|
||||
#define UPT_IS_USER(r) ((r)->skas.is_user)
|
||||
|
||||
struct syscall_args {
|
||||
unsigned long args[6];
|
||||
@@ -181,18 +162,14 @@ struct syscall_args {
|
||||
} while (0)
|
||||
|
||||
#define UPT_SET_SYSCALL_RETURN(r, res) \
|
||||
CHOOSE_MODE(SC_SET_SYSCALL_RETURN(UPT_SC(r), (res)), \
|
||||
REGS_SET_SYSCALL_RETURN((r)->skas.regs, (res)))
|
||||
REGS_SET_SYSCALL_RETURN((r)->skas.regs, (res))
|
||||
|
||||
#define UPT_RESTART_SYSCALL(r) \
|
||||
CHOOSE_MODE(SC_RESTART_SYSCALL(UPT_SC(r)), \
|
||||
REGS_RESTART_SYSCALL((r)->skas.regs))
|
||||
#define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->skas.regs)
|
||||
|
||||
#define UPT_ORIG_SYSCALL(r) UPT_EAX(r)
|
||||
#define UPT_SYSCALL_NR(r) UPT_ORIG_EAX(r)
|
||||
#define UPT_SYSCALL_RET(r) UPT_EAX(r)
|
||||
|
||||
#define UPT_FAULTINFO(r) \
|
||||
CHOOSE_MODE((&(r)->tt.faultinfo), (&(r)->skas.faultinfo))
|
||||
#define UPT_FAULTINFO(r) (&(r)->skas.faultinfo)
|
||||
|
||||
#endif
|
||||
|
||||
@@ -84,8 +84,6 @@
|
||||
|
||||
#define REGS_ERR(r) ((r)->fault_type)
|
||||
|
||||
#include "choose-mode.h"
|
||||
|
||||
/* XXX */
|
||||
union uml_pt_regs {
|
||||
struct skas_regs {
|
||||
@@ -99,48 +97,45 @@ union uml_pt_regs {
|
||||
|
||||
#define EMPTY_UML_PT_REGS { }
|
||||
|
||||
#define UPT_RBX(r) __CHOOSE_MODE(SC_RBX(UPT_SC(r)), REGS_RBX((r)->skas.regs))
|
||||
#define UPT_RCX(r) __CHOOSE_MODE(SC_RCX(UPT_SC(r)), REGS_RCX((r)->skas.regs))
|
||||
#define UPT_RDX(r) __CHOOSE_MODE(SC_RDX(UPT_SC(r)), REGS_RDX((r)->skas.regs))
|
||||
#define UPT_RSI(r) __CHOOSE_MODE(SC_RSI(UPT_SC(r)), REGS_RSI((r)->skas.regs))
|
||||
#define UPT_RDI(r) __CHOOSE_MODE(SC_RDI(UPT_SC(r)), REGS_RDI((r)->skas.regs))
|
||||
#define UPT_RBP(r) __CHOOSE_MODE(SC_RBP(UPT_SC(r)), REGS_RBP((r)->skas.regs))
|
||||
#define UPT_RAX(r) __CHOOSE_MODE(SC_RAX(UPT_SC(r)), REGS_RAX((r)->skas.regs))
|
||||
#define UPT_R8(r) __CHOOSE_MODE(SC_R8(UPT_SC(r)), REGS_R8((r)->skas.regs))
|
||||
#define UPT_R9(r) __CHOOSE_MODE(SC_R9(UPT_SC(r)), REGS_R9((r)->skas.regs))
|
||||
#define UPT_R10(r) __CHOOSE_MODE(SC_R10(UPT_SC(r)), REGS_R10((r)->skas.regs))
|
||||
#define UPT_R11(r) __CHOOSE_MODE(SC_R11(UPT_SC(r)), REGS_R11((r)->skas.regs))
|
||||
#define UPT_R12(r) __CHOOSE_MODE(SC_R12(UPT_SC(r)), REGS_R12((r)->skas.regs))
|
||||
#define UPT_R13(r) __CHOOSE_MODE(SC_R13(UPT_SC(r)), REGS_R13((r)->skas.regs))
|
||||
#define UPT_R14(r) __CHOOSE_MODE(SC_R14(UPT_SC(r)), REGS_R14((r)->skas.regs))
|
||||
#define UPT_R15(r) __CHOOSE_MODE(SC_R15(UPT_SC(r)), REGS_R15((r)->skas.regs))
|
||||
#define UPT_CS(r) __CHOOSE_MODE(SC_CS(UPT_SC(r)), REGS_CS((r)->skas.regs))
|
||||
#define UPT_RBX(r) REGS_RBX((r)->skas.regs)
|
||||
#define UPT_RCX(r) REGS_RCX((r)->skas.regs)
|
||||
#define UPT_RDX(r) REGS_RDX((r)->skas.regs)
|
||||
#define UPT_RSI(r) REGS_RSI((r)->skas.regs)
|
||||
#define UPT_RDI(r) REGS_RDI((r)->skas.regs)
|
||||
#define UPT_RBP(r) REGS_RBP((r)->skas.regs)
|
||||
#define UPT_RAX(r) REGS_RAX((r)->skas.regs)
|
||||
#define UPT_R8(r) REGS_R8((r)->skas.regs)
|
||||
#define UPT_R9(r) REGS_R9((r)->skas.regs)
|
||||
#define UPT_R10(r) REGS_R10((r)->skas.regs)
|
||||
#define UPT_R11(r) REGS_R11((r)->skas.regs)
|
||||
#define UPT_R12(r) REGS_R12((r)->skas.regs)
|
||||
#define UPT_R13(r) REGS_R13((r)->skas.regs)
|
||||
#define UPT_R14(r) REGS_R14((r)->skas.regs)
|
||||
#define UPT_R15(r) REGS_R15((r)->skas.regs)
|
||||
#define UPT_CS(r) REGS_CS((r)->skas.regs)
|
||||
#define UPT_FS_BASE(r) \
|
||||
__CHOOSE_MODE(SC_FS_BASE(UPT_SC(r)), REGS_FS_BASE((r)->skas.regs))
|
||||
#define UPT_FS(r) __CHOOSE_MODE(SC_FS(UPT_SC(r)), REGS_FS((r)->skas.regs))
|
||||
REGS_FS_BASE((r)->skas.regs)
|
||||
#define UPT_FS(r) REGS_FS((r)->skas.regs)
|
||||
#define UPT_GS_BASE(r) \
|
||||
__CHOOSE_MODE(SC_GS_BASE(UPT_SC(r)), REGS_GS_BASE((r)->skas.regs))
|
||||
#define UPT_GS(r) __CHOOSE_MODE(SC_GS(UPT_SC(r)), REGS_GS((r)->skas.regs))
|
||||
#define UPT_DS(r) __CHOOSE_MODE(SC_DS(UPT_SC(r)), REGS_DS((r)->skas.regs))
|
||||
#define UPT_ES(r) __CHOOSE_MODE(SC_ES(UPT_SC(r)), REGS_ES((r)->skas.regs))
|
||||
#define UPT_CS(r) __CHOOSE_MODE(SC_CS(UPT_SC(r)), REGS_CS((r)->skas.regs))
|
||||
#define UPT_SS(r) __CHOOSE_MODE(SC_SS(UPT_SC(r)), REGS_SS((r)->skas.regs))
|
||||
#define UPT_ORIG_RAX(r) \
|
||||
__CHOOSE_MODE((r)->tt.orig_rax, REGS_ORIG_RAX((r)->skas.regs))
|
||||
REGS_GS_BASE((r)->skas.regs)
|
||||
#define UPT_GS(r) REGS_GS((r)->skas.regs)
|
||||
#define UPT_DS(r) REGS_DS((r)->skas.regs)
|
||||
#define UPT_ES(r) REGS_ES((r)->skas.regs)
|
||||
#define UPT_CS(r) REGS_CS((r)->skas.regs)
|
||||
#define UPT_SS(r) REGS_SS((r)->skas.regs)
|
||||
#define UPT_ORIG_RAX(r) REGS_ORIG_RAX((r)->skas.regs)
|
||||
|
||||
#define UPT_IP(r) __CHOOSE_MODE(SC_IP(UPT_SC(r)), REGS_IP((r)->skas.regs))
|
||||
#define UPT_SP(r) __CHOOSE_MODE(SC_SP(UPT_SC(r)), REGS_SP((r)->skas.regs))
|
||||
#define UPT_IP(r) REGS_IP((r)->skas.regs)
|
||||
#define UPT_SP(r) REGS_SP((r)->skas.regs)
|
||||
|
||||
#define UPT_EFLAGS(r) \
|
||||
__CHOOSE_MODE(SC_EFLAGS(UPT_SC(r)), REGS_EFLAGS((r)->skas.regs))
|
||||
#define UPT_EFLAGS(r) REGS_EFLAGS((r)->skas.regs)
|
||||
#define UPT_SC(r) ((r)->tt.sc)
|
||||
#define UPT_SYSCALL_NR(r) __CHOOSE_MODE((r)->tt.syscall, (r)->skas.syscall)
|
||||
#define UPT_SYSCALL_NR(r) ((r)->skas.syscall)
|
||||
#define UPT_SYSCALL_RET(r) UPT_RAX(r)
|
||||
|
||||
extern int user_context(unsigned long sp);
|
||||
|
||||
#define UPT_IS_USER(r) \
|
||||
CHOOSE_MODE(user_context(UPT_SP(r)), (r)->skas.is_user)
|
||||
#define UPT_IS_USER(r) ((r)->skas.is_user)
|
||||
|
||||
#define UPT_SYSCALL_ARG1(r) UPT_RDI(r)
|
||||
#define UPT_SYSCALL_ARG2(r) UPT_RSI(r)
|
||||
@@ -237,18 +232,12 @@ struct syscall_args {
|
||||
})
|
||||
|
||||
#define UPT_SET_SYSCALL_RETURN(r, res) \
|
||||
CHOOSE_MODE(SC_SET_SYSCALL_RETURN(UPT_SC(r), (res)), \
|
||||
REGS_SET_SYSCALL_RETURN((r)->skas.regs, (res)))
|
||||
REGS_SET_SYSCALL_RETURN((r)->skas.regs, (res))
|
||||
|
||||
#define UPT_RESTART_SYSCALL(r) \
|
||||
CHOOSE_MODE(SC_RESTART_SYSCALL(UPT_SC(r)), \
|
||||
REGS_RESTART_SYSCALL((r)->skas.regs))
|
||||
#define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->skas.regs)
|
||||
|
||||
#define UPT_SEGV_IS_FIXABLE(r) \
|
||||
CHOOSE_MODE(SC_SEGV_IS_FIXABLE(UPT_SC(r)), \
|
||||
REGS_SEGV_IS_FIXABLE(&r->skas))
|
||||
#define UPT_SEGV_IS_FIXABLE(r) REGS_SEGV_IS_FIXABLE(&r->skas)
|
||||
|
||||
#define UPT_FAULTINFO(r) \
|
||||
CHOOSE_MODE((&(r)->tt.faultinfo), (&(r)->skas.faultinfo))
|
||||
#define UPT_FAULTINFO(r) (&(r)->skas.faultinfo)
|
||||
|
||||
#endif
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
#define __ARCH_UM_MMU_H
|
||||
|
||||
#include "uml-config.h"
|
||||
#include "choose-mode.h"
|
||||
#include "mmu-skas.h"
|
||||
|
||||
typedef union mm_context {
|
||||
|
||||
@@ -6,8 +6,6 @@
|
||||
#ifndef __ARCH_UM_UACCESS_H
|
||||
#define __ARCH_UM_UACCESS_H
|
||||
|
||||
#include "choose-mode.h"
|
||||
#include "uaccess-skas.h"
|
||||
#include "asm/fixmap.h"
|
||||
|
||||
#define __under_task_size(addr, size) \
|
||||
@@ -27,20 +25,10 @@
|
||||
(__addr_range_nowrap(addr, size) && \
|
||||
(__under_task_size(addr, size) || \
|
||||
__access_ok_vsyscall(type, addr, size) || \
|
||||
segment_eq(get_fs(), KERNEL_DS) || \
|
||||
CHOOSE_MODE_PROC(access_ok_tt, access_ok_skas, type, addr, size)))
|
||||
segment_eq(get_fs(), KERNEL_DS)))
|
||||
|
||||
static inline int copy_from_user(void *to, const void __user *from, int n)
|
||||
{
|
||||
return(CHOOSE_MODE_PROC(copy_from_user_tt, copy_from_user_skas, to,
|
||||
from, n));
|
||||
}
|
||||
|
||||
static inline int copy_to_user(void __user *to, const void *from, int n)
|
||||
{
|
||||
return(CHOOSE_MODE_PROC(copy_to_user_tt, copy_to_user_skas, to,
|
||||
from, n));
|
||||
}
|
||||
extern int copy_from_user(void *to, const void __user *from, int n);
|
||||
extern int copy_to_user(void __user *to, const void *from, int n);
|
||||
|
||||
/*
|
||||
* strncpy_from_user: - Copy a NUL terminated string from userspace.
|
||||
@@ -61,11 +49,7 @@ static inline int copy_to_user(void __user *to, const void *from, int n)
|
||||
* and returns @count.
|
||||
*/
|
||||
|
||||
static inline int strncpy_from_user(char *dst, const char __user *src, int count)
|
||||
{
|
||||
return(CHOOSE_MODE_PROC(strncpy_from_user_tt, strncpy_from_user_skas,
|
||||
dst, src, count));
|
||||
}
|
||||
extern int strncpy_from_user(char *dst, const char __user *src, int count);
|
||||
|
||||
/*
|
||||
* __clear_user: - Zero a block of memory in user space, with less checking.
|
||||
@@ -78,10 +62,7 @@ static inline int strncpy_from_user(char *dst, const char __user *src, int count
|
||||
* Returns number of bytes that could not be cleared.
|
||||
* On success, this will be zero.
|
||||
*/
|
||||
static inline int __clear_user(void *mem, int len)
|
||||
{
|
||||
return(CHOOSE_MODE_PROC(__clear_user_tt, __clear_user_skas, mem, len));
|
||||
}
|
||||
extern int __clear_user(void __user *mem, int len);
|
||||
|
||||
/*
|
||||
* clear_user: - Zero a block of memory in user space.
|
||||
@@ -93,10 +74,7 @@ static inline int __clear_user(void *mem, int len)
|
||||
* Returns number of bytes that could not be cleared.
|
||||
* On success, this will be zero.
|
||||
*/
|
||||
static inline int clear_user(void __user *mem, int len)
|
||||
{
|
||||
return(CHOOSE_MODE_PROC(clear_user_tt, clear_user_skas, mem, len));
|
||||
}
|
||||
extern int clear_user(void __user *mem, int len);
|
||||
|
||||
/*
|
||||
* strlen_user: - Get the size of a string in user space.
|
||||
@@ -109,10 +87,7 @@ static inline int clear_user(void __user *mem, int len)
|
||||
* On exception, returns 0.
|
||||
* If the string is too long, returns a value greater than @n.
|
||||
*/
|
||||
static inline int strnlen_user(const void __user *str, long len)
|
||||
{
|
||||
return(CHOOSE_MODE_PROC(strnlen_user_tt, strnlen_user_skas, str, len));
|
||||
}
|
||||
extern int strnlen_user(const void __user *str, int len);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user