x86/mm changes for v4.11
Linus,
Please pull the latest x86-mm-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-mm-for-linus
# HEAD: 025205f8f30c6ab52b69bf34fb359ac80360fefd x86/mm/ptdump: Add address marker for KASAN shadow region
A laundry list of changes: KASAN improvements/fixes for ptdump, a self-test fix, PAT cleanup and wbinvd() avoidance, removal of stale code and documentation updates.
out-of-topic modifications in x86-mm-for-linus:
-------------------------------------------------
tools/testing/selftests/x86/Makefile# e64d5fbe5625: x86/mpx: Re-add MPX to selft
Thanks,
Ingo
------------------>
Andrey Ryabinin (2):
x86/mm/ptdump: Optimize check for W+X mappings for CONFIG_KASAN=y x86/mm/ptdump: Add address marker for KASAN shadow region
Dave Hansen (1):
x86/mpx: Re-add MPX to selftests Makefile
Geliang Tang (1):
x86/mm/pat: Use rb_entry()
John Ogness (1):
x86/mm/cpa: Avoid wbinvd() for PREEMPT
Jonathan Corbet (1):
x86/mm: Improve documentation for low-level device I/O functions
Kees Cook (1):
x86/mm: Remove CONFIG_DEBUG_NX_TEST
arch/x86/Kconfig.debug | 8 -- arch/x86/include/asm/io.h | 46 +++++++--- arch/x86/kernel/Makefile | 1 - arch/x86/kernel/test_nx.c | 173 ----------------------------------- arch/x86/mm/dump_pagetables.c | 25 ++++- arch/x86/mm/pageattr.c | 13 +++ arch/x86/mm/pat_rbtree.c | 12 +-- tools/testing/selftests/x86/Makefile | 2 +- 8 files changed, 79 insertions(+), 201 deletions(-) delete mode 100644 arch/x86/kernel/test_nx.c
arch/x86/Kconfig.debug +0 -8
@@ -120,14 +120,6 @@ config DEBUG_SET_MODULE_RONX against certain classes of kernel exploits. If in doubt, say "N". -config DEBUG_NX_TEST - tristate "Testcase for the NX non-executable stack feature" - depends on DEBUG_KERNEL && m - ---help--- - This option enables a testcase for the CPU NX capability - and the software setup of this feature. - If in doubt, say "N" - config DOUBLEFAULT default y bool "Enable doublefault exception handler" if EXPERT
arch/x86/include/asm/io.h +35 -11
76 lines not on this page · raw message
arch/x86/kernel/Makefile +0 -1
@@ -101,7 +101,6 @@ obj-$(CONFIG_APB_TIMER) += apb_timer.o obj-$(CONFIG_AMD_NB) += amd_nb.o obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o -obj-$(CONFIG_DEBUG_NX_TEST) += test_nx.o obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o obj-$(CONFIG_KVM_GUEST) += kvm.o kvmclock.o
arch/x86/kernel/test_nx.c deleted +0 -173
173 lines not on this page · raw message
arch/x86/mm/dump_pagetables.c +24 -1
@@ -18,6 +18,7 @@#include <linux/sched.h> #include <linux/seq_file.h> +#include <asm/kasan.h> #include <asm/pgtable.h> /*
@@ -51,6 +52,10 @@ enum address_markers_idx {LOW_KERNEL_NR ,VMALLOC_START_NR ,VMEMMAP_START_NR , +#ifdef CONFIG_KASAN +KASAN_SHADOW_START_NR , +KASAN_SHADOW_END_NR , +#endif # ifdef CONFIG_X86_ESPFIX64 ESPFIX_START_NR, # endif
@@ -76,6 +81,10 @@ static struct addr_marker address_markers[] = { { 0/* PAGE_OFFSET */, "Low Kernel Mapping" }, { 0/* VMALLOC_START */, "vmalloc() Area" }, { 0/* VMEMMAP_START */, "Vmemmap" }, +#ifdef CONFIG_KASAN + { KASAN_SHADOW_START, "KASAN shadow" }, + { KASAN_SHADOW_END, "KASAN shadow end" }, +#endif # ifdef CONFIG_X86_ESPFIX64 { ESPFIX_BASE_ADDR, "ESPfix Area", 16 }, # endif
@@ -327,18 +336,31 @@ static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr,#if PTRS_PER_PUD >1 +/* +* This is an optimization for CONFIG_DEBUG_WX=y + CONFIG_KASAN=y +* KASAN fills page tables with the same values. Since there is no +* point in checking page table more than once we just skip repeated +* entries. This saves us dozens of seconds during boot. +*/ +static bool pud_already_checked (pud_t *prev_pud,pud_t *pud,bool checkwx) +{ +return checkwx && prev_pud && (pud_val (*prev_pud) ==pud_val (*pud)); +} +static void walk_pud_level (struct seq_file *m,struct pg_state *st,pgd_t addr,unsigned long P ) {int i;pud_t *start;pgprotval_t prot; +pud_t *prev_pud =NULL ; start = (pud_t *)pgd_page_vaddr (addr);for (i =0 ; i <PTRS_PER_PUD ; i++) { st->current_address =normalize_addr (P + i *PUD_LEVEL_MULT ); -if (!pud_none (*start)) { +if (!pud_none (*start) && + !pud_already_checked (prev_pud, start, st->check_wx)) {if (pud_large (*start) || !pud_present (*start)) { prot =pud_flags (*start);note_page (m, st,__pgprot (prot),2 );
@@ -349,6 +371,7 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st, pgd_t addr, }else note_page (m, st,__pgprot (0 ),2 ); + prev_pud = start; start++; } }
arch/x86/mm/pageattr.c +13 -0
@@ -214,7 +214,20 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache, int in_flags, struct page **pages) {unsigned int i, level; +#ifdef CONFIG_PREEMPT +/* +* Avoid wbinvd() because it causes latencies on all CPUs, +* regardless of any CPU isolation that may be in effect. +* +* This should be extended for CAT enabled systems independent of +* PREEMPT because wbinvd() does not respect the CAT partitions and +* this is exposed to unpriviledged users through the graphics +* subsystem. +*/ +unsigned long do_wbinvd =0 ; +#else unsigned long do_wbinvd = cache && numpages >=1024 ;/* 4M threshold */ +#endif BUG_ON (irqs_disabled ());
arch/x86/mm/pat_rbtree.c +6 -6
@@ -47,7 +47,7 @@ static u64 get_subtree_max_end(struct rb_node *node) {u64 ret =0 ;if (node) { - struct memtype *data = container_of(node, struct memtype, rb); + struct memtype *data = rb_entry(node, struct memtype, rb); ret = data->subtree_max_end; }return ret;
@@ -79,7 +79,7 @@ static struct memtype *memtype_rb_lowest_match(struct rb_root *root,struct memtype *last_lower =NULL ;while (node) { - struct memtype *data = container_of(node, struct memtype, rb); + struct memtype *data = rb_entry(node, struct memtype, rb);if (get_subtree_max_end (node->rb_left) > start) {/* Lowest overlap if any must be on left side */
@@ -121,7 +121,7 @@ static struct memtype *memtype_rb_match(struct rb_root *root, node =rb_next (&match->rb);if (node) - match = container_of(node, struct memtype, rb); + match = rb_entry(node, struct memtype, rb);else match =NULL ; }
@@ -150,7 +150,7 @@ static int memtype_rb_check_conflict(struct rb_root *root, node =rb_next (&match->rb);while (node) { - match = container_of(node, struct memtype, rb); + match = rb_entry(node, struct memtype, rb);if (match->start >= end)/* Checked all possible matches */ goto success;
@@ -181,7 +181,7 @@ static void memtype_rb_insert(struct rb_root *root, struct memtype *newdata)struct rb_node *parent =NULL ;while (*node) { - struct memtype *data = container_of(*node, struct memtype, rb); + struct memtype *data = rb_entry(*node, struct memtype, rb); parent = *node;if (data->subtree_max_end < newdata->end)
@@ -270,7 +270,7 @@ int rbt_memtype_copy_nth_element(struct memtype *out, loff_t pos) }if (node) {/* pos == i */ - struct memtype *this = container_of(node, struct memtype, rb); + struct memtype *this = rb_entry(node, struct memtype, rb); *out = *this;return 0 ; }else {
tools/testing/selftests/x86/Makefile +1 -1
@@ -5,7 +5,7 @@ include ../lib.mk .PHONY: all all_32 all_64 warn_32bit_failure clean TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt ptrace_syscall test_mremap_vdso \ - check_initial_reg_state sigreturn ldt_gdt iopl \ + check_initial_reg_state sigreturn ldt_gdt iopl mpx-mini-test \ protection_keys test_vdso TARGETS_C_32BIT_ONLY := entry_from_vm86 syscall_arg_fault test_syscall_vdso unwind_vdso \ test_FCMOV test_FCOMI test_FISTTP \