Re: [linux-next:master 3368/3379] mm/memory_hotplug.c:748:33: error: no member named 'cma_pages' in 'struct zone'

[David Hildenbrand <david@redhat.com>]

On 27.07.21 15:05, kernel test robot wrote:
> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
> head:   2265c5286967c58db9a99ed1b74105977507e690
> commit: 2f10893f9329c568c5090f01d115230471320389 [3368/3379] mm/memory_hotplug: introduce "auto-movable" online policy
> config: x86_64-randconfig-a014-20210726 (attached as .config)
> compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project c658b472f3e61e1818e1909bf02f3d65470018a5)
> 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
>          # install x86_64 cross compiling tool for clang build
>          # apt-get install binutils-x86-64-linux-gnu
>          # https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=2f10893f9329c568c5090f01d115230471320389
>          git remote add linux-next https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
>          git fetch --no-tags linux-next master
>          git checkout 2f10893f9329c568c5090f01d115230471320389
>          # save the attached .config to linux build tree
>          mkdir build_dir
>          COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross O=build_dir ARCH=x86_64 SHELL=/bin/bash
> 
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
> 
> All errors (new ones prefixed by >>):
> 
>>> mm/memory_hotplug.c:748:33: error: no member named 'cma_pages' in 'struct zone'
>                     stats->movable_pages += zone->cma_pages;
>                                             ~~~~  ^
>     mm/memory_hotplug.c:750:38: error: no member named 'cma_pages' in 'struct zone'
>                     stats->kernel_early_pages -= zone->cma_pages;
>                                                  ~~~~  ^
>     2 errors generated.
> 
> 
> vim +748 mm/memory_hotplug.c
> 
>     737	
>     738	static void auto_movable_stats_account_zone(struct auto_movable_stats *stats,
>     739						    struct zone *zone)
>     740	{
>     741		if (zone_idx(zone) == ZONE_MOVABLE) {
>     742			stats->movable_pages += zone->present_pages;
>     743		} else {
>     744			/*
>     745			 * CMA pages (never on hotplugged memory) behave like
>     746			 * ZONE_MOVABLE.
>     747			 */
>   > 748			stats->movable_pages += zone->cma_pages;
>     749			stats->kernel_early_pages += zone->present_early_pages;
>     750			stats->kernel_early_pages -= zone->cma_pages;
>     751		}
>     752	}
>     753	
> 
> ---
> 0-DAY CI Kernel Test Service, Intel Corporation
> https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
> 

Already reported on mmtom:

https://lkml.kernel.org/r/5394da5e-29f0-ff7d-e614-e2805400a8bb@redhat.com


diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index bfdaa28eb86f..fa1a0afd32ba 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -741,13 +741,15 @@ static void auto_movable_stats_account_zone(struct auto_movable_stats *stats,
          if (zone_idx(zone) == ZONE_MOVABLE) {
                  stats->movable_pages += zone->present_pages;
          } else {
+               stats->kernel_early_pages += zone->present_early_pages;
+#ifdef CONFIG_CMA
                  /*
                   * CMA pages (never on hotplugged memory) behave like
                   * ZONE_MOVABLE.
                   */
                  stats->movable_pages += zone->cma_pages;
-               stats->kernel_early_pages += zone->present_early_pages;
                  stats->kernel_early_pages -= zone->cma_pages;
+#endif /* CONFIG_CMA */
          }
   }
   struct auto_movable_group_stats {

-- 
Thanks,

David / dhildenb