Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- Fix "rodata=on" not disabling "rodata=full" on arm64
- Add arm64 make dependency between vmlinuz.efi and Image, leading to
occasional build failures previously (with parallel building)
- Add newline to the output formatting of the za-fork kselftest
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: add dependency between vmlinuz.efi and Image
kselftest/arm64: Fix output formatting for za-fork
arm64: mm: Fix "rodata=on" when CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
+20
-8
+1
-1
arch/arm64/Makefile
+1
-1
arch/arm64/Makefile
+15
-2
arch/arm64/include/asm/setup.h
+15
-2
arch/arm64/include/asm/setup.h
···
21
21
extern bool rodata_enabled;
22
22
extern bool rodata_full;
23
23
24
-
if (arg && !strcmp(arg, "full")) {
24
+
if (!arg)
25
+
return false;
26
+
27
+
if (!strcmp(arg, "full")) {
28
+
rodata_enabled = rodata_full = true;
29
+
return true;
30
+
}
31
+
32
+
if (!strcmp(arg, "off")) {
33
+
rodata_enabled = rodata_full = false;
34
+
return true;
35
+
}
36
+
37
+
if (!strcmp(arg, "on")) {
25
38
rodata_enabled = true;
26
-
rodata_full = true;
39
+
rodata_full = false;
27
40
return true;
28
41
}
29
42
+3
-4
arch/arm64/mm/pageattr.c
+3
-4
arch/arm64/mm/pageattr.c
···
29
29
*
30
30
* KFENCE pool requires page-granular mapping if initialized late.
31
31
*/
32
-
return (rodata_enabled && rodata_full) || debug_pagealloc_enabled() ||
33
-
arm64_kfence_can_set_direct_map();
32
+
return rodata_full || debug_pagealloc_enabled() ||
33
+
arm64_kfence_can_set_direct_map();
34
34
}
35
35
36
36
static int change_page_range(pte_t *ptep, unsigned long addr, void *data)
···
105
105
* If we are manipulating read-only permissions, apply the same
106
106
* change to the linear mapping of the pages that back this VM area.
107
107
*/
108
-
if (rodata_enabled &&
109
-
rodata_full && (pgprot_val(set_mask) == PTE_RDONLY ||
108
+
if (rodata_full && (pgprot_val(set_mask) == PTE_RDONLY ||
110
109
pgprot_val(clear_mask) == PTE_RDONLY)) {
111
110
for (i = 0; i < area->nr_pages; i++) {
112
111
__change_memory_common((u64)page_address(area->pages[i]),
+1
-1
tools/testing/selftests/arm64/fp/za-fork.c
+1
-1
tools/testing/selftests/arm64/fp/za-fork.c