Re: [PATCH v3 25/34] m68k: Convert various functions to use ptdescs
Hi Vishal, kernel test robot noticed the following build errors: [auto build test ERROR on next-20230531] [cannot apply to akpm-mm/mm-everything s390/features powerpc/next powerpc/fixes geert-m68k/for-next geert-m68k/for-linus linus/master v6.4-rc4 v6.4-rc3 v6.4-rc2 v6.4-rc4] [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/20230601-053454 base: next-20230531 patch link: https://lore.kernel.org/r/20230531213032.25338-26-vishal.moola%40gmail.com patch subject: [PATCH v3 25/34] m68k: Convert various functions to use ptdescs config: m68k-randconfig-r002-20230531 (https://download.01.org/0day-ci/archive/20230601/202306011704.i8xmwkpl-...@intel.com/config) compiler: m68k-linux-gcc (GCC) 12.3.0 reproduce (this is a W=1 build): mkdir -p ~/bin wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/intel-lab-lkp/linux/commit/915ab62dc3315fe0a0544fccb4ee5f3ee32694b5 git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Vishal-Moola-Oracle/mm-Add-PAGE_TYPE_OP-folio-functions/20230601-053454 git checkout 915ab62dc3315fe0a0544fccb4ee5f3ee32694b5 # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=m68k olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash arch/m68k/mm/ If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot | Closes: https://lore.kernel.org/oe-kbuild-all/202306011704.i8xmwkpl-...@intel.com/ All error/warnings (new ones prefixed by >>): In file included from arch/m68k/include/asm/pgalloc.h:12, from arch/m68k/mm/init.c:26: arch/m68k/include/asm/mcf_pgalloc.h: In function 'pgd_alloc': >> arch/m68k/include/asm/mcf_pgalloc.h:83:59: error: 'GFP_NOWARN' undeclared >> (first use in this function); did you mean 'GFP_NOWAIT'? 83 | struct ptdesc *ptdesc = pagetable_alloc(GFP_DMA | GFP_NOWARN, 0); | ^~ | GFP_NOWAIT arch/m68k/include/asm/mcf_pgalloc.h:83:59: 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:22:27: warning: 'ptdesc_address' is >> static but used in inline function 'pte_alloc_one_kernel' which is not static 22 | return (pte_t *) (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, 0); | ^~~ >> 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:83:59: error: 'GFP_NOWARN' undeclared >> (first use in this function); did you mean 'GFP_NOWAIT'? 83 | struct ptdesc *ptdesc = pagetable_alloc(GFP_DMA | GFP_NOWARN, 0); | ^~ | GFP_NOWAIT arch/m68k/include/asm/mcf_pgalloc.h:83:59: 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
Re: [PATCH v3 25/34] m68k: Convert various functions to use ptdescs
On Thu, Jun 1, 2023 at 12:40 AM Geert Uytterhoeven wrote:
>
> Hi Vishal,
>
> On Wed, May 31, 2023 at 11:32 PM Vishal Moola (Oracle)
> 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)
>
> Thanks for your patch!
>
> > --- a/arch/m68k/include/asm/mcf_pgalloc.h
> > +++ b/arch/m68k/include/asm/mcf_pgalloc.h
> > @@ -7,20 +7,19 @@
> >
> > 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, 0);
> >
> > - if (!page)
> > + if (!ptdesc)
> > return NULL;
> >
> > - memset((void *)page, 0, PAGE_SIZE);
> > - return (pte_t *) (page);
> > + return (pte_t *) (ptdesc_address(ptdesc));
>
> No need to cast "void *" when returning a different pointer type.
>
> > }
> >
> > extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
> > @@ -35,36 +34,36 @@ 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, 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);
> > + pagetable_clear(pte);
> >
> > 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(ptdesc);
>
> virt_to_ptdesc(pgtable)
>
> (You can build this using m5475evb_defconfig)
>
> >
> > - pgtable_pte_page_dtor(page);
> > - __free_page(page);
> > + pagetable_pte_dtor(ptdesc);
> > + pagetable_free(ptdesc);
> > }
> >
> > /*
> > @@ -75,16 +74,18 @@ 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, 0);
> >
> > - new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN);
> > - if (!new_pgd)
> > + if (!ptdesc)
> > return NULL;
> > + new_pgd = (pgd_t *) ptdesc_address(ptdesc);
>
> No need to cast "void *" when assigning to a different pointer type.
>
> > +
> > memcpy(new_pgd, swapper_pg_dir, PTRS_PER_PGD * sizeof(pgd_t));
> > memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT);
> > return new_pgd;
>
> The rest LGTM.
Thanks so much for the review! I'll make those changes in the next
version.
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 --
> ge...@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like
> that.
> -- Linus Torvalds
Re: [PATCH v3 25/34] m68k: Convert various functions to use ptdescs
Hi Vishal,
On Wed, May 31, 2023 at 11:32 PM Vishal Moola (Oracle)
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)
Thanks for your patch!
> --- a/arch/m68k/include/asm/mcf_pgalloc.h
> +++ b/arch/m68k/include/asm/mcf_pgalloc.h
> @@ -7,20 +7,19 @@
>
> 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, 0);
>
> - if (!page)
> + if (!ptdesc)
> return NULL;
>
> - memset((void *)page, 0, PAGE_SIZE);
> - return (pte_t *) (page);
> + return (pte_t *) (ptdesc_address(ptdesc));
No need to cast "void *" when returning a different pointer type.
> }
>
> extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
> @@ -35,36 +34,36 @@ 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, 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);
> + pagetable_clear(pte);
>
> 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(ptdesc);
virt_to_ptdesc(pgtable)
(You can build this using m5475evb_defconfig)
>
> - pgtable_pte_page_dtor(page);
> - __free_page(page);
> + pagetable_pte_dtor(ptdesc);
> + pagetable_free(ptdesc);
> }
>
> /*
> @@ -75,16 +74,18 @@ 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, 0);
>
> - new_pgd = (pgd_t *)__get_free_page(GFP_DMA | __GFP_NOWARN);
> - if (!new_pgd)
> + if (!ptdesc)
> return NULL;
> + new_pgd = (pgd_t *) ptdesc_address(ptdesc);
No need to cast "void *" when assigning to a different pointer type.
> +
> memcpy(new_pgd, swapper_pg_dir, PTRS_PER_PGD * sizeof(pgd_t));
> memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT);
> return new_pgd;
The rest LGTM.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
