Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1685300

Re: KASAN vs. boot-time switching between 4- and 5-level paging

Show all headers | View raw

> > Can use your Signed-off-by for a [cleaned up version of your] patch?
> 
> Sure.

Another KASAN-releated issue: dumping page tables for KASAN shadow memory
region takes unreasonable time due to kasan_zero_p?? mapped there.

The patch below helps. Any objections?

diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c
index b371ab68f2d4..8601153c34e7 100644
--- a/arch/x86/mm/dump_pagetables.c
+++ b/arch/x86/mm/dump_pagetables.c
@@ -17,8 +17,8 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/seq_file.h>
+#include <linux/kasan.h>
 
-#include <asm/kasan.h>
 #include <asm/pgtable.h>
 
 /*
@@ -291,10 +291,15 @@ static void note_page(struct seq_file *m, struct pg_state *st,
 static void walk_pte_level(struct seq_file *m, struct pg_state *st, pmd_t addr, unsigned long P)
 {
 	int i;
+	unsigned long pte_addr;
 	pte_t *start;
 	pgprotval_t prot;
 
-	start = (pte_t *)pmd_page_vaddr(addr);
+	pte_addr = pmd_page_vaddr(addr);
+	if (__pa(pte_addr) == __pa(kasan_zero_pte))
+		return;
+
+	start = (pte_t *)pte_addr;
 	for (i = 0; i < PTRS_PER_PTE; i++) {
 		prot = pte_flags(*start);
 		st->current_address = normalize_addr(P + i * PTE_LEVEL_MULT);
@@ -308,10 +313,15 @@ static void walk_pte_level(struct seq_file *m, struct pg_state *st, pmd_t addr,
 static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr, unsigned long P)
 {
 	int i;
+	unsigned long pmd_addr;
 	pmd_t *start;
 	pgprotval_t prot;
 
-	start = (pmd_t *)pud_page_vaddr(addr);
+	pmd_addr = pud_page_vaddr(addr);
+	if (__pa(pmd_addr) == __pa(kasan_zero_pmd))
+		return;
+
+	start = (pmd_t *)pmd_addr;
 	for (i = 0; i < PTRS_PER_PMD; i++) {
 		st->current_address = normalize_addr(P + i * PMD_LEVEL_MULT);
 		if (!pmd_none(*start)) {
@@ -350,12 +360,16 @@ static bool pud_already_checked(pud_t *prev_pud, pud_t *pud, bool checkwx)
 static void walk_pud_level(struct seq_file *m, struct pg_state *st, p4d_t addr, unsigned long P)
 {
 	int i;
+	unsigned long pud_addr;
 	pud_t *start;
 	pgprotval_t prot;
 	pud_t *prev_pud = NULL;
 
-	start = (pud_t *)p4d_page_vaddr(addr);
+	pud_addr = p4d_page_vaddr(addr);
+	if (__pa(pud_addr) == __pa(kasan_zero_pud))
+		return;
 
+	start = (pud_t *)pud_addr;
 	for (i = 0; i < PTRS_PER_PUD; i++) {
 		st->current_address = normalize_addr(P + i * PUD_LEVEL_MULT);
 		if (!pud_none(*start) &&
@@ -386,11 +400,15 @@ static void walk_pud_level(struct seq_file *m, struct pg_state *st, p4d_t addr,
 static void walk_p4d_level(struct seq_file *m, struct pg_state *st, pgd_t addr, unsigned long P)
 {
 	int i;
+	unsigned long p4d_addr;
 	p4d_t *start;
 	pgprotval_t prot;
 
-	start = (p4d_t *)pgd_page_vaddr(addr);
+	p4d_addr = pgd_page_vaddr(addr);
+	if (__pa(p4d_addr) == __pa(kasan_zero_p4d))
+		return;
 
+	start = (p4d_t *)p4d_addr;
 	for (i = 0; i < PTRS_PER_P4D; i++) {
 		st->current_address = normalize_addr(P + i * P4D_LEVEL_MULT);
 		if (!p4d_none(*start)) {
-- 
 Kirill A. Shutemov

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-07-10 14:40 +0200
  Re: KASAN vs. boot-time switching between 4- and 5-level paging Dmitry Vyukov <dvyukov@google.com> - 2017-07-10 14:50 +0200
    Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-07-10 16:20 +0200
      Re: KASAN vs. boot-time switching between 4- and 5-level paging Andy Lutomirski <luto@amacapital.net> - 2017-07-10 18:00 +0200
        Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-07-10 20:50 +0200
          Re: KASAN vs. boot-time switching between 4- and 5-level paging Andy Lutomirski <luto@kernel.org> - 2017-07-10 22:10 +0200
            Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-07-10 23:30 +0200
              Re: KASAN vs. boot-time switching between 4- and 5-level paging Andy Lutomirski <luto@kernel.org> - 2017-07-11 02:40 +0200
                Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-07-11 12:40 +0200
                Re: KASAN vs. boot-time switching between 4- and 5-level paging Andy Lutomirski <luto@kernel.org> - 2017-07-11 17:10 +0200
                Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-07-11 19:10 +0200
                Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-07-11 21:10 +0200
                Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-07-13 16:00 +0200
                Re: KASAN vs. boot-time switching between 4- and 5-level paging "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-07-13 16:20 +0200

csiph-web