arm64: fix erroneous warnings in page freeing functions
Mark Rutland
reviewerPATCH 1/1 arm64: fix erroneous warnings in page freeing functions
In pmd_free_pte_page() and pud_free_pmd_page() we try to warn if they hit a present non-table entry. In both cases we'll warn for non-present entries, as the VM_WARN_ON() only checks the entry is not a table entry.
This has been observed to result in warnings when booting a v4.19-rc2 kernel under qemu.
Fix this by bailing out earlier for non-present entries.
--- arch/arm64/mm/mmu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/arm64/mm/mmu.c +6 -4
@@ -985,8 +985,9 @@ int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr) pmd =READ_ONCE (*pmdp); -/* No-op for empty entry and WARN_ON for valid entry */ -if (!pmd_present (pmd) || !pmd_table (pmd)) { +if (!pmd_present (pmd)) +return 1 ; +if (!pmd_table (pmd)) {VM_WARN_ON (!pmd_table (pmd));return 1 ; }
@@ -1007,8 +1008,9 @@ int pud_free_pmd_page(pud_t *pudp, unsigned long addr) pud =READ_ONCE (*pudp); -/* No-op for empty entry and WARN_ON for valid entry */ -if (!pud_present (pud) || !pud_table (pud)) { +if (!pud_present (pud)) +return 1 ; +if (!pud_table (pud)) {VM_WARN_ON (!pud_table (pud));return 1 ; }
Signature · 1 line
2.11.0
PATCH 1/1 arm64: fix erroneous warnings in page freeing functions
Quoted 22 lines · Mark Rutland
In
pmd_free_pte_page()andpud_free_pmd_page()we try to warn if they hit a present non-table entry. In both cases we'll warn for non-present entries, as theVM_WARN_ON()only checks the entry is not a table entry.This has been observed to result in warnings when booting a v4.19-rc2 kernel under qemu.
Fix this by bailing out earlier for non-present entries.
Fixes ec28bb9c9b0826d7 ("arm64: Implement page table free interfaces")Signed-off-by Mark Rutland <[email protected]>Cc Will Deacon <[email protected]>Cc Catalin Marinas <[email protected]>--- arch/arm64/mm/mmu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)arch/arm64/mm/mmu.c +0
-0
arch/arm64/mm/mmu.c int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr) · line 990
Quoted 8 lines
arch/arm64/mm/mmu.c +3
-2@@ -985,8 +985,9 @@ int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr) pmd =READ_ONCE (*pmdp); -/* No-op for empty entry and WARN_ON for valid entry */ -if (!pmd_present (pmd) || !pmd_table (pmd)) { +if (!pmd_present (pmd)) +return 1 ; +if (!pmd_table (pmd)) {
It's a pity this can't be written as:
if (!pmd_present(pmd) || VM_WARN_ON(!pmd_table(pmd))) return 1;
and I suspect the fact that you can't do that with VM_WARN_ON actually contributed to the bug in the first place.
Anywho, thanks for fixing it. I'll queue this up as a fix.
Will