[PATCH 08/13] x86: Move cond_resched into the out of line put_user code

[Andi Kleen]

From: Andi Kleen <ak@xxxxxxxxxxxxxxx>

CONFIG_PREEMPT_VOLUNTARY kernels always do a cond_resched in put_user().
Currently this is done in the caller and in a inefficient way (multiple
function calls to decide to do nothing). Move the reschedule check
into the low level functions instead, where it can be merged cheaply
with the address limit check.

For the DEBUG_SLEEP case we still do the call in the caller.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
---
 arch/x86/include/asm/uaccess.h |  2 +-
 arch/x86/lib/putuser.S         | 12 +++++++++++-
 arch/x86/lib/user-common.h     | 12 ++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 arch/x86/lib/user-common.h

diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index 8fa3bd6..6cbe976 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -246,7 +246,7 @@ extern void __put_user_8(void);
 	int __ret_pu;						\
 	__typeof__(*(ptr)) __pu_val;				\
 	__chk_user_ptr(ptr);					\
-	might_fault();						\
+	might_fault_debug_only();				\
 	__pu_val = x;						\
 	switch (sizeof(*(ptr))) {				\
 	case 1:							\
diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
index fc6ba17..9ba7f52 100644
--- a/arch/x86/lib/putuser.S
+++ b/arch/x86/lib/putuser.S
@@ -16,6 +16,8 @@
 #include <asm/errno.h>
 #include <asm/asm.h>
 #include <asm/smap.h>
+#include <asm/calling.h>
+#include "user-common.h"
 
 
 /*
@@ -31,7 +33,7 @@
  */
 
 #define ENTER	CFI_STARTPROC ; \
-		GET_THREAD_INFO(%_ASM_BX)
+		GET_THREAD_AND_SCHEDULE %_ASM_BX
 #define EXIT	ASM_CLAC ;	\
 		ret ;		\
 		CFI_ENDPROC
@@ -99,3 +101,11 @@ END(bad_put_user)
 #ifdef CONFIG_X86_32
 	_ASM_EXTABLE(5b,bad_put_user)
 #endif
+
+ENTRY(user_schedule)
+	CFI_STARTPROC
+	SAVE_ALL
+	call _cond_resched
+	RESTORE_ALL
+	ret
+	CFI_ENDPROC
diff --git a/arch/x86/lib/user-common.h b/arch/x86/lib/user-common.h
new file mode 100644
index 0000000..d61cd1a
--- /dev/null
+++ b/arch/x86/lib/user-common.h
@@ -0,0 +1,12 @@
+	.macro GET_THREAD_AND_SCHEDULE reg
+	GET_THREAD_INFO(\reg)
+#ifdef CONFIG_PREEMPT_VOLUNTARY
+	testl $_TIF_NEED_RESCHED,TI_flags(\reg)
+	jnz   1f
+2:
+	.section .fixup,"ax"
+1:	call user_schedule
+	jmp  2b
+	.previous
+#endif
+	.endm
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/