| Message ID | 20201019211049.22524-1-richard@nod.at |
|---|---|
| State | Accepted |
| Headers | show |
| Series | um: Call pgtable_pmd_page_dtor() in __pmd_free_tlb() | expand |
On Mon, Oct 19, 2020 at 11:10:49PM +0200, Richard Weinberger wrote: > Commit b2b29d6d0119 ("mm: account PMD tables like PTE tables") uncovered > a bug in uml, we forgot to call the destructor. > While we are here, give x a sane name. > > Reported-by: Anton Ivanov <anton.ivanov@cambridgegreys.com> > Co-developed-by: Matthew Wilcox <willy@infradead.org> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > Signed-off-by: Richard Weinberger <richard@nod.at> And as a bonus, $ grep PageTables /proc/meminfo PageTables: 128720 kB gets more accurate!
On Mon, Oct 19, 2020 at 11:10:49PM +0200, Richard Weinberger wrote: > Commit b2b29d6d0119 ("mm: account PMD tables like PTE tables") uncovered > a bug in uml, we forgot to call the destructor. > While we are here, give x a sane name. > > Reported-by: Anton Ivanov <anton.ivanov@cambridgegreys.com> > Co-developed-by: Matthew Wilcox <willy@infradead.org> > Signed-off-by: Richard Weinberger <richard@nod.at> Tested-by: Christopher Obbard <chris.obbard@collabora.com>
diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h index 5393e13e07e0..2bbf28cf3aa9 100644 --- a/arch/um/include/asm/pgalloc.h +++ b/arch/um/include/asm/pgalloc.h @@ -33,7 +33,13 @@ do { \ } while (0) #ifdef CONFIG_3_LEVEL_PGTABLES -#define __pmd_free_tlb(tlb,x, address) tlb_remove_page((tlb),virt_to_page(x)) + +#define __pmd_free_tlb(tlb, pmd, address) \ +do { \ + pgtable_pmd_page_dtor(virt_to_page(pmd)); \ + tlb_remove_page((tlb),virt_to_page(pmd)); \ +} while (0) \ + #endif #endif
Commit b2b29d6d0119 ("mm: account PMD tables like PTE tables") uncovered a bug in uml, we forgot to call the destructor. While we are here, give x a sane name. Reported-by: Anton Ivanov <anton.ivanov@cambridgegreys.com> Co-developed-by: Matthew Wilcox <willy@infradead.org> Signed-off-by: Richard Weinberger <richard@nod.at> --- arch/um/include/asm/pgalloc.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)