[akpm-mm:mm-unstable 481/507] lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'

[akpm-mm:mm-unstable 481/507] lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'

[kernel test robot]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable
head:   2f0c87542d97822659e81f55ae5e5cc1994f3339
commit: 835714732ae42a4b4f590316b06d06826bff2483 [481/507] mm/filemap: use xas_try_split() in __filemap_add_folio()
config: i386-buildonly-randconfig-003-20250309 (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-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/202503091121.RktXlKnp-lkp@intel.com/

All errors (new ones prefixed by >>):

>> lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'
    1251 | unsigned int xas_try_split_min_order(unsigned int order)
         |              ^~~~~~~~~~~~~~~~~~~~~~~
   In file included from lib/xarray.c:13:
   include/linux/xarray.h:1587:28: note: previous definition of 'xas_try_split_min_order' with type 'unsigned int(unsigned int)'
    1587 | static inline unsigned int xas_try_split_min_order(unsigned int order)
         |                            ^~~~~~~~~~~~~~~~~~~~~~~


vim +/xas_try_split_min_order +1251 lib/xarray.c

  1237	
  1238	/**
  1239	 * xas_try_split_min_order() - Minimal split order xas_try_split() can accept
  1240	 * @order: Current entry order.
  1241	 *
  1242	 * xas_try_split() can split a multi-index entry to smaller than @order - 1 if
  1243	 * no new xa_node is needed. This function provides the minimal order
  1244	 * xas_try_split() supports.
  1245	 *
  1246	 * Return: the minimal order xas_try_split() supports
  1247	 *
  1248	 * Context: Any context.
  1249	 *
  1250	 */
> 1251	unsigned int xas_try_split_min_order(unsigned int order)
  1252	{
  1253		if (order % XA_CHUNK_SHIFT == 0)
  1254			return order == 0 ? 0 : order - 1;
  1255	
  1256		return order - (order % XA_CHUNK_SHIFT);
  1257	}
  1258	EXPORT_SYMBOL_GPL(xas_try_split_min_order);
  1259	

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

Re: [akpm-mm:mm-unstable 481/507] lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'

[Zi Yan]

On 8 Mar 2025, at 22:52, kernel test robot wrote:

> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable
> head:   2f0c87542d97822659e81f55ae5e5cc1994f3339
> commit: 835714732ae42a4b4f590316b06d06826bff2483 [481/507] mm/filemap: use xas_try_split() in __filemap_add_folio()
> config: i386-buildonly-randconfig-003-20250309 (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-lkp@intel.com/config)
> compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-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/202503091121.RktXlKnp-lkp@intel.com/
>
> All errors (new ones prefixed by >>):
>
>>> lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'
>     1251 | unsigned int xas_try_split_min_order(unsigned int order)
>          |              ^~~~~~~~~~~~~~~~~~~~~~~
>    In file included from lib/xarray.c:13:
>    include/linux/xarray.h:1587:28: note: previous definition of 'xas_try_split_min_order' with type 'unsigned int(unsigned int)'
>     1587 | static inline unsigned int xas_try_split_min_order(unsigned int order)
>          |                            ^~~~~~~~~~~~~~~~~~~~~~~
>

It seems that something went wrong when the patch is applied.
xas_try_split_min_order() is not included in the CONFIG_XARRAY_MULTI guard,
whereas the original patch does. Moving it back fixed the issue.
See: https://lore.kernel.org/linux-mm/20250308213400.10220-1-sj@kernel.org/


>
> vim +/xas_try_split_min_order +1251 lib/xarray.c
>
>   1237	
>   1238	/**
>   1239	 * xas_try_split_min_order() - Minimal split order xas_try_split() can accept
>   1240	 * @order: Current entry order.
>   1241	 *
>   1242	 * xas_try_split() can split a multi-index entry to smaller than @order - 1 if
>   1243	 * no new xa_node is needed. This function provides the minimal order
>   1244	 * xas_try_split() supports.
>   1245	 *
>   1246	 * Return: the minimal order xas_try_split() supports
>   1247	 *
>   1248	 * Context: Any context.
>   1249	 *
>   1250	 */
>> 1251	unsigned int xas_try_split_min_order(unsigned int order)
>   1252	{
>   1253		if (order % XA_CHUNK_SHIFT == 0)
>   1254			return order == 0 ? 0 : order - 1;
>   1255	
>   1256		return order - (order % XA_CHUNK_SHIFT);
>   1257	}
>   1258	EXPORT_SYMBOL_GPL(xas_try_split_min_order);
>   1259	
>
> -- 
> 0-DAY CI Kernel Test Service
> https://github.com/intel/lkp-tests/wiki


--
Best Regards,
Yan, Zi

Re: [akpm-mm:mm-unstable 481/507] lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'

[Andrew Morton]

On Sat, 08 Mar 2025 23:00:31 -0500 Zi Yan <ziy@nvidia.com> wrote:

> On 8 Mar 2025, at 22:52, kernel test robot wrote:
> 
> > tree:   https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable
> > head:   2f0c87542d97822659e81f55ae5e5cc1994f3339
> > commit: 835714732ae42a4b4f590316b06d06826bff2483 [481/507] mm/filemap: use xas_try_split() in __filemap_add_folio()
> > config: i386-buildonly-randconfig-003-20250309 (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-lkp@intel.com/config)
> > compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
> > reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-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/202503091121.RktXlKnp-lkp@intel.com/
> >
> > All errors (new ones prefixed by >>):
> >
> >>> lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'
> >     1251 | unsigned int xas_try_split_min_order(unsigned int order)
> >          |              ^~~~~~~~~~~~~~~~~~~~~~~
> >    In file included from lib/xarray.c:13:
> >    include/linux/xarray.h:1587:28: note: previous definition of 'xas_try_split_min_order' with type 'unsigned int(unsigned int)'
> >     1587 | static inline unsigned int xas_try_split_min_order(unsigned int order)
> >          |                            ^~~~~~~~~~~~~~~~~~~~~~~
> >
> 
> It seems that something went wrong when the patch is applied.
> xas_try_split_min_order() is not included in the CONFIG_XARRAY_MULTI guard,
> whereas the original patch does. Moving it back fixed the issue.
> See: https://lore.kernel.org/linux-mm/20250308213400.10220-1-sj@kernel.org/

This series took a lot of damage as "Buddy allocator like (or
non-uniform) folio split" was added, dropped, added, dropped...

I have just dropped the series "Minimize xa_node allocation during
xarry split".  Please leave it a few days then resend against
mm-unstable.

Re: [akpm-mm:mm-unstable 481/507] lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'

[Zi Yan]

On 8 Mar 2025, at 23:12, Andrew Morton wrote:

> On Sat, 08 Mar 2025 23:00:31 -0500 Zi Yan <ziy@nvidia.com> wrote:
>
>> On 8 Mar 2025, at 22:52, kernel test robot wrote:
>>
>>> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable
>>> head:   2f0c87542d97822659e81f55ae5e5cc1994f3339
>>> commit: 835714732ae42a4b4f590316b06d06826bff2483 [481/507] mm/filemap: use xas_try_split() in __filemap_add_folio()
>>> config: i386-buildonly-randconfig-003-20250309 (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-lkp@intel.com/config)
>>> compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
>>> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-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/202503091121.RktXlKnp-lkp@intel.com/
>>>
>>> All errors (new ones prefixed by >>):
>>>
>>>>> lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'
>>>     1251 | unsigned int xas_try_split_min_order(unsigned int order)
>>>          |              ^~~~~~~~~~~~~~~~~~~~~~~
>>>    In file included from lib/xarray.c:13:
>>>    include/linux/xarray.h:1587:28: note: previous definition of 'xas_try_split_min_order' with type 'unsigned int(unsigned int)'
>>>     1587 | static inline unsigned int xas_try_split_min_order(unsigned int order)
>>>          |                            ^~~~~~~~~~~~~~~~~~~~~~~
>>>
>>
>> It seems that something went wrong when the patch is applied.
>> xas_try_split_min_order() is not included in the CONFIG_XARRAY_MULTI guard,
>> whereas the original patch does. Moving it back fixed the issue.
>> See: https://lore.kernel.org/linux-mm/20250308213400.10220-1-sj@kernel.org/
>
> This series took a lot of damage as "Buddy allocator like (or
> non-uniform) folio split" was added, dropped, added, dropped...
>
> I have just dropped the series "Minimize xa_node allocation during
> xarry split".  Please leave it a few days then resend against
> mm-unstable.

Sure. No problem.


--
Best Regards,
Yan, Zi

Re: [akpm-mm:mm-unstable 481/507] lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'

[Zi Yan]

On 9 Mar 2025, at 13:20, Zi Yan wrote:

> On 8 Mar 2025, at 23:12, Andrew Morton wrote:
>
>> On Sat, 08 Mar 2025 23:00:31 -0500 Zi Yan <ziy@nvidia.com> wrote:
>>
>>> On 8 Mar 2025, at 22:52, kernel test robot wrote:
>>>
>>>> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable
>>>> head:   2f0c87542d97822659e81f55ae5e5cc1994f3339
>>>> commit: 835714732ae42a4b4f590316b06d06826bff2483 [481/507] mm/filemap: use xas_try_split() in __filemap_add_folio()
>>>> config: i386-buildonly-randconfig-003-20250309 (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-lkp@intel.com/config)
>>>> compiler: gcc-11 (Debian 11.3.0-12) 11.3.0
>>>> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250309/202503091121.RktXlKnp-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/202503091121.RktXlKnp-lkp@intel.com/
>>>>
>>>> All errors (new ones prefixed by >>):
>>>>
>>>>>> lib/xarray.c:1251:14: error: redefinition of 'xas_try_split_min_order'
>>>>     1251 | unsigned int xas_try_split_min_order(unsigned int order)
>>>>          |              ^~~~~~~~~~~~~~~~~~~~~~~
>>>>    In file included from lib/xarray.c:13:
>>>>    include/linux/xarray.h:1587:28: note: previous definition of 'xas_try_split_min_order' with type 'unsigned int(unsigned int)'
>>>>     1587 | static inline unsigned int xas_try_split_min_order(unsigned int order)
>>>>          |                            ^~~~~~~~~~~~~~~~~~~~~~~
>>>>
>>>
>>> It seems that something went wrong when the patch is applied.
>>> xas_try_split_min_order() is not included in the CONFIG_XARRAY_MULTI guard,
>>> whereas the original patch does. Moving it back fixed the issue.
>>> See: https://lore.kernel.org/linux-mm/20250308213400.10220-1-sj@kernel.org/
>>
>> This series took a lot of damage as "Buddy allocator like (or
>> non-uniform) folio split" was added, dropped, added, dropped...
>>
>> I have just dropped the series "Minimize xa_node allocation during
>> xarry split".  Please leave it a few days then resend against
>> mm-unstable.
>
> Sure. No problem.

Hi Andrew,

It seems that you only dropped the second patch of "Minimize xa_node
allocation during xarry split" and the offending
"mm/filemap: use xas_try_split() in __filemap_add_folio()", the first
patch, is still in mm-everything-2025-03-09-05-51.

--
Best Regards,
Yan, Zi