From: Christoph Hellwig <hch@lst.de>
To: Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Arnd Bergmann <arnd@arndb.de>,
Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org
Subject: [PATCH 3/8] asm-generic: fix unaligned access hamdling in raw_copy_{from,to}_user
Date: Fri, 4 Sep 2020 18:52:11 +0200 [thread overview]
Message-ID: <20200904165216.1799796-4-hch@lst.de> (raw)
In-Reply-To: <20200904165216.1799796-1-hch@lst.de>
Use get_unaligned and put_unaligned for the small constant size cases
in the generic uaccess routines. This ensures they can be used for
architectures that do not support unaligned loads and stores, while
being a no-op for those that do.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/asm-generic/uaccess.h | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
index cc3b2c8b68fab4..768502bbfb154e 100644
--- a/include/asm-generic/uaccess.h
+++ b/include/asm-generic/uaccess.h
@@ -36,19 +36,17 @@ raw_copy_from_user(void *to, const void __user * from, unsigned long n)
if (__builtin_constant_p(n)) {
switch(n) {
case 1:
- *(u8 *)to = *(u8 __force *)from;
+ *(u8 *)to = get_unaligned((u8 __force *)from);
return 0;
case 2:
- *(u16 *)to = *(u16 __force *)from;
+ *(u16 *)to = get_unaligned((u16 __force *)from);
return 0;
case 4:
- *(u32 *)to = *(u32 __force *)from;
+ *(u32 *)to = get_unaligned((u32 __force *)from);
return 0;
-#ifdef CONFIG_64BIT
case 8:
- *(u64 *)to = *(u64 __force *)from;
+ *(u64 *)to = get_unaligned((u64 __force *)from);
return 0;
-#endif
}
}
@@ -62,19 +60,17 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n)
if (__builtin_constant_p(n)) {
switch(n) {
case 1:
- *(u8 __force *)to = *(u8 *)from;
+ put_unaligned(*(u8 *)from, (u8 __force *)to);
return 0;
case 2:
- *(u16 __force *)to = *(u16 *)from;
+ put_unaligned(*(u16 *)from, (u16 __force *)to);
return 0;
case 4:
- *(u32 __force *)to = *(u32 *)from;
+ put_unaligned(*(u32 *)from, (u32 __force *)to);
return 0;
-#ifdef CONFIG_64BIT
case 8:
- *(u64 __force *)to = *(u64 *)from;
+ put_unaligned(*(u64 *)from, (u64 __force *)to);
return 0;
-#endif
default:
break;
}
--
2.28.0
next prev parent reply other threads:[~2020-09-04 16:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 16:52 remove set_fs for riscv Christoph Hellwig
2020-09-04 16:52 ` [PATCH 1/8] maccess: add a generic __{get,put}_kernel_nofault for nommu Christoph Hellwig
2020-09-04 16:52 ` [PATCH 2/8] uaccess: provide a generic TASK_SIZE_MAX definition Christoph Hellwig
2020-09-04 16:52 ` Christoph Hellwig [this message]
2020-09-04 18:04 ` [PATCH 3/8] asm-generic: fix unaligned access hamdling in raw_copy_{from,to}_user Arnd Bergmann
2020-09-05 7:14 ` Christoph Hellwig
2020-09-04 18:06 ` Al Viro
2020-09-04 22:35 ` Al Viro
2020-09-05 14:41 ` Al Viro
2020-09-07 8:07 ` Arnd Bergmann
2020-09-07 19:00 ` [PATCH 3/8] asm-generic: fix unaligned access hamdling in raw_copy_{from, to}_user Sean Anderson
2020-09-04 16:52 ` [PATCH 4/8] asm-generic: prepare uaccess.h for a set_fs-less world Christoph Hellwig
2020-09-04 16:52 ` [PATCH 5/8] riscv: use memcpy based uaccess for nommu again Christoph Hellwig
2020-09-04 16:52 ` [PATCH 6/8] riscv: refactor __get_user and __put_user Christoph Hellwig
2020-09-04 16:52 ` [PATCH 7/8] riscv: implement __get_kernel_nofault and __put_user_nofault Christoph Hellwig
2020-09-04 16:52 ` [PATCH 8/8] riscv: remove address space overrides using set_fs() Christoph Hellwig
2020-09-04 18:15 ` remove set_fs for riscv Arnd Bergmann
2020-09-05 7:17 ` Christoph Hellwig
2020-09-05 12:17 ` Arnd Bergmann
2020-09-06 22:14 ` Arnd Bergmann
2020-09-07 6:03 ` Christoph Hellwig
2020-09-07 14:58 ` Arnd Bergmann
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=20200904165216.1799796-4-hch@lst.de \
--to=hch@lst.de \
--cc=arnd@arndb.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=viro@zeniv.linux.org.uk \
/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).