| Message ID | 20230417205048.15870-13-vishal.moola@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Split ptdesc from struct page | expand |
Hi Vishal,
kernel test robot noticed the following build warnings:
[auto build test WARNING on akpm-mm/mm-everything]
[also build test WARNING on next-20230417]
[cannot apply to s390/features powerpc/next powerpc/fixes geert-m68k/for-next geert-m68k/for-linus linus/master v6.3-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/s390-Use-_pt_s390_gaddr-for-gmap-address-tracking/20230418-045832
base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything
patch link: https://lore.kernel.org/r/20230417205048.15870-13-vishal.moola%40gmail.com
patch subject: [PATCH 12/33] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor}
config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20230418/202304180959.YFCTfVKw-lkp@intel.com/config)
compiler: sh4-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
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/d53de56a2dbf659b53aee1aa2eac60bcc936f10b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Vishal-Moola-Oracle/s390-Use-_pt_s390_gaddr-for-gmap-address-tracking/20230418-045832
git checkout d53de56a2dbf659b53aee1aa2eac60bcc936f10b
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=sh olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=sh prepare
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304180959.YFCTfVKw-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from arch/sh/kernel/asm-offsets.c:14:
include/linux/mm.h: In function 'virt_to_ptdesc':
include/linux/mm.h:2723:16: error: implicit declaration of function 'page_ptdesc' [-Werror=implicit-function-declaration]
2723 | return page_ptdesc(virt_to_head_page(x));
| ^~~~~~~~~~~
include/linux/mm.h:2723:16: warning: returning 'int' from a function with return type 'struct ptdesc *' makes pointer from integer without a cast [-Wint-conversion]
2723 | return page_ptdesc(virt_to_head_page(x));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from arch/sh/include/asm/thread_info.h:13,
from include/linux/thread_info.h:60,
from include/asm-generic/preempt.h:5,
from ./arch/sh/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:78,
from include/linux/spinlock.h:56,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:7,
from include/linux/mm.h:7:
include/linux/mm.h: In function 'ptdesc_to_virt':
include/linux/mm.h:2728:29: error: implicit declaration of function 'ptdesc_page'; did you mean 'pte_page'? [-Werror=implicit-function-declaration]
2728 | return page_to_virt(ptdesc_page(pt));
| ^~~~~~~~~~~
arch/sh/include/asm/page.h:139:27: note: in definition of macro '___va'
139 | #define ___va(x) ((x)+PAGE_OFFSET)
| ^
include/linux/mm.h:117:25: note: in expansion of macro '__va'
117 | #define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x)))
| ^~~~
include/linux/mm.h:117:30: note: in expansion of macro 'PFN_PHYS'
117 | #define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x)))
| ^~~~~~~~
include/asm-generic/memory_model.h:64:21: note: in expansion of macro '__page_to_pfn'
64 | #define page_to_pfn __page_to_pfn
| ^~~~~~~~~~~~~
include/linux/mm.h:2728:16: note: in expansion of macro 'page_to_virt'
2728 | return page_to_virt(ptdesc_page(pt));
| ^~~~~~~~~~~~
include/asm-generic/memory_model.h:46:35: warning: initialization of 'const struct page *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
46 | ({ const struct page *__pg = (pg); \
| ^
arch/sh/include/asm/page.h:139:27: note: in definition of macro '___va'
139 | #define ___va(x) ((x)+PAGE_OFFSET)
| ^
include/linux/mm.h:117:25: note: in expansion of macro '__va'
117 | #define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x)))
| ^~~~
include/linux/mm.h:117:30: note: in expansion of macro 'PFN_PHYS'
117 | #define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x)))
| ^~~~~~~~
include/asm-generic/memory_model.h:64:21: note: in expansion of macro '__page_to_pfn'
64 | #define page_to_pfn __page_to_pfn
| ^~~~~~~~~~~~~
include/linux/mm.h:117:39: note: in expansion of macro 'page_to_pfn'
117 | #define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x)))
| ^~~~~~~~~~~
include/linux/mm.h:2728:16: note: in expansion of macro 'page_to_virt'
2728 | return page_to_virt(ptdesc_page(pt));
| ^~~~~~~~~~~~
include/linux/mm.h: In function 'ptdesc_address':
include/linux/mm.h:2733:30: error: implicit declaration of function 'ptdesc_folio'; did you mean 'page_folio'? [-Werror=implicit-function-declaration]
2733 | return folio_address(ptdesc_folio(pt));
| ^~~~~~~~~~~~
| page_folio
include/linux/mm.h:2733:30: warning: passing argument 1 of 'folio_address' makes pointer from integer without a cast [-Wint-conversion]
2733 | return folio_address(ptdesc_folio(pt));
| ^~~~~~~~~~~~~~~~
| |
| int
include/linux/mm.h:2151:55: note: expected 'const struct folio *' but argument is of type 'int'
2151 | static inline void *folio_address(const struct folio *folio)
| ~~~~~~~~~~~~~~~~~~~~^~~~~
include/linux/mm.h: In function 'ptdesc_is_reserved':
include/linux/mm.h:2738:36: warning: passing argument 1 of 'folio_test_reserved' makes pointer from integer without a cast [-Wint-conversion]
2738 | return folio_test_reserved(ptdesc_folio(pt));
| ^~~~~~~~~~~~~~~~
| |
| int
In file included from include/linux/mmzone.h:23:
include/linux/page-flags.h:375:62: note: expected 'struct folio *' but argument is of type 'int'
375 | static __always_inline bool folio_test_##lname(struct folio *folio) \
| ~~~~~~~~~~~~~~^~~~~
include/linux/page-flags.h:423:9: note: in expansion of macro 'TESTPAGEFLAG'
423 | TESTPAGEFLAG(uname, lname, policy) \
| ^~~~~~~~~~~~
include/linux/page-flags.h:494:1: note: in expansion of macro 'PAGEFLAG'
494 | PAGEFLAG(Reserved, reserved, PF_NO_COMPOUND)
| ^~~~~~~~
include/linux/mm.h: In function 'ptdesc_alloc':
include/linux/mm.h:2745:16: warning: returning 'int' from a function with return type 'struct ptdesc *' makes pointer from integer without a cast [-Wint-conversion]
2745 | return page_ptdesc(page);
| ^~~~~~~~~~~~~~~~~
include/linux/mm.h: In function 'ptdesc_free':
include/linux/mm.h:2750:29: warning: initialization of 'struct page *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
2750 | struct page *page = ptdesc_page(pt);
| ^~~~~~~~~~~
include/linux/mm.h: In function 'ptdesc_pte_ctor':
>> include/linux/mm.h:2826:31: warning: initialization of 'struct folio *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
2826 | struct folio *folio = ptdesc_folio(ptdesc);
| ^~~~~~~~~~~~
include/linux/mm.h: In function 'pgtable_pte_page_ctor':
include/linux/mm.h:2837:32: warning: passing argument 1 of 'ptdesc_pte_ctor' makes pointer from integer without a cast [-Wint-conversion]
2837 | return ptdesc_pte_ctor(page_ptdesc(page));
| ^~~~~~~~~~~~~~~~~
| |
| int
include/linux/mm.h:2824:51: note: expected 'struct ptdesc *' but argument is of type 'int'
2824 | static inline bool ptdesc_pte_ctor(struct ptdesc *ptdesc)
| ~~~~~~~~~~~~~~~^~~~~~
include/linux/mm.h: In function 'ptdesc_pte_dtor':
include/linux/mm.h:2842:31: warning: initialization of 'struct folio *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
2842 | struct folio *folio = ptdesc_folio(ptdesc);
| ^~~~~~~~~~~~
include/linux/mm.h: In function 'pgtable_pte_page_dtor':
include/linux/mm.h:2851:25: warning: passing argument 1 of 'ptdesc_pte_dtor' makes pointer from integer without a cast [-Wint-conversion]
2851 | ptdesc_pte_dtor(page_ptdesc(page));
| ^~~~~~~~~~~~~~~~~
| |
| int
include/linux/mm.h:2840:51: note: expected 'struct ptdesc *' but argument is of type 'int'
2840 | static inline void ptdesc_pte_dtor(struct ptdesc *ptdesc)
| ~~~~~~~~~~~~~~~^~~~~~
include/linux/mm.h: In function 'ptdesc_pmd_ctor':
include/linux/mm.h:2935:31: warning: initialization of 'struct folio *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
2935 | struct folio *folio = ptdesc_folio(ptdesc);
| ^~~~~~~~~~~~
include/linux/mm.h: In function 'pgtable_pmd_page_ctor':
include/linux/mm.h:2946:32: warning: passing argument 1 of 'ptdesc_pmd_ctor' makes pointer from integer without a cast [-Wint-conversion]
2946 | return ptdesc_pmd_ctor(page_ptdesc(page));
| ^~~~~~~~~~~~~~~~~
| |
| int
include/linux/mm.h:2933:51: note: expected 'struct ptdesc *' but argument is of type 'int'
2933 | static inline bool ptdesc_pmd_ctor(struct ptdesc *ptdesc)
| ~~~~~~~~~~~~~~~^~~~~~
include/linux/mm.h: In function 'ptdesc_pmd_dtor':
include/linux/mm.h:2951:31: warning: initialization of 'struct folio *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
2951 | struct folio *folio = ptdesc_folio(ptdesc);
| ^~~~~~~~~~~~
include/linux/mm.h: In function 'pgtable_pmd_page_dtor':
include/linux/mm.h:2960:25: warning: passing argument 1 of 'ptdesc_pmd_dtor' makes pointer from integer without a cast [-Wint-conversion]
2960 | ptdesc_pmd_dtor(page_ptdesc(page));
| ^~~~~~~~~~~~~~~~~
| |
| int
include/linux/mm.h:2949:51: note: expected 'struct ptdesc *' but argument is of type 'int'
2949 | static inline void ptdesc_pmd_dtor(struct ptdesc *ptdesc)
| ~~~~~~~~~~~~~~~^~~~~~
include/linux/mm.h: In function 'free_reserved_ptdesc':
include/linux/mm.h:3016:28: warning: passing argument 1 of 'free_reserved_page' makes pointer from integer without a cast [-Wint-conversion]
3016 | free_reserved_page(ptdesc_page(pt));
| ^~~~~~~~~~~~~~~
| |
| int
include/linux/mm.h:2999:52: note: expected 'struct page *' but argument is of type 'int'
2999 | static inline void free_reserved_page(struct page *page)
| ~~~~~~~~~~~~~^~~~
cc1: some warnings being treated as errors
make[2]: *** [scripts/Makefile.build:114: arch/sh/kernel/asm-offsets.s] Error 1
make[2]: Target 'prepare' not remade because of errors.
make[1]: *** [Makefile:1286: prepare0] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [Makefile:226: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
vim +2826 include/linux/mm.h
2823
2824 static inline bool ptdesc_pte_ctor(struct ptdesc *ptdesc)
2825 {
> 2826 struct folio *folio = ptdesc_folio(ptdesc);
2827
2828 if (!ptlock_init(ptdesc))
2829 return false;
2830 __SetPageTable(&folio->page);
2831 lruvec_stat_add_folio(folio, NR_PAGETABLE);
2832 return true;
2833 }
2834
diff --git a/include/linux/mm.h b/include/linux/mm.h index 17a64cfd1430..cb136d2fdf74 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2847,20 +2847,34 @@ static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; } static inline void ptlock_free(struct ptdesc *ptdesc) {} #endif /* USE_SPLIT_PTE_PTLOCKS */ -static inline bool pgtable_pte_page_ctor(struct page *page) +static inline bool ptdesc_pte_ctor(struct ptdesc *ptdesc) { - if (!ptlock_init(page_ptdesc(page))) + struct folio *folio = ptdesc_folio(ptdesc); + + if (!ptlock_init(ptdesc)) return false; - __SetPageTable(page); - inc_lruvec_page_state(page, NR_PAGETABLE); + __SetPageTable(&folio->page); + lruvec_stat_add_folio(folio, NR_PAGETABLE); return true; } +static inline bool pgtable_pte_page_ctor(struct page *page) +{ + return ptdesc_pte_ctor(page_ptdesc(page)); +} + +static inline void ptdesc_pte_dtor(struct ptdesc *ptdesc) +{ + struct folio *folio = ptdesc_folio(ptdesc); + + ptlock_free(ptdesc); + __ClearPageTable(&folio->page); + lruvec_stat_sub_folio(folio, NR_PAGETABLE); +} + static inline void pgtable_pte_page_dtor(struct page *page) { - ptlock_free(page_ptdesc(page)); - __ClearPageTable(page); - dec_lruvec_page_state(page, NR_PAGETABLE); + ptdesc_pte_dtor(page_ptdesc(page)); } #define pte_offset_map_lock(mm, pmd, address, ptlp) \ @@ -2942,20 +2956,34 @@ static inline spinlock_t *pmd_lock(struct mm_struct *mm, pmd_t *pmd) return ptl; } -static inline bool pgtable_pmd_page_ctor(struct page *page) +static inline bool ptdesc_pmd_ctor(struct ptdesc *ptdesc) { - if (!pmd_ptlock_init(page_ptdesc(page))) + struct folio *folio = ptdesc_folio(ptdesc); + + if (!pmd_ptlock_init(ptdesc)) return false; - __SetPageTable(page); - inc_lruvec_page_state(page, NR_PAGETABLE); + __SetPageTable(&folio->page); + lruvec_stat_add_folio(folio, NR_PAGETABLE); return true; } +static inline bool pgtable_pmd_page_ctor(struct page *page) +{ + return ptdesc_pmd_ctor(page_ptdesc(page)); +} + +static inline void ptdesc_pmd_dtor(struct ptdesc *ptdesc) +{ + struct folio *folio = ptdesc_folio(ptdesc); + + pmd_ptlock_free(ptdesc); + __ClearPageTable(&folio->page); + lruvec_stat_sub_folio(folio, NR_PAGETABLE); +} + static inline void pgtable_pmd_page_dtor(struct page *page) { - pmd_ptlock_free(page_ptdesc(page)); - __ClearPageTable(page); - dec_lruvec_page_state(page, NR_PAGETABLE); + ptdesc_pmd_dtor(page_ptdesc(page)); } /*
Creates ptdesc_pte_ctor(), ptdesc_pmd_ctor(), ptdesc_pte_dtor(), and ptdesc_pmd_dtor() and make the original pgtable constructor/destructors wrappers. Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com> --- include/linux/mm.h | 56 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 14 deletions(-)