Re: [PATCH 3/3] x86/64/mm: Make 5-level paging support unconditional

Re: [PATCH 3/3] x86/64/mm: Make 5-level paging support unconditional

[kernel test robot]

Hi Kirill,

kernel test robot noticed the following build errors:

[auto build test ERROR on tip/x86/core]
[also build test ERROR on tip/master linus/master tip/x86/mm v6.10-rc5 next-20240625]
[cannot apply to tip/auto-latest]
[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/Kirill-A-Shutemov/x86-64-mm-Always-use-dynamic-memory-layout/20240625-183159
base:   tip/x86/core
patch link:    https://lore.kernel.org/r/20240621164406.256314-4-kirill.shutemov%40linux.intel.com
patch subject: [PATCH 3/3] x86/64/mm: Make 5-level paging support unconditional
config: i386-buildonly-randconfig-004-20240626 (https://download.01.org/0day-ci/archive/20240626/202406260735.rkb4c8N7-lkp@intel.com/config)
compiler: gcc-13 (Ubuntu 13.2.0-4ubuntu3) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240626/202406260735.rkb4c8N7-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/202406260735.rkb4c8N7-lkp@intel.com/

All errors (new ones prefixed by >>):

>> arch/x86/mm/pgtable.c:699:5: error: redefinition of 'p4d_set_huge'
     699 | int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot)
         |     ^~~~~~~~~~~~
   In file included from include/linux/mm.h:30,
                    from arch/x86/mm/pgtable.c:2:
   include/linux/pgtable.h:1665:19: note: previous definition of 'p4d_set_huge' with type 'int(p4d_t *, phys_addr_t,  pgprot_t)' {aka 'int(p4d_t *, long long unsigned int,  struct pgprot)'}
    1665 | static inline int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot)
         |                   ^~~~~~~~~~~~
>> arch/x86/mm/pgtable.c:709:6: error: redefinition of 'p4d_clear_huge'
     709 | void p4d_clear_huge(p4d_t *p4d)
         |      ^~~~~~~~~~~~~~
   include/linux/pgtable.h:1669:20: note: previous definition of 'p4d_clear_huge' with type 'void(p4d_t *)'
    1669 | static inline void p4d_clear_huge(p4d_t *p4d) { }
         |                    ^~~~~~~~~~~~~~


vim +/p4d_set_huge +699 arch/x86/mm/pgtable.c

6b6378355b9250 Toshi Kani         2015-04-14  692  
6b6378355b9250 Toshi Kani         2015-04-14  693  #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  694  /**
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  695   * p4d_set_huge - setup kernel P4D mapping
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  696   *
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  697   * No 512GB pages yet -- always return 0
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  698   */
b8504058a06bd1 Kirill A. Shutemov 2017-03-30 @699  int p4d_set_huge(p4d_t *p4d, phys_addr_t addr, pgprot_t prot)
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  700  {
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  701  	return 0;
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  702  }
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  703  
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  704  /**
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  705   * p4d_clear_huge - clear kernel P4D mapping when it is set
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  706   *
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  707   * No 512GB pages yet -- always return 0
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  708   */
c8db8c2628afc7 Li kunyu           2022-05-12 @709  void p4d_clear_huge(p4d_t *p4d)
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  710  {
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  711  }
b8504058a06bd1 Kirill A. Shutemov 2017-03-30  712  

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

Re: [PATCH] x86/64/mm: Make 5-level paging support unconditional

[Borislav Petkov]

On Wed, Jun 26, 2024 at 01:26:23PM +0300, Kirill A. Shutemov wrote:
> Both Intel and AMD CPUs support 5-level paging, which is expected to
> become more widely adopted in the future.
> 
> Remove CONFIG_X86_5LEVEL and ifdeffery for it to make it more readable.
> 
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> Suggested-by: Borislav Petkov <bp@alien8.de>
> ---
> 
>  v2:
>   - Fix 32-bit build by wrapping p4d_set_huge() and p4d_clear_huge() in
>     #if CONFIG_PGTABLE_LEVELS > 4

Is the 0day bot smart enough to detect separate v2 fixups like that and
re-test using them?

If not, you can push your tree to your repo so that it can chew on it again
and report any other potential breakages...

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [PATCH] x86/64/mm: Make 5-level paging support unconditional

[Kirill A. Shutemov]

On Wed, Jun 26, 2024 at 12:46:48PM +0200, Borislav Petkov wrote:
> On Wed, Jun 26, 2024 at 01:26:23PM +0300, Kirill A. Shutemov wrote:
> > Both Intel and AMD CPUs support 5-level paging, which is expected to
> > become more widely adopted in the future.
> > 
> > Remove CONFIG_X86_5LEVEL and ifdeffery for it to make it more readable.
> > 
> > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> > Suggested-by: Borislav Petkov <bp@alien8.de>
> > ---
> > 
> >  v2:
> >   - Fix 32-bit build by wrapping p4d_set_huge() and p4d_clear_huge() in
> >     #if CONFIG_PGTABLE_LEVELS > 4
> 
> Is the 0day bot smart enough to detect separate v2 fixups like that and
> re-test using them?
> 
> If not, you can push your tree to your repo so that it can chew on it again
> and report any other potential breakages...

Pushed:

https://git.kernel.org/pub/scm/linux/kernel/git/kas/linux.git x86/no5lvl-config

-- 
  Kiryl Shutsemau / Kirill A. Shutemov