Skip to content

Commit f92c494

Browse files
VMoolaakpm00
authored andcommitted
x86: convert various functions to use ptdescs
In order to split struct ptdesc from struct page, convert various functions to use ptdescs. Some of the functions use the *get*page*() helper functions. Convert these to use pagetable_alloc() and ptdesc_address() instead to help standardize page tables further. Link: https://lkml.kernel.org/r/20230807230513.102486-14-vishal.moola@gmail.com Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Cc: Claudio Imbrenda <imbrenda@linux.ibm.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Dinh Nguyen <dinguyen@kernel.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Guo Ren <guoren@kernel.org> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: Jonas Bonn <jonas@southpole.se> Cc: Matthew Wilcox <willy@infradead.org> Cc: Mike Rapoport (IBM) <rppt@kernel.org> Cc: Palmer Dabbelt <palmer@rivosinc.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Richard Weinberger <richard@nod.at> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 4eaca96 commit f92c494

File tree

1 file changed

+28
-19
lines changed

1 file changed

+28
-19
lines changed

arch/x86/mm/pgtable.c

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ early_param("userpte", setup_userpte);
5252

5353
void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
5454
{
55-
pgtable_pte_page_dtor(pte);
55+
pagetable_pte_dtor(page_ptdesc(pte));
5656
paravirt_release_pte(page_to_pfn(pte));
5757
paravirt_tlb_remove_table(tlb, pte);
5858
}
5959

6060
#if CONFIG_PGTABLE_LEVELS > 2
6161
void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
6262
{
63-
struct page *page = virt_to_page(pmd);
63+
struct ptdesc *ptdesc = virt_to_ptdesc(pmd);
6464
paravirt_release_pmd(__pa(pmd) >> PAGE_SHIFT);
6565
/*
6666
* NOTE! For PAE, any changes to the top page-directory-pointer-table
@@ -69,8 +69,8 @@ void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
6969
#ifdef CONFIG_X86_PAE
7070
tlb->need_flush_all = 1;
7171
#endif
72-
pgtable_pmd_page_dtor(page);
73-
paravirt_tlb_remove_table(tlb, page);
72+
pagetable_pmd_dtor(ptdesc);
73+
paravirt_tlb_remove_table(tlb, ptdesc_page(ptdesc));
7474
}
7575

7676
#if CONFIG_PGTABLE_LEVELS > 3
@@ -92,16 +92,16 @@ void ___p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d)
9292

9393
static inline void pgd_list_add(pgd_t *pgd)
9494
{
95-
struct page *page = virt_to_page(pgd);
95+
struct ptdesc *ptdesc = virt_to_ptdesc(pgd);
9696

97-
list_add(&page->lru, &pgd_list);
97+
list_add(&ptdesc->pt_list, &pgd_list);
9898
}
9999

100100
static inline void pgd_list_del(pgd_t *pgd)
101101
{
102-
struct page *page = virt_to_page(pgd);
102+
struct ptdesc *ptdesc = virt_to_ptdesc(pgd);
103103

104-
list_del(&page->lru);
104+
list_del(&ptdesc->pt_list);
105105
}
106106

107107
#define UNSHARED_PTRS_PER_PGD \
@@ -112,12 +112,12 @@ static inline void pgd_list_del(pgd_t *pgd)
112112

113113
static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
114114
{
115-
virt_to_page(pgd)->pt_mm = mm;
115+
virt_to_ptdesc(pgd)->pt_mm = mm;
116116
}
117117

118118
struct mm_struct *pgd_page_get_mm(struct page *page)
119119
{
120-
return page->pt_mm;
120+
return page_ptdesc(page)->pt_mm;
121121
}
122122

123123
static void pgd_ctor(struct mm_struct *mm, pgd_t *pgd)
@@ -213,11 +213,14 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
213213
static void free_pmds(struct mm_struct *mm, pmd_t *pmds[], int count)
214214
{
215215
int i;
216+
struct ptdesc *ptdesc;
216217

217218
for (i = 0; i < count; i++)
218219
if (pmds[i]) {
219-
pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
220-
free_page((unsigned long)pmds[i]);
220+
ptdesc = virt_to_ptdesc(pmds[i]);
221+
222+
pagetable_pmd_dtor(ptdesc);
223+
pagetable_free(ptdesc);
221224
mm_dec_nr_pmds(mm);
222225
}
223226
}
@@ -230,18 +233,24 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[], int count)
230233

231234
if (mm == &init_mm)
232235
gfp &= ~__GFP_ACCOUNT;
236+
gfp &= ~__GFP_HIGHMEM;
233237

234238
for (i = 0; i < count; i++) {
235-
pmd_t *pmd = (pmd_t *)__get_free_page(gfp);
236-
if (!pmd)
239+
pmd_t *pmd = NULL;
240+
struct ptdesc *ptdesc = pagetable_alloc(gfp, 0);
241+
242+
if (!ptdesc)
237243
failed = true;
238-
if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
239-
free_page((unsigned long)pmd);
240-
pmd = NULL;
244+
if (ptdesc && !pagetable_pmd_ctor(ptdesc)) {
245+
pagetable_free(ptdesc);
246+
ptdesc = NULL;
241247
failed = true;
242248
}
243-
if (pmd)
249+
if (ptdesc) {
244250
mm_inc_nr_pmds(mm);
251+
pmd = ptdesc_address(ptdesc);
252+
}
253+
245254
pmds[i] = pmd;
246255
}
247256

@@ -830,7 +839,7 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr)
830839

831840
free_page((unsigned long)pmd_sv);
832841

833-
pgtable_pmd_page_dtor(virt_to_page(pmd));
842+
pagetable_pmd_dtor(virt_to_ptdesc(pmd));
834843
free_page((unsigned long)pmd);
835844

836845
return 1;

0 commit comments

Comments
 (0)