| Message ID | 20230622205745.79707-25-vishal.moola@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Split ptdesc from struct page | expand |
Hi Vishal,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20230622]
[cannot apply to akpm-mm/mm-everything powerpc/next powerpc/fixes s390/features geert-m68k/for-next geert-m68k/for-linus linus/master v6.4-rc7 v6.4-rc6 v6.4-rc5 v6.4-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Vishal-Moola-Oracle/mm-Add-PAGE_TYPE_OP-folio-functions/20230623-050011
base: next-20230622
patch link: https://lore.kernel.org/r/20230622205745.79707-25-vishal.moola%40gmail.com
patch subject: [PATCH v5 24/33] m68k: Convert various functions to use ptdescs
config: m68k-randconfig-s051-20230625 (https://download.01.org/0day-ci/archive/20230625/202306251513.WVzxgGxu-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 12.3.0
reproduce: (https://download.01.org/0day-ci/archive/20230625/202306251513.WVzxgGxu-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306251513.WVzxgGxu-lkp@intel.com/
All error/warnings (new ones prefixed by >>):
In file included from arch/m68k/include/asm/pgalloc.h:12,
from kernel/fork.c:103:
arch/m68k/include/asm/mcf_pgalloc.h: In function 'pgd_alloc':
>> arch/m68k/include/asm/mcf_pgalloc.h:82:60: error: 'GFP_NOWARN' undeclared (first use in this function); did you mean 'GFP_NOWAIT'?
82 | struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | GFP_NOWARN) &
| ^~~~~~~~~~
| GFP_NOWAIT
arch/m68k/include/asm/mcf_pgalloc.h:82:60: note: each undeclared identifier is reported only once for each function it appears in
arch/m68k/include/asm/mcf_pgalloc.h: At top level:
>> arch/m68k/include/asm/mcf_pgalloc.h:23:16: warning: 'ptdesc_address' is static but used in inline function 'pte_alloc_one_kernel' which is not static
23 | return ptdesc_address(ptdesc);
| ^~~~~~~~~~~~~~
>> arch/m68k/include/asm/mcf_pgalloc.h:17:33: warning: 'pagetable_alloc' is static but used in inline function 'pte_alloc_one_kernel' which is not static
17 | struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | __GFP_ZERO) &
| ^~~~~~~~~~~~~~~
>> arch/m68k/include/asm/mcf_pgalloc.h:10:24: warning: 'virt_to_ptdesc' is static but used in inline function 'pte_free_kernel' which is not static
10 | pagetable_free(virt_to_ptdesc(pte));
| ^~~~~~~~~~~~~~
>> arch/m68k/include/asm/mcf_pgalloc.h:10:9: warning: 'pagetable_free' is static but used in inline function 'pte_free_kernel' which is not static
10 | pagetable_free(virt_to_ptdesc(pte));
| ^~~~~~~~~~~~~~
--
In file included from arch/m68k/mm/mcfmmu.c:21:
arch/m68k/include/asm/mcf_pgalloc.h: In function 'pgd_alloc':
>> arch/m68k/include/asm/mcf_pgalloc.h:82:60: error: 'GFP_NOWARN' undeclared (first use in this function); did you mean 'GFP_NOWAIT'?
82 | struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | GFP_NOWARN) &
| ^~~~~~~~~~
| GFP_NOWAIT
arch/m68k/include/asm/mcf_pgalloc.h:82:60: note: each undeclared identifier is reported only once for each function it appears in
arch/m68k/mm/mcfmmu.c: At top level:
arch/m68k/mm/mcfmmu.c:36:13: warning: no previous prototype for 'paging_init' [-Wmissing-prototypes]
36 | void __init paging_init(void)
| ^~~~~~~~~~~
arch/m68k/mm/mcfmmu.c: In function 'paging_init':
arch/m68k/mm/mcfmmu.c:41:37: warning: variable 'bootmem_end' set but not used [-Wunused-but-set-variable]
41 | unsigned long next_pgtable, bootmem_end;
| ^~~~~~~~~~~
arch/m68k/include/asm/mcf_pgalloc.h: At top level:
>> arch/m68k/include/asm/mcf_pgalloc.h:23:16: warning: 'ptdesc_address' is static but used in inline function 'pte_alloc_one_kernel' which is not static
23 | return ptdesc_address(ptdesc);
| ^~~~~~~~~~~~~~
>> arch/m68k/include/asm/mcf_pgalloc.h:17:33: warning: 'pagetable_alloc' is static but used in inline function 'pte_alloc_one_kernel' which is not static
17 | struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | __GFP_ZERO) &
| ^~~~~~~~~~~~~~~
>> arch/m68k/include/asm/mcf_pgalloc.h:10:24: warning: 'virt_to_ptdesc' is static but used in inline function 'pte_free_kernel' which is not static
10 | pagetable_free(virt_to_ptdesc(pte));
| ^~~~~~~~~~~~~~
>> arch/m68k/include/asm/mcf_pgalloc.h:10:9: warning: 'pagetable_free' is static but used in inline function 'pte_free_kernel' which is not static
10 | pagetable_free(virt_to_ptdesc(pte));
| ^~~~~~~~~~~~~~
vim +82 arch/m68k/include/asm/mcf_pgalloc.h
7
8 extern inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
9 {
> 10 pagetable_free(virt_to_ptdesc(pte));
11 }
12
13 extern const char bad_pmd_string[];
14
15 extern inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
16 {
> 17 struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | __GFP_ZERO) &
18 ~__GFP_HIGHMEM, 0);
19
20 if (!ptdesc)
21 return NULL;
22
> 23 return ptdesc_address(ptdesc);
24 }
25
26 extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
27 {
28 return (pmd_t *) pgd;
29 }
30
31 #define pmd_populate(mm, pmd, pte) (pmd_val(*pmd) = (unsigned long)(pte))
32
33 #define pmd_populate_kernel pmd_populate
34
35 static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pgtable,
36 unsigned long address)
37 {
38 struct ptdesc *ptdesc = virt_to_ptdesc(pgtable);
39
40 pagetable_pte_dtor(ptdesc);
41 pagetable_free(ptdesc);
42 }
43
44 static inline pgtable_t pte_alloc_one(struct mm_struct *mm)
45 {
46 struct ptdesc *ptdesc = pagetable_alloc(GFP_DMA | __GFP_ZERO, 0);
47 pte_t *pte;
48
49 if (!ptdesc)
50 return NULL;
51 if (!pagetable_pte_ctor(ptdesc)) {
52 pagetable_free(ptdesc);
53 return NULL;
54 }
55
56 pte = ptdesc_address(ptdesc);
57 return pte;
58 }
59
60 static inline void pte_free(struct mm_struct *mm, pgtable_t pgtable)
61 {
62 struct ptdesc *ptdesc = virt_to_ptdesc(pgtable);
63
64 pagetable_pte_dtor(ptdesc);
65 pagetable_free(ptdesc);
66 }
67
68 /*
69 * In our implementation, each pgd entry contains 1 pmd that is never allocated
70 * or freed. pgd_present is always 1, so this should never be called. -NL
71 */
72 #define pmd_free(mm, pmd) BUG()
73
74 static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
75 {
76 pagetable_free(virt_to_ptdesc(pgd));
77 }
78
79 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
80 {
81 pgd_t *new_pgd;
> 82 struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | GFP_NOWARN) &
83 ~__GFP_HIGHMEM, 0);
84
85 if (!ptdesc)
86 return NULL;
87 new_pgd = ptdesc_address(ptdesc);
88
89 memcpy(new_pgd, swapper_pg_dir, PTRS_PER_PGD * sizeof(pgd_t));
90 memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT);
91 return new_pgd;
92 }
93
Hi Vishal, On Thu, Jun 22, 2023 at 10:58 PM Vishal Moola (Oracle) <vishal.moola@gmail.com> wrote: > As part of the conversions to replace pgtable constructor/destructors with > ptdesc equivalents, convert various page table 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. > > Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> Thanks for your patch! > --- a/arch/m68k/include/asm/mcf_pgalloc.h > +++ b/arch/m68k/include/asm/mcf_pgalloc.h > static inline pgd_t *pgd_alloc(struct mm_struct *mm) > { > pgd_t *new_pgd; > + struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | GFP_NOWARN) & 0-day already told you for v3 that GFP_NOWARN does not exist. Please try cross-compiling your changes: https://mirrors.edge.kernel.org/pub/tools/crosstool/ > + ~__GFP_HIGHMEM, 0); > > - new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN); > - if (!new_pgd) > + if (!ptdesc) > return NULL; > + new_pgd = ptdesc_address(ptdesc); > + > memcpy(new_pgd, swapper_pg_dir, PTRS_PER_PGD * sizeof(pgd_t)); > memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT); > return new_pgd; Gr{oetje,eeting}s, Geert
diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h index 5c2c0a864524..790ade4e778e 100644 --- a/arch/m68k/include/asm/mcf_pgalloc.h +++ b/arch/m68k/include/asm/mcf_pgalloc.h @@ -7,20 +7,20 @@ extern inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) { - free_page((unsigned long) pte); + pagetable_free(virt_to_ptdesc(pte)); } extern const char bad_pmd_string[]; extern inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm) { - unsigned long page = __get_free_page(GFP_DMA); + struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | __GFP_ZERO) & + ~__GFP_HIGHMEM, 0); - if (!page) + if (!ptdesc) return NULL; - memset((void *)page, 0, PAGE_SIZE); - return (pte_t *) (page); + return ptdesc_address(ptdesc); } extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address) @@ -35,36 +35,34 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address) static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pgtable, unsigned long address) { - struct page *page = virt_to_page(pgtable); + struct ptdesc *ptdesc = virt_to_ptdesc(pgtable); - pgtable_pte_page_dtor(page); - __free_page(page); + pagetable_pte_dtor(ptdesc); + pagetable_free(ptdesc); } static inline pgtable_t pte_alloc_one(struct mm_struct *mm) { - struct page *page = alloc_pages(GFP_DMA, 0); + struct ptdesc *ptdesc = pagetable_alloc(GFP_DMA | __GFP_ZERO, 0); pte_t *pte; - if (!page) + if (!ptdesc) return NULL; - if (!pgtable_pte_page_ctor(page)) { - __free_page(page); + if (!pagetable_pte_ctor(ptdesc)) { + pagetable_free(ptdesc); return NULL; } - pte = page_address(page); - clear_page(pte); - + pte = ptdesc_address(ptdesc); return pte; } static inline void pte_free(struct mm_struct *mm, pgtable_t pgtable) { - struct page *page = virt_to_page(pgtable); + struct ptdesc *ptdesc = virt_to_ptdesc(pgtable); - pgtable_pte_page_dtor(page); - __free_page(page); + pagetable_pte_dtor(ptdesc); + pagetable_free(ptdesc); } /* @@ -75,16 +73,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pgtable) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) { - free_page((unsigned long) pgd); + pagetable_free(virt_to_ptdesc(pgd)); } static inline pgd_t *pgd_alloc(struct mm_struct *mm) { pgd_t *new_pgd; + struct ptdesc *ptdesc = pagetable_alloc((GFP_DMA | GFP_NOWARN) & + ~__GFP_HIGHMEM, 0); - new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN); - if (!new_pgd) + if (!ptdesc) return NULL; + new_pgd = ptdesc_address(ptdesc); + memcpy(new_pgd, swapper_pg_dir, PTRS_PER_PGD * sizeof(pgd_t)); memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT); return new_pgd; diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index 198036aff519..ff48573db2c0 100644 --- a/arch/m68k/include/asm/sun3_pgalloc.h +++ b/arch/m68k/include/asm/sun3_pgalloc.h @@ -17,10 +17,10 @@ extern const char bad_pmd_string[]; -#define __pte_free_tlb(tlb,pte,addr) \ -do { \ - pgtable_pte_page_dtor(pte); \ - tlb_remove_page((tlb), pte); \ +#define __pte_free_tlb(tlb, pte, addr) \ +do { \ + pagetable_pte_dtor(page_ptdesc(pte)); \ + tlb_remove_page_ptdesc((tlb), page_ptdesc(pte)); \ } while (0) static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte) diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index c75984e2d86b..594575a0780c 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -161,7 +161,7 @@ void *get_pointer_table(int type) * m68k doesn't have SPLIT_PTE_PTLOCKS for not having * SMP. */ - pgtable_pte_page_ctor(virt_to_page(page)); + pagetable_pte_ctor(virt_to_ptdesc(page)); } mmu_page_ctor(page); @@ -201,7 +201,7 @@ int free_pointer_table(void *table, int type) list_del(dp); mmu_page_dtor((void *)page); if (type == TABLE_PTE) - pgtable_pte_page_dtor(virt_to_page((void *)page)); + pagetable_pte_dtor(virt_to_ptdesc((void *)page)); free_page (page); return 1; } else if (ptable_list[type].next != dp) {