riscv: mm: make pmd_bad() check leaf condition

sunnanyong · palmer-dabbelt · commit 141682f5b9d6 · 2021-05-22T10:19:38.000-07:00
In the definition in Documentation/vm/arch_pgtable_helpers.rst,
pmd_bad() means test a non-table mapped PMD, so it should also
return true when it is a leaf page.

Signed-off-by: Nanyong Sun &lt;sunnanyong@huawei.com&gt;
Signed-off-by: Palmer Dabbelt &lt;palmerdabbelt@google.com&gt;
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
@@ -184,7 +184,7 @@ static inline int pmd_none(pmd_t pmd)
 
 static inline int pmd_bad(pmd_t pmd)
 {
-	return !pmd_present(pmd);
+	return !pmd_present(pmd) || (pmd_val(pmd) & _PAGE_LEAF);
 }
 
 #define pmd_leaf	pmd_leaf

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ static inline int pmd_none(pmd_t pmd)`
`184`	`184`
`185`	`185`	`static inline int pmd_bad(pmd_t pmd)`
`186`	`186`	`{`
`187`		`- return !pmd_present(pmd);`
	`187`	`+ return !pmd_present(pmd) \|\| (pmd_val(pmd) & _PAGE_LEAF);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`#define pmd_leaf pmd_leaf`