From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-m32r-ja@ml.linux-m32r.org, kvm@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
David Howells <dhowells@redhat.com>,
linux-mm@kvack.org, Paul Mackerras <paulus@samba.org>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-arch@vger.kernel.org, linux-am33-list@redhat.com,
Hirokazu Takata <takata@linux-m32r.org>,
x86@kernel.org, Ingo Molnar <mingo@redhat.com>,
Arnd Bergmann <arnd@arndb.de>,
microblaze-uclinux@itee.uq.edu.au,
Chris Metcalf <cmetcalf@tilera.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Michal Simek <monstr@monstr.eu>,
linux-m32r@ml.linux-m32r.org,
Koichi Yasutake <yasutake.koichi@jp.panasonic.com>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 01/10] asm-generic: uaccess s/might_sleep/might_fault/
Date: Thu, 16 May 2013 14:10:03 +0300 [thread overview]
Message-ID: <0138f31b9c0f1764a0d6bbed2ee9aa3aedea6815.1368702323.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1368702323.git.mst@redhat.com>
The only reason uaccess routines might sleep
is if they fault. Make this explicit.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/asm-generic/uaccess.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
index c184aa8..dc1269c 100644
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess.h
@@ -163,7 +163,7 @@ static inline __must_check long __copy_to_user(void __user *to,
#define put_user(x, ptr) \
({ \
- might_sleep(); \
+ might_fault(); \
access_ok(VERIFY_WRITE, ptr, sizeof(*ptr)) ? \
__put_user(x, ptr) : \
-EFAULT; \
@@ -225,7 +225,7 @@ extern int __put_user_bad(void) __attribute__((noreturn));
#define get_user(x, ptr) \
({ \
- might_sleep(); \
+ might_fault(); \
access_ok(VERIFY_READ, ptr, sizeof(*ptr)) ? \
__get_user(x, ptr) : \
-EFAULT; \
@@ -255,7 +255,7 @@ extern int __get_user_bad(void) __attribute__((noreturn));
static inline long copy_from_user(void *to,
const void __user * from, unsigned long n)
{
- might_sleep();
+ might_fault();
if (access_ok(VERIFY_READ, from, n))
return __copy_from_user(to, from, n);
else
@@ -265,7 +265,7 @@ static inline long copy_from_user(void *to,
static inline long copy_to_user(void __user *to,
const void *from, unsigned long n)
{
- might_sleep();
+ might_fault();
if (access_ok(VERIFY_WRITE, to, n))
return __copy_to_user(to, from, n);
else
@@ -336,7 +336,7 @@ __clear_user(void __user *to, unsigned long n)
static inline __must_check unsigned long
clear_user(void __user *to, unsigned long n)
{
- might_sleep();
+ might_fault();
if (!access_ok(VERIFY_WRITE, to, n))
return n;
--
MST
next prev parent reply other threads:[~2013-05-16 11:16 UTC|newest]
Thread overview: 42+ 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:10 ` Michael S. Tsirkin [this message]
2013-05-16 11:10 ` [PATCH v2 02/10] arm64: uaccess s/might_sleep/might_fault/ Michael S. Tsirkin
2013-05-16 13:29 ` Catalin Marinas
2013-05-16 11:10 ` [PATCH v2 03/10] frv: " Michael S. Tsirkin
2013-05-16 11:11 ` [PATCH v2 04/10] m32r: " Michael S. Tsirkin
2013-05-16 11:11 ` [PATCH v2 05/10] microblaze: " Michael S. Tsirkin
2013-05-16 11:12 ` [PATCH v2 06/10] mn10300: " Michael S. Tsirkin
2013-05-16 11:15 ` [PATCH v2 07/10] powerpc: " Michael S. Tsirkin
2013-05-22 13:59 ` Arnd Bergmann
2013-05-22 14:30 ` Michael S. Tsirkin
2013-05-24 13:00 ` Michael S. Tsirkin
2013-05-24 13:11 ` Michael S. Tsirkin
2013-05-24 13:30 ` Arnd Bergmann
2013-05-16 11:15 ` [PATCH v2 08/10] tile: " Michael S. Tsirkin
2013-05-16 13:33 ` Chris Metcalf
2013-05-16 11:15 ` [PATCH v2 09/10] x86: " 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 18:40 ` Peter Zijlstra
2013-05-19 9:35 ` Michael S. Tsirkin
2013-05-19 12:34 ` Steven Rostedt
2013-05-19 13:34 ` Michael S. Tsirkin
2013-05-19 16:06 ` Steven Rostedt
2013-05-19 16:40 ` Michael S. Tsirkin
2013-05-19 20:23 ` Steven Rostedt
2013-05-19 20:35 ` Michael S. Tsirkin
2013-05-21 11:18 ` Peter Zijlstra
2013-05-21 11:21 ` Peter Zijlstra
2013-05-21 11:57 ` Peter Zijlstra
2013-05-22 9:47 ` Michael S. Tsirkin
2013-05-22 10:16 ` Peter Zijlstra
2013-05-22 20:38 ` 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:58 ` Michael S. Tsirkin
2013-05-22 10:19 ` Peter Zijlstra
2013-05-22 11:07 ` Michael S. Tsirkin
2013-05-22 11:27 ` Peter Zijlstra
2013-05-22 13:41 ` Russell King - ARM Linux
2013-05-22 14:04 ` Arnd Bergmann
2013-05-22 14:44 ` Michael S. Tsirkin
2013-05-24 14:18 ` [PATCH v3 07/11] powerpc: uaccess s/might_sleep/might_fault/ 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=0138f31b9c0f1764a0d6bbed2ee9aa3aedea6815.1368702323.git.mst@redhat.com \
--to=mst@redhat.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=cmetcalf@tilera.com \
--cc=dhowells@redhat.com \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-am33-list@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m32r-ja@ml.linux-m32r.org \
--cc=linux-m32r@ml.linux-m32r.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=mingo@redhat.com \
--cc=monstr@monstr.eu \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=takata@linux-m32r.org \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
--cc=yasutake.koichi@jp.panasonic.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).