tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull nommu generic uaccess updates from Arnd Bergmann:
"asm-generic: kill <asm/segment.h> and improve nommu generic uaccess helpers
Christoph Hellwig writes:
This is a series doing two somewhat interwinded things. It improves
the asm-generic nommu uaccess helper to optionally be entirely
generic and not require any arch helpers for the actual uaccess.
For the generic uaccess.h to actually be generically useful I also
had to kill off the mess we made of <asm/segment.h>, which really
shouldn't exist on most architectures"
* tag 'asm-generic-nommu' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic: optimize generic uaccess for 8-byte loads and stores
asm-generic: provide entirely generic nommu uaccess
arch: mostly remove <asm/segment.h>
asm-generic: don't include <asm/segment.h> from <asm/uaccess.h>
+64
-117
-6
arch/alpha/include/asm/segment.h
-6
arch/alpha/include/asm/segment.h
-1
arch/alpha/kernel/smc37c669.c
-1
arch/alpha/kernel/smc37c669.c
-1
arch/alpha/kernel/smc37c93x.c
-1
arch/alpha/kernel/smc37c93x.c
+1
arch/arc/include/asm/uaccess.h
+1
arch/arc/include/asm/uaccess.h
-1
arch/arm/include/asm/Kbuild
-1
arch/arm/include/asm/Kbuild
-1
arch/arm64/include/asm/Kbuild
-1
arch/arm64/include/asm/Kbuild
-1
arch/c6x/include/asm/Kbuild
-1
arch/c6x/include/asm/Kbuild
+1
arch/h8300/Kconfig
+1
arch/h8300/Kconfig
+1
arch/h8300/include/asm/Kbuild
+1
arch/h8300/include/asm/Kbuild
-55
arch/h8300/include/asm/uaccess.h
-55
arch/h8300/include/asm/uaccess.h
···
1
-
/* SPDX-License-Identifier: GPL-2.0 */
2
-
#ifndef _ASM_UACCESS_H
3
-
#define _ASM_UACCESS_H
4
-
5
-
#include <linux/string.h>
6
-
7
-
static inline __must_check unsigned long
8
-
raw_copy_from_user(void *to, const void __user * from, unsigned long n)
9
-
{
10
-
if (__builtin_constant_p(n)) {
11
-
switch(n) {
12
-
case 1:
13
-
*(u8 *)to = *(u8 __force *)from;
14
-
return 0;
15
-
case 2:
16
-
*(u16 *)to = *(u16 __force *)from;
17
-
return 0;
18
-
case 4:
19
-
*(u32 *)to = *(u32 __force *)from;
20
-
return 0;
21
-
}
22
-
}
23
-
24
-
memcpy(to, (const void __force *)from, n);
25
-
return 0;
26
-
}
27
-
28
-
static inline __must_check unsigned long
29
-
raw_copy_to_user(void __user *to, const void *from, unsigned long n)
30
-
{
31
-
if (__builtin_constant_p(n)) {
32
-
switch(n) {
33
-
case 1:
34
-
*(u8 __force *)to = *(u8 *)from;
35
-
return 0;
36
-
case 2:
37
-
*(u16 __force *)to = *(u16 *)from;
38
-
return 0;
39
-
case 4:
40
-
*(u32 __force *)to = *(u32 *)from;
41
-
return 0;
42
-
default:
43
-
break;
44
-
}
45
-
}
46
-
47
-
memcpy((void __force *)to, from, n);
48
-
return 0;
49
-
}
50
-
#define INLINE_COPY_FROM_USER
51
-
#define INLINE_COPY_TO_USER
52
-
53
-
#include <asm-generic/uaccess.h>
54
-
55
-
#endif
-1
arch/hexagon/include/asm/Kbuild
-1
arch/hexagon/include/asm/Kbuild
-1
arch/hexagon/include/asm/uaccess.h
-1
arch/hexagon/include/asm/uaccess.h
-6
arch/ia64/include/asm/segment.h
-6
arch/ia64/include/asm/segment.h
-1
arch/mips/include/asm/Kbuild
-1
arch/mips/include/asm/Kbuild
-1
arch/nds32/include/asm/Kbuild
-1
arch/nds32/include/asm/Kbuild
-1
arch/nios2/include/asm/Kbuild
-1
arch/nios2/include/asm/Kbuild
-1
arch/openrisc/include/asm/Kbuild
-1
arch/openrisc/include/asm/Kbuild
-1
arch/openrisc/kernel/ptrace.c
-1
arch/openrisc/kernel/ptrace.c
-1
arch/openrisc/kernel/setup.c
-1
arch/openrisc/kernel/setup.c
-1
arch/openrisc/kernel/traps.c
-1
arch/openrisc/kernel/traps.c
-1
arch/openrisc/mm/init.c
-1
arch/openrisc/mm/init.c
-1
arch/openrisc/mm/tlb.c
-1
arch/openrisc/mm/tlb.c
-1
arch/parisc/include/asm/Kbuild
-1
arch/parisc/include/asm/Kbuild
-5
arch/s390/include/asm/segment.h
-5
arch/s390/include/asm/segment.h
-1
arch/s390/kernel/ptrace.c
-1
arch/s390/kernel/ptrace.c
-1
arch/unicore32/include/asm/Kbuild
-1
arch/unicore32/include/asm/Kbuild
-16
arch/xtensa/include/asm/segment.h
-16
arch/xtensa/include/asm/segment.h
···
1
-
/*
2
-
* include/asm-xtensa/segment.h
3
-
*
4
-
* This file is subject to the terms and conditions of the GNU General Public
5
-
* License. See the file "COPYING" in the main directory of this archive
6
-
* for more details.
7
-
*
8
-
* Copyright (C) 2001 - 2005 Tensilica Inc.
9
-
*/
10
-
11
-
#ifndef _XTENSA_SEGMENT_H
12
-
#define _XTENSA_SEGMENT_H
13
-
14
-
#include <linux/uaccess.h>
15
-
16
-
#endif /* _XTENSA_SEGEMENT_H */
-9
include/asm-generic/segment.h
-9
include/asm-generic/segment.h
+57
-1
include/asm-generic/uaccess.h
+57
-1
include/asm-generic/uaccess.h
···
9
9
*/
10
10
#include <linux/string.h>
11
11
12
-
#include <asm/segment.h>
12
+
#ifdef CONFIG_UACCESS_MEMCPY
13
+
static inline __must_check unsigned long
14
+
raw_copy_from_user(void *to, const void __user * from, unsigned long n)
15
+
{
16
+
if (__builtin_constant_p(n)) {
17
+
switch(n) {
18
+
case 1:
19
+
*(u8 *)to = *(u8 __force *)from;
20
+
return 0;
21
+
case 2:
22
+
*(u16 *)to = *(u16 __force *)from;
23
+
return 0;
24
+
case 4:
25
+
*(u32 *)to = *(u32 __force *)from;
26
+
return 0;
27
+
#ifdef CONFIG_64BIT
28
+
case 8:
29
+
*(u64 *)to = *(u64 __force *)from;
30
+
return 0;
31
+
#endif
32
+
}
33
+
}
34
+
35
+
memcpy(to, (const void __force *)from, n);
36
+
return 0;
37
+
}
38
+
39
+
static inline __must_check unsigned long
40
+
raw_copy_to_user(void __user *to, const void *from, unsigned long n)
41
+
{
42
+
if (__builtin_constant_p(n)) {
43
+
switch(n) {
44
+
case 1:
45
+
*(u8 __force *)to = *(u8 *)from;
46
+
return 0;
47
+
case 2:
48
+
*(u16 __force *)to = *(u16 *)from;
49
+
return 0;
50
+
case 4:
51
+
*(u32 __force *)to = *(u32 *)from;
52
+
return 0;
53
+
#ifdef CONFIG_64BIT
54
+
case 8:
55
+
*(u64 __force *)to = *(u64 *)from;
56
+
return 0;
57
+
#endif
58
+
default:
59
+
break;
60
+
}
61
+
}
62
+
63
+
memcpy((void __force *)to, from, n);
64
+
return 0;
65
+
}
66
+
#define INLINE_COPY_FROM_USER
67
+
#define INLINE_COPY_TO_USER
68
+
#endif /* CONFIG_UACCESS_MEMCPY */
13
69
14
70
#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })
15
71