提交 114276ac 编写于 作者: M Michael S. Tsirkin 提交者: Ingo Molnar

mm, sched: Drop voluntary schedule from might_fault()

might_fault() is called from functions like copy_to_user()
which most callers expect to be very fast, like a couple of
instructions.

So functions like memcpy_toiovec() call them many times in a loop.

But might_fault() calls might_sleep() and with CONFIG_PREEMPT_VOLUNTARY
this results in a function call.

Let's not do this - just call __might_sleep() that produces
a diagnostic for sleep within atomic, but drop
might_preempt().

Here's a test sending traffic between the VM and the host,
host is built with CONFIG_PREEMPT_VOLUNTARY:

 before:
	incoming: 7122.77   Mb/s
	outgoing: 8480.37   Mb/s

 after:
	incoming: 8619.24   Mb/s
	outgoing: 9455.42   Mb/s

As a side effect, this fixes an issue pointed
out by Ingo: might_fault might schedule differently
depending on PROVE_LOCKING. Now there's no
preemption point in both cases, so it's consistent.
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: NPeter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1369577426-26721-10-git-send-email-mst@redhat.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
上级 016be2e5
...@@ -198,7 +198,7 @@ void might_fault(void); ...@@ -198,7 +198,7 @@ void might_fault(void);
#else #else
static inline void might_fault(void) static inline void might_fault(void)
{ {
might_sleep(); __might_sleep(__FILE__, __LINE__, 0);
} }
#endif #endif
......
...@@ -4222,7 +4222,8 @@ void might_fault(void) ...@@ -4222,7 +4222,8 @@ void might_fault(void)
if (segment_eq(get_fs(), KERNEL_DS)) if (segment_eq(get_fs(), KERNEL_DS))
return; return;
might_sleep(); __might_sleep(__FILE__, __LINE__, 0);
/* /*
* it would be nicer only to annotate paths which are not under * it would be nicer only to annotate paths which are not under
* pagefault_disable, however that requires a larger audit and * pagefault_disable, however that requires a larger audit and
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册