From: "Michael S. Tsirkin" <mst@redhat.com> To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Subject: [PATCH v3 10/11] kernel: drop voluntary schedule from might_fault Date: Fri, 24 May 2013 17:18:37 +0300 [thread overview] Message-ID: <1369404522-12927-10-git-send-email-mst@redhat.com> (raw) In-Reply-To: <cover.1368702323.git.mst@redhat.com> 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: Michael S. Tsirkin <mst@redhat.com> --- include/linux/kernel.h | 2 +- mm/memory.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index e96329c..c514c06 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -198,7 +198,7 @@ void might_fault(void); #else static inline void might_fault(void) { - might_sleep(); + __might_sleep(__FILE__, __LINE__, 0); } #endif diff --git a/mm/memory.c b/mm/memory.c index 6dc1882..c1f190f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4222,7 +4222,8 @@ void might_fault(void) if (segment_eq(get_fs(), KERNEL_DS)) return; - might_sleep(); + __might_sleep(__FILE__, __LINE__, 0); + /* * it would be nicer only to annotate paths which are not under * pagefault_disable, however that requires a larger audit and -- MST
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com> To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Subject: [PATCH v3 10/11] kernel: drop voluntary schedule from might_fault Date: Fri, 24 May 2013 17:18:37 +0300 [thread overview] Message-ID: <1369404522-12927-10-git-send-email-mst@redhat.com> (raw) In-Reply-To: <cover.1368702323.git.mst@redhat.com> 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: Michael S. Tsirkin <mst@redhat.com> --- include/linux/kernel.h | 2 +- mm/memory.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index e96329c..c514c06 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -198,7 +198,7 @@ void might_fault(void); #else static inline void might_fault(void) { - might_sleep(); + __might_sleep(__FILE__, __LINE__, 0); } #endif diff --git a/mm/memory.c b/mm/memory.c index 6dc1882..c1f190f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4222,7 +4222,8 @@ void might_fault(void) if (segment_eq(get_fs(), KERNEL_DS)) return; - might_sleep(); + __might_sleep(__FILE__, __LINE__, 0); + /* * it would be nicer only to annotate paths which are not under * pagefault_disable, however that requires a larger audit and -- MST -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-05-24 14:18 UTC|newest] Thread overview: 228+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-05-16 11:07 [PATCH v2 00/10] uaccess: better might_sleep/might_fault behavior Michael S. Tsirkin 2013-05-16 11:07 ` Michael S. Tsirkin 2013-05-16 11:07 ` Michael S. Tsirkin 2013-05-16 11:07 ` Michael S. Tsirkin 2013-05-16 11:07 ` Michael S. Tsirkin 2013-05-16 11:07 ` Michael S. Tsirkin 2013-05-16 11:10 ` [PATCH v2 01/10] asm-generic: uaccess s/might_sleep/might_fault/ Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` [PATCH v2 02/10] arm64: " Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 13:29 ` Catalin Marinas 2013-05-16 13:29 ` Catalin Marinas 2013-05-16 13:29 ` Catalin Marinas 2013-05-16 13:29 ` Catalin Marinas 2013-05-16 13:29 ` Catalin Marinas 2013-05-16 13:29 ` Catalin Marinas 2013-05-16 13:29 ` Catalin Marinas 2013-05-16 11:10 ` [PATCH v2 03/10] frv: " Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:10 ` Michael S. Tsirkin 2013-05-16 11:11 ` [PATCH v2 04/10] m32r: " Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` [PATCH v2 05/10] microblaze: " Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:11 ` Michael S. Tsirkin 2013-05-16 11:12 ` [PATCH v2 06/10] mn10300: " Michael S. Tsirkin 2013-05-16 11:12 ` Michael S. Tsirkin 2013-05-16 11:12 ` Michael S. Tsirkin 2013-05-16 11:12 ` Michael S. Tsirkin 2013-05-16 11:12 ` Michael S. Tsirkin 2013-05-16 11:12 ` Michael S. Tsirkin 2013-05-16 11:15 ` [PATCH v2 07/10] powerpc: " Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-22 13:59 ` Arnd Bergmann 2013-05-22 13:59 ` Arnd Bergmann 2013-05-22 13:59 ` Arnd Bergmann 2013-05-22 13:59 ` Arnd Bergmann 2013-05-22 14:30 ` Michael S. Tsirkin 2013-05-22 14:30 ` Michael S. Tsirkin 2013-05-22 14:30 ` Michael S. Tsirkin 2013-05-22 14:30 ` Michael S. Tsirkin 2013-05-22 14:30 ` Michael S. Tsirkin 2013-05-24 13:00 ` Michael S. Tsirkin 2013-05-24 13:00 ` Michael S. Tsirkin 2013-05-24 13:00 ` Michael S. Tsirkin 2013-05-24 13:00 ` Michael S. Tsirkin 2013-05-24 13:00 ` Michael S. Tsirkin 2013-05-24 13:11 ` Michael S. Tsirkin 2013-05-24 13:11 ` Michael S. Tsirkin 2013-05-24 13:11 ` Michael S. Tsirkin 2013-05-24 13:11 ` Michael S. Tsirkin 2013-05-24 13:11 ` Michael S. Tsirkin 2013-05-24 13:30 ` Arnd Bergmann 2013-05-24 13:30 ` Arnd Bergmann 2013-05-24 13:30 ` Arnd Bergmann 2013-05-24 13:30 ` Arnd Bergmann 2013-05-24 13:30 ` Arnd Bergmann 2013-05-16 11:15 ` [PATCH v2 08/10] tile: " Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 13:33 ` Chris Metcalf 2013-05-16 13:33 ` Chris Metcalf 2013-05-16 13:33 ` Chris Metcalf 2013-05-16 13:33 ` Chris Metcalf 2013-05-16 13:33 ` Chris Metcalf 2013-05-16 13:33 ` Chris Metcalf 2013-05-16 11:15 ` [PATCH v2 09/10] x86: " Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:15 ` Michael S. Tsirkin 2013-05-16 11:16 ` [PATCH v2 10/10] kernel: might_fault does not imply might_sleep Michael S. Tsirkin 2013-05-16 11:16 ` Michael S. Tsirkin 2013-05-16 11:16 ` Michael S. Tsirkin 2013-05-16 11:16 ` Michael S. Tsirkin 2013-05-16 11:16 ` Michael S. Tsirkin 2013-05-16 11:16 ` Michael S. Tsirkin 2013-05-16 18:40 ` Peter Zijlstra 2013-05-16 18:40 ` Peter Zijlstra 2013-05-16 18:40 ` Peter Zijlstra 2013-05-16 18:40 ` Peter Zijlstra 2013-05-16 18:40 ` Peter Zijlstra 2013-05-19 9:35 ` Michael S. Tsirkin 2013-05-19 9:35 ` Michael S. Tsirkin 2013-05-19 9:35 ` Michael S. Tsirkin 2013-05-19 9:35 ` Michael S. Tsirkin 2013-05-19 9:35 ` Michael S. Tsirkin 2013-05-19 12:34 ` Steven Rostedt 2013-05-19 12:34 ` Steven Rostedt 2013-05-19 12:34 ` Steven Rostedt 2013-05-19 12:34 ` Steven Rostedt 2013-05-19 12:34 ` Steven Rostedt 2013-05-19 13:34 ` Michael S. Tsirkin 2013-05-19 13:34 ` Michael S. Tsirkin 2013-05-19 13:34 ` Michael S. Tsirkin 2013-05-19 13:34 ` Michael S. Tsirkin 2013-05-19 13:34 ` Michael S. Tsirkin 2013-05-19 16:06 ` Steven Rostedt 2013-05-19 16:06 ` Steven Rostedt 2013-05-19 16:06 ` Steven Rostedt 2013-05-19 16:06 ` Steven Rostedt 2013-05-19 16:06 ` Steven Rostedt 2013-05-19 16:40 ` Michael S. Tsirkin 2013-05-19 16:40 ` Michael S. Tsirkin 2013-05-19 16:40 ` Michael S. Tsirkin 2013-05-19 16:40 ` Michael S. Tsirkin 2013-05-19 16:40 ` Michael S. Tsirkin 2013-05-19 20:23 ` Steven Rostedt 2013-05-19 20:23 ` Steven Rostedt 2013-05-19 20:23 ` Steven Rostedt 2013-05-19 20:23 ` Steven Rostedt 2013-05-19 20:23 ` Steven Rostedt 2013-05-19 20:35 ` Michael S. Tsirkin 2013-05-19 20:35 ` Michael S. Tsirkin 2013-05-19 20:35 ` Michael S. Tsirkin 2013-05-19 20:35 ` Michael S. Tsirkin 2013-05-19 20:35 ` Michael S. Tsirkin 2013-05-21 11:18 ` Peter Zijlstra 2013-05-21 11:18 ` Peter Zijlstra 2013-05-21 11:18 ` Peter Zijlstra 2013-05-21 11:18 ` Peter Zijlstra 2013-05-21 11:21 ` Peter Zijlstra 2013-05-21 11:21 ` Peter Zijlstra 2013-05-21 11:21 ` Peter Zijlstra 2013-05-21 11:21 ` Peter Zijlstra 2013-05-21 11:57 ` Peter Zijlstra 2013-05-21 11:57 ` Peter Zijlstra 2013-05-21 11:57 ` Peter Zijlstra 2013-05-21 11:57 ` Peter Zijlstra 2013-05-21 13:28 ` Michael S. Tsirkin 2013-05-21 13:28 ` Michael S. Tsirkin 2013-05-22 9:47 ` Michael S. Tsirkin 2013-05-22 9:47 ` Michael S. Tsirkin 2013-05-22 9:47 ` Michael S. Tsirkin 2013-05-22 9:47 ` Michael S. Tsirkin 2013-05-22 9:47 ` Michael S. Tsirkin 2013-05-22 10:16 ` Peter Zijlstra 2013-05-22 10:16 ` Peter Zijlstra 2013-05-22 10:16 ` Peter Zijlstra 2013-05-22 10:16 ` Peter Zijlstra 2013-05-22 20:38 ` Michael S. Tsirkin 2013-05-22 20:38 ` Michael S. Tsirkin 2013-05-22 20:38 ` Michael S. Tsirkin 2013-05-22 20:38 ` Michael S. Tsirkin 2013-05-22 20:38 ` Michael S. Tsirkin 2013-05-22 20:36 ` Michael S. Tsirkin 2013-05-22 20:36 ` Michael S. Tsirkin 2013-05-22 20:36 ` Michael S. Tsirkin 2013-05-22 20:36 ` Michael S. Tsirkin 2013-05-22 20:36 ` Michael S. Tsirkin 2013-05-22 9:25 ` [PATCH v2 00/10] uaccess: better might_sleep/might_fault behavior Arnd Bergmann 2013-05-22 9:25 ` Arnd Bergmann 2013-05-22 9:25 ` Arnd Bergmann 2013-05-22 9:25 ` Arnd Bergmann 2013-05-22 9:58 ` Michael S. Tsirkin 2013-05-22 9:58 ` Michael S. Tsirkin 2013-05-22 9:58 ` Michael S. Tsirkin 2013-05-22 9:58 ` Michael S. Tsirkin 2013-05-22 9:58 ` Michael S. Tsirkin 2013-05-22 10:19 ` Peter Zijlstra 2013-05-22 10:19 ` Peter Zijlstra 2013-05-22 10:19 ` Peter Zijlstra 2013-05-22 10:19 ` Peter Zijlstra 2013-05-22 11:07 ` Michael S. Tsirkin 2013-05-22 11:07 ` Michael S. Tsirkin 2013-05-22 11:07 ` Michael S. Tsirkin 2013-05-22 11:07 ` Michael S. Tsirkin 2013-05-22 11:07 ` Michael S. Tsirkin 2013-05-22 11:27 ` Peter Zijlstra 2013-05-22 11:27 ` Peter Zijlstra 2013-05-22 11:27 ` Peter Zijlstra 2013-05-22 11:27 ` Peter Zijlstra 2013-05-22 11:27 ` Peter Zijlstra 2013-05-22 13:41 ` Russell King - ARM Linux 2013-05-22 13:41 ` Russell King - ARM Linux 2013-05-22 13:41 ` Russell King - ARM Linux 2013-05-22 13:41 ` Russell King - ARM Linux 2013-05-22 14:04 ` Arnd Bergmann 2013-05-22 14:04 ` Arnd Bergmann 2013-05-22 14:04 ` Arnd Bergmann 2013-05-22 14:04 ` Arnd Bergmann 2013-05-22 14:44 ` Michael S. Tsirkin 2013-05-22 14:44 ` Michael S. Tsirkin 2013-05-22 14:44 ` Michael S. Tsirkin 2013-05-22 14:44 ` Michael S. Tsirkin 2013-05-22 14:44 ` Michael S. Tsirkin 2013-05-22 14:44 ` Michael S. Tsirkin 2013-05-24 14:17 ` [PATCH v3 01/11] asm-generic: uaccess s/might_sleep/might_fault/ Michael S. Tsirkin 2013-05-24 14:17 ` [PATCH v3 02/11] arm64: " Michael S. Tsirkin 2013-05-24 14:17 ` Michael S. Tsirkin 2013-05-24 14:17 ` [PATCH v3 03/11] frv: " Michael S. Tsirkin 2013-05-24 14:18 ` [PATCH v3 04/11] m32r: " Michael S. Tsirkin 2013-05-24 14:18 ` [PATCH v3 05/11] microblaze: " Michael S. Tsirkin 2013-05-24 14:18 ` [PATCH v3 06/11] mn10300: " Michael S. Tsirkin 2013-05-24 14:18 ` [PATCH v3 07/11] powerpc: " Michael S. Tsirkin 2013-05-24 14:18 ` Michael S. Tsirkin 2013-05-24 14:18 ` [PATCH v3 08/11] tile: " Michael S. Tsirkin 2013-05-24 14:18 ` [PATCH v3 09/11] x86: " Michael S. Tsirkin 2013-05-24 14:18 ` Michael S. Tsirkin [this message] 2013-05-24 14:18 ` [PATCH v3 10/11] kernel: drop voluntary schedule from might_fault Michael S. Tsirkin 2013-05-24 14:18 ` [PATCH v3 11/11] kernel: uaccess in atomic with pagefault_disable Michael S. Tsirkin 2013-05-24 14:18 ` Michael S. Tsirkin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1369404522-12927-10-git-send-email-mst@redhat.com \ --to=mst@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.