GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-27 00:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86/uaccess: Move thread_info::addr_limit to thread_struct

Browse source 
struct thread_info is a legacy mess.  To prepare for its partial removal,
move thread_info::addr_limit out.

As an added benefit, this way is simpler.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/15bee834d09402b47ac86f2feccdf6529f9bc5b0.1468527351.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Andy Lutomirski 2016-07-14 13:22:57 -07:00 • committed by Ingo Molnar
parent 2a53ccbc0d
commit 13d4ea097d
12 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/include/asm/checksum_32.h
View file

@ -2,8 +2,7 @@
#define _ASM_X86_CHECKSUM_32_H #define _ASM_X86_CHECKSUM_32_H
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/uaccess.h>
#include <asm/uaccess.h>
/* /*
* computes the checksum of a memory block at buff, length len, * computes the checksum of a memory block at buff, length len,

17
arch/x86/include/asm/processor.h
View file

@ -371,6 +371,10 @@ extern unsigned int xstate_size;
struct perf_event; struct perf_event;
typedef struct {
unsigned long seg;
} mm_segment_t;
struct thread_struct { struct thread_struct {
/* Cached TLS descriptors: */ /* Cached TLS descriptors: */
struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES]; struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES];
@ -419,6 +423,8 @@ struct thread_struct {
/* Max allowed port in the bitmap, in bytes: */ /* Max allowed port in the bitmap, in bytes: */
unsigned io_bitmap_max; unsigned io_bitmap_max;
mm_segment_t addr_limit;
unsigned int sig_on_uaccess_err:1; unsigned int sig_on_uaccess_err:1;
unsigned int uaccess_err:1; /* uaccess failed */ unsigned int uaccess_err:1; /* uaccess failed */
@ -493,11 +499,6 @@ static inline void load_sp0(struct tss_struct *tss,
#define set_iopl_mask native_set_iopl_mask #define set_iopl_mask native_set_iopl_mask
#endif /* CONFIG_PARAVIRT */ #endif /* CONFIG_PARAVIRT */
typedef struct {
unsigned long seg;
} mm_segment_t;
/* Free all resources held by a thread. */ /* Free all resources held by a thread. */
extern void release_thread(struct task_struct *); extern void release_thread(struct task_struct *);
@ -719,6 +720,7 @@ static inline void spin_lock_prefetch(const void *x)
.sp0 = TOP_OF_INIT_STACK, \ .sp0 = TOP_OF_INIT_STACK, \
.sysenter_cs = __KERNEL_CS, \ .sysenter_cs = __KERNEL_CS, \
.io_bitmap_ptr = NULL, \ .io_bitmap_ptr = NULL, \
.addr_limit = KERNEL_DS, \
} }
extern unsigned long thread_saved_pc(struct task_struct *tsk); extern unsigned long thread_saved_pc(struct task_struct *tsk);
@ -768,8 +770,9 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
#define STACK_TOP TASK_SIZE #define STACK_TOP TASK_SIZE
#define STACK_TOP_MAX TASK_SIZE_MAX #define STACK_TOP_MAX TASK_SIZE_MAX
#define INIT_THREAD { \ #define INIT_THREAD { \
.sp0 = TOP_OF_INIT_STACK \ .sp0 = TOP_OF_INIT_STACK, \
.addr_limit = KERNEL_DS, \
} }
/* /*

7
arch/x86/include/asm/thread_info.h
View file

@ -57,7 +57,6 @@ struct thread_info {
__u32 flags; /* low level flags */ __u32 flags; /* low level flags */
__u32 status; /* thread synchronous flags */ __u32 status; /* thread synchronous flags */
__u32 cpu; /* current CPU */ __u32 cpu; /* current CPU */
mm_segment_t addr_limit;
}; };
#define INIT_THREAD_INFO(tsk) \ #define INIT_THREAD_INFO(tsk) \
@ -65,7 +64,6 @@ struct thread_info {
.task = &tsk, \ .task = &tsk, \
.flags = 0, \ .flags = 0, \
.cpu = 0, \ .cpu = 0, \
.addr_limit = KERNEL_DS, \
} }
#define init_thread_info (init_thread_union.thread_info) #define init_thread_info (init_thread_union.thread_info)
@ -184,11 +182,6 @@ static inline unsigned long current_stack_pointer(void)
# define cpu_current_top_of_stack (cpu_tss + TSS_sp0) # define cpu_current_top_of_stack (cpu_tss + TSS_sp0)
#endif #endif
/* Load thread_info address into "reg" */
#define GET_THREAD_INFO(reg) \
_ASM_MOV PER_CPU_VAR(cpu_current_top_of_stack),reg ; \
_ASM_SUB $(THREAD_SIZE),reg ;
/* /*
* ASM operand which evaluates to a 'thread_info' address of * ASM operand which evaluates to a 'thread_info' address of
* the current task, if it is known that "reg" is exactly "off" * the current task, if it is known that "reg" is exactly "off"

6
arch/x86/include/asm/uaccess.h
View file

@ -29,12 +29,12 @@
#define USER_DS MAKE_MM_SEG(TASK_SIZE_MAX) #define USER_DS MAKE_MM_SEG(TASK_SIZE_MAX)
#define get_ds() (KERNEL_DS) #define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit) #define get_fs() (current->thread.addr_limit)
#define set_fs(x) (current_thread_info()->addr_limit = (x)) #define set_fs(x) (current->thread.addr_limit = (x))
#define segment_eq(a, b) ((a).seg == (b).seg) #define segment_eq(a, b) ((a).seg == (b).seg)
#define user_addr_max() (current_thread_info()->addr_limit.seg) #define user_addr_max() (current->thread.addr_limit.seg)
#define __addr_ok(addr) \ #define __addr_ok(addr) \
((unsigned long __force)(addr) < user_addr_max()) ((unsigned long __force)(addr) < user_addr_max())

4
arch/x86/kernel/asm-offsets.c
View file

@ -31,7 +31,9 @@ void common(void) {
BLANK(); BLANK();
OFFSET(TI_flags, thread_info, flags); OFFSET(TI_flags, thread_info, flags);
OFFSET(TI_status, thread_info, status); OFFSET(TI_status, thread_info, status);
OFFSET(TI_addr_limit, thread_info, addr_limit);
BLANK();
OFFSET(TASK_addr_limit, task_struct, thread.addr_limit);
BLANK(); BLANK();
OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx); OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);

8
arch/x86/lib/copy_user_64.S
View file

@ -17,11 +17,11 @@
/* Standard copy_to_user with segment limit checking */ /* Standard copy_to_user with segment limit checking */
ENTRY(_copy_to_user) ENTRY(_copy_to_user)
GET_THREAD_INFO(%rax) mov PER_CPU_VAR(current_task), %rax
movq %rdi,%rcx movq %rdi,%rcx
addq %rdx,%rcx addq %rdx,%rcx
jc bad_to_user jc bad_to_user
cmpq TI_addr_limit(%rax),%rcx cmpq TASK_addr_limit(%rax),%rcx
ja bad_to_user ja bad_to_user
ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \ ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
"jmp copy_user_generic_string", \ "jmp copy_user_generic_string", \
@ -32,11 +32,11 @@ ENDPROC(_copy_to_user)
/* Standard copy_from_user with segment limit checking */ /* Standard copy_from_user with segment limit checking */
ENTRY(_copy_from_user) ENTRY(_copy_from_user)
GET_THREAD_INFO(%rax) mov PER_CPU_VAR(current_task), %rax
movq %rsi,%rcx movq %rsi,%rcx
addq %rdx,%rcx addq %rdx,%rcx
jc bad_from_user jc bad_from_user
cmpq TI_addr_limit(%rax),%rcx cmpq TASK_addr_limit(%rax),%rcx
ja bad_from_user ja bad_from_user
ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \ ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
"jmp copy_user_generic_string", \ "jmp copy_user_generic_string", \

1
arch/x86/lib/csum-wrappers_64.c
View file

@ -6,6 +6,7 @@
*/ */
#include <asm/checksum.h> #include <asm/checksum.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/uaccess.h>
#include <asm/smap.h> #include <asm/smap.h>
/** /**

20
arch/x86/lib/getuser.S
View file

@ -35,8 +35,8 @@
.text .text
ENTRY(__get_user_1) ENTRY(__get_user_1)
GET_THREAD_INFO(%_ASM_DX) mov PER_CPU_VAR(current_task), %_ASM_DX
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user jae bad_get_user
ASM_STAC ASM_STAC
1: movzbl (%_ASM_AX),%edx 1: movzbl (%_ASM_AX),%edx
@ -48,8 +48,8 @@ ENDPROC(__get_user_1)
ENTRY(__get_user_2) ENTRY(__get_user_2)
add $1,%_ASM_AX add $1,%_ASM_AX
jc bad_get_user jc bad_get_user
GET_THREAD_INFO(%_ASM_DX) mov PER_CPU_VAR(current_task), %_ASM_DX
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user jae bad_get_user
ASM_STAC ASM_STAC
2: movzwl -1(%_ASM_AX),%edx 2: movzwl -1(%_ASM_AX),%edx
@ -61,8 +61,8 @@ ENDPROC(__get_user_2)
ENTRY(__get_user_4) ENTRY(__get_user_4)
add $3,%_ASM_AX add $3,%_ASM_AX
jc bad_get_user jc bad_get_user
GET_THREAD_INFO(%_ASM_DX) mov PER_CPU_VAR(current_task), %_ASM_DX
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user jae bad_get_user
ASM_STAC ASM_STAC
3: movl -3(%_ASM_AX),%edx 3: movl -3(%_ASM_AX),%edx
@ -75,8 +75,8 @@ ENTRY(__get_user_8)
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
add $7,%_ASM_AX add $7,%_ASM_AX
jc bad_get_user jc bad_get_user
GET_THREAD_INFO(%_ASM_DX) mov PER_CPU_VAR(current_task), %_ASM_DX
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user jae bad_get_user
ASM_STAC ASM_STAC
4: movq -7(%_ASM_AX),%rdx 4: movq -7(%_ASM_AX),%rdx
@ -86,8 +86,8 @@ ENTRY(__get_user_8)
#else #else
add $7,%_ASM_AX add $7,%_ASM_AX
jc bad_get_user_8 jc bad_get_user_8
GET_THREAD_INFO(%_ASM_DX) mov PER_CPU_VAR(current_task), %_ASM_DX
cmp TI_addr_limit(%_ASM_DX),%_ASM_AX cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
jae bad_get_user_8 jae bad_get_user_8
ASM_STAC ASM_STAC
4: movl -7(%_ASM_AX),%edx 4: movl -7(%_ASM_AX),%edx

10
arch/x86/lib/putuser.S
View file

@ -29,14 +29,14 @@
* as they get called from within inline assembly. * as they get called from within inline assembly.
*/ */
#define ENTER GET_THREAD_INFO(%_ASM_BX) #define ENTER mov PER_CPU_VAR(current_task), %_ASM_BX
#define EXIT ASM_CLAC ; \ #define EXIT ASM_CLAC ; \
ret ret
.text .text
ENTRY(__put_user_1) ENTRY(__put_user_1)
ENTER ENTER
cmp TI_addr_limit(%_ASM_BX),%_ASM_CX cmp TASK_addr_limit(%_ASM_BX),%_ASM_CX
jae bad_put_user jae bad_put_user
ASM_STAC ASM_STAC
1: movb %al,(%_ASM_CX) 1: movb %al,(%_ASM_CX)
@ -46,7 +46,7 @@ ENDPROC(__put_user_1)
ENTRY(__put_user_2) ENTRY(__put_user_2)
ENTER ENTER
mov TI_addr_limit(%_ASM_BX),%_ASM_BX mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
sub $1,%_ASM_BX sub $1,%_ASM_BX
cmp %_ASM_BX,%_ASM_CX cmp %_ASM_BX,%_ASM_CX
jae bad_put_user jae bad_put_user
@ -58,7 +58,7 @@ ENDPROC(__put_user_2)
ENTRY(__put_user_4) ENTRY(__put_user_4)
ENTER ENTER
mov TI_addr_limit(%_ASM_BX),%_ASM_BX mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
sub $3,%_ASM_BX sub $3,%_ASM_BX
cmp %_ASM_BX,%_ASM_CX cmp %_ASM_BX,%_ASM_CX
jae bad_put_user jae bad_put_user
@ -70,7 +70,7 @@ ENDPROC(__put_user_4)
ENTRY(__put_user_8) ENTRY(__put_user_8)
ENTER ENTER
mov TI_addr_limit(%_ASM_BX),%_ASM_BX mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
sub $7,%_ASM_BX sub $7,%_ASM_BX
cmp %_ASM_BX,%_ASM_CX cmp %_ASM_BX,%_ASM_CX
jae bad_put_user jae bad_put_user

2
arch/x86/lib/usercopy_64.c
View file

@ -6,7 +6,7 @@
* Copyright 2002 Andi Kleen <ak@suse.de> * Copyright 2002 Andi Kleen <ak@suse.de>
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
/* /*
* Zero Userspace * Zero Userspace

2
drivers/pnp/isapnp/proc.c
View file

@ -21,7 +21,7 @@
#include <linux/isapnp.h> #include <linux/isapnp.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
extern struct pnp_protocol isapnp_protocol; extern struct pnp_protocol isapnp_protocol;

2
lib/bitmap.c
View file

@ -14,9 +14,9 @@
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/uaccess.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/uaccess.h>
/* /*
* bitmaps provide an array of bits, implemented using an an * bitmaps provide an array of bits, implemented using an an