x86/uaccess: Move thread_info::addr_limit to thread_struct

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>

5 files changed, 21 insertions, 20 deletions

diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
index 2b0ef26da0bd..bf603ebbfd8e 100644
--- a/arch/x86/lib/copy_user_64.S
+++ b/arch/x86/lib/copy_user_64.S
@@ -17,11 +17,11 @@
 
 /* Standard copy_to_user with segment limit checking */
 ENTRY(_copy_to_user)
-        GET_THREAD_INFO(%rax)
+        mov PER_CPU_VAR(current_task), %rax
         movq %rdi,%rcx
         addq %rdx,%rcx
         jc bad_to_user
-        cmpq TI_addr_limit(%rax),%rcx
+        cmpq TASK_addr_limit(%rax),%rcx
         ja bad_to_user
         ALTERNATIVE_2 "jmp copy_user_generic_unrolled",         \
                       "jmp copy_user_generic_string",           \
@@ -32,11 +32,11 @@ ENDPROC(_copy_to_user)
 
 /* Standard copy_from_user with segment limit checking */
 ENTRY(_copy_from_user)
-        GET_THREAD_INFO(%rax)
+        mov PER_CPU_VAR(current_task), %rax
         movq %rsi,%rcx
         addq %rdx,%rcx
         jc bad_from_user
-        cmpq TI_addr_limit(%rax),%rcx
+        cmpq TASK_addr_limit(%rax),%rcx
         ja bad_from_user
         ALTERNATIVE_2 "jmp copy_user_generic_unrolled",         \
                       "jmp copy_user_generic_string",           \
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
index 28a6654f0d08..b6fcb9a9ddbc 100644
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
@@ -6,6 +6,7 @@
  */
 #include <asm/checksum.h>
 #include <linux/module.h>
+#include <linux/uaccess.h>
 #include <asm/smap.h>
 
 /**
diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
index 46668cda4ffd..0ef5128c2de8 100644
--- a/arch/x86/lib/getuser.S
+++ b/arch/x86/lib/getuser.S
@@ -35,8 +35,8 @@
 
         .text
 ENTRY(__get_user_1)
-        GET_THREAD_INFO(%_ASM_DX)
-        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
+        mov PER_CPU_VAR(current_task), %_ASM_DX
+        cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
         jae bad_get_user
         ASM_STAC
 1:      movzbl (%_ASM_AX),%edx
@@ -48,8 +48,8 @@ ENDPROC(__get_user_1)
 ENTRY(__get_user_2)
         add $1,%_ASM_AX
         jc bad_get_user
-        GET_THREAD_INFO(%_ASM_DX)
-        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
+        mov PER_CPU_VAR(current_task), %_ASM_DX
+        cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
         jae bad_get_user
         ASM_STAC
 2:      movzwl -1(%_ASM_AX),%edx
@@ -61,8 +61,8 @@ ENDPROC(__get_user_2)
 ENTRY(__get_user_4)
         add $3,%_ASM_AX
         jc bad_get_user
-        GET_THREAD_INFO(%_ASM_DX)
-        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
+        mov PER_CPU_VAR(current_task), %_ASM_DX
+        cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
         jae bad_get_user
         ASM_STAC
 3:      movl -3(%_ASM_AX),%edx
@@ -75,8 +75,8 @@ ENTRY(__get_user_8)
 #ifdef CONFIG_X86_64
         add $7,%_ASM_AX
         jc bad_get_user
-        GET_THREAD_INFO(%_ASM_DX)
-        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
+        mov PER_CPU_VAR(current_task), %_ASM_DX
+        cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
         jae bad_get_user
         ASM_STAC
 4:      movq -7(%_ASM_AX),%rdx
@@ -86,8 +86,8 @@ ENTRY(__get_user_8)
 #else
         add $7,%_ASM_AX
         jc bad_get_user_8
-        GET_THREAD_INFO(%_ASM_DX)
-        cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
+        mov PER_CPU_VAR(current_task), %_ASM_DX
+        cmp TASK_addr_limit(%_ASM_DX),%_ASM_AX
         jae bad_get_user_8
         ASM_STAC
 4:      movl -7(%_ASM_AX),%edx
diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
index e0817a12d323..c891ece81e5b 100644
--- a/arch/x86/lib/putuser.S
+++ b/arch/x86/lib/putuser.S
@@ -29,14 +29,14 @@
  * 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 ;      \
                 ret
 
 .text
 ENTRY(__put_user_1)
         ENTER
-        cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
+        cmp TASK_addr_limit(%_ASM_BX),%_ASM_CX
         jae bad_put_user
         ASM_STAC
 1:      movb %al,(%_ASM_CX)
@@ -46,7 +46,7 @@ ENDPROC(__put_user_1)
 
 ENTRY(__put_user_2)
         ENTER
-        mov TI_addr_limit(%_ASM_BX),%_ASM_BX
+        mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
         sub $1,%_ASM_BX
         cmp %_ASM_BX,%_ASM_CX
         jae bad_put_user
@@ -58,7 +58,7 @@ ENDPROC(__put_user_2)
 
 ENTRY(__put_user_4)
         ENTER
-        mov TI_addr_limit(%_ASM_BX),%_ASM_BX
+        mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
         sub $3,%_ASM_BX
         cmp %_ASM_BX,%_ASM_CX
         jae bad_put_user
@@ -70,7 +70,7 @@ ENDPROC(__put_user_4)
 
 ENTRY(__put_user_8)
         ENTER
-        mov TI_addr_limit(%_ASM_BX),%_ASM_BX
+        mov TASK_addr_limit(%_ASM_BX),%_ASM_BX
         sub $7,%_ASM_BX
         cmp %_ASM_BX,%_ASM_CX
         jae bad_put_user
diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
index 0a42327a59d7..9f760cdcaf40 100644
--- a/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
@@ -6,7 +6,7 @@
  * Copyright 2002 Andi Kleen <ak@suse.de>
  */
 #include <linux/module.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 /*
  * Zero Userspace