[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 30 Aug 2021 16:59:20 -0700
From: Rick Edgecombe <rick.p.edgecombe@...el.com>
To: dave.hansen@...el.com,
luto@...nel.org,
peterz@...radead.org,
x86@...nel.org,
akpm@...ux-foundation.org,
keescook@...omium.org,
shakeelb@...gle.com,
vbabka@...e.cz,
rppt@...nel.org
Cc: Rick Edgecombe <rick.p.edgecombe@...el.com>,
linux-mm@...ck.org,
linux-hardening@...r.kernel.org,
kernel-hardening@...ts.openwall.com,
ira.weiny@...el.com,
dan.j.williams@...el.com,
linux-kernel@...r.kernel.org
Subject: [RFC PATCH v2 12/19] x86/mm: Use free_table in unmap path
Memory hot unplug and memremap unmap paths will free direct map page
tables. So use free_table() for this.
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@...el.com>
---
arch/x86/mm/init_64.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index de5a785ee89f..c2680a77ca88 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -975,7 +975,7 @@ int arch_add_memory(int nid, u64 start, u64 size,
return add_pages(nid, start_pfn, nr_pages, params);
}
-static void __meminit free_pagetable(struct page *page, int order)
+static void __meminit free_pagetable(struct page *page, int order, bool table)
{
unsigned long magic;
unsigned int nr_pages = 1 << order;
@@ -991,8 +991,14 @@ static void __meminit free_pagetable(struct page *page, int order)
} else
while (nr_pages--)
free_reserved_page(page++);
- } else
- free_pages((unsigned long)page_address(page), order);
+ } else {
+ if (table) {
+ /* The page tables will always be order 0. */
+ free_table(page);
+ } else {
+ free_pages((unsigned long)page_address(page), order);
+ }
+ }
}
static void __meminit gather_table(struct page *page, struct list_head *tables)
@@ -1008,7 +1014,7 @@ static void __meminit gather_table_finish(struct list_head *tables)
list_for_each_entry_safe(page, next, tables, lru) {
list_del(&page->lru);
- free_pagetable(page, 0);
+ free_pagetable(page, 0, true);
}
}
@@ -1018,7 +1024,7 @@ static void __meminit free_hugepage_table(struct page *page,
if (altmap)
vmem_altmap_free(altmap, PMD_SIZE / PAGE_SIZE);
else
- free_pagetable(page, get_order(PMD_SIZE));
+ free_pagetable(page, get_order(PMD_SIZE), false);
}
static void __meminit free_pte_table(pte_t *pte_start, pmd_t *pmd, struct list_head *tables)
@@ -1102,7 +1108,7 @@ remove_pte_table(pte_t *pte_start, unsigned long addr, unsigned long end,
return;
if (!direct)
- free_pagetable(pte_page(*pte), 0);
+ free_pagetable(pte_page(*pte), 0, false);
spin_lock(&init_mm.page_table_lock);
pte_clear(&init_mm, addr, pte);
--
2.17.1
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
