[linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[kernel test robot]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
head:   100cc857359b5d731407d1038f7e76cd0e871d94
commit: 5f445800cbdfc4b4185d496a43dfd78df63d2265 [10352/10516] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
config: m68k-allmodconfig (https://download.01.org/0day-ci/archive/20240910/202409100913.RxkfrKU6-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 14.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240910/202409100913.RxkfrKU6-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/202409100913.RxkfrKU6-lkp@intel.com/

All errors (new ones prefixed by >>):

   In file included from include/linux/ioport.h:15,
                    from kernel/resource.c:15:
   kernel/resource.c: In function 'gfr_start':
>> include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared (first use in this function)
     101 | # define PHYSMEM_END    ((1ULL << MAX_PHYSMEM_BITS) - 1)
         |                                   ^~~~~~~~~~~~~~~~
   include/linux/minmax.h:93:38: note: in definition of macro '__cmp_once_unique'
      93 |         ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); })
         |                                      ^
   include/linux/minmax.h:213:27: note: in expansion of macro '__cmp_once'
     213 | #define min_t(type, x, y) __cmp_once(min, type, x, y)
         |                           ^~~~~~~~~~
   kernel/resource.c:1874:23: note: in expansion of macro 'min_t'
    1874 |                 end = min_t(resource_size_t, base->end, PHYSMEM_END);
         |                       ^~~~~
   kernel/resource.c:1874:57: note: in expansion of macro 'PHYSMEM_END'
    1874 |                 end = min_t(resource_size_t, base->end, PHYSMEM_END);
         |                                                         ^~~~~~~~~~~
   include/linux/mm.h:101:35: note: each undeclared identifier is reported only once for each function it appears in
     101 | # define PHYSMEM_END    ((1ULL << MAX_PHYSMEM_BITS) - 1)
         |                                   ^~~~~~~~~~~~~~~~
   include/linux/minmax.h:93:38: note: in definition of macro '__cmp_once_unique'
      93 |         ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); })
         |                                      ^
   include/linux/minmax.h:213:27: note: in expansion of macro '__cmp_once'
     213 | #define min_t(type, x, y) __cmp_once(min, type, x, y)
         |                           ^~~~~~~~~~
   kernel/resource.c:1874:23: note: in expansion of macro 'min_t'
    1874 |                 end = min_t(resource_size_t, base->end, PHYSMEM_END);
         |                       ^~~~~
   kernel/resource.c:1874:57: note: in expansion of macro 'PHYSMEM_END'
    1874 |                 end = min_t(resource_size_t, base->end, PHYSMEM_END);
         |                                                         ^~~~~~~~~~~
   kernel/resource.c: In function 'gfr_continue':
>> include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared (first use in this function)
     101 | # define PHYSMEM_END    ((1ULL << MAX_PHYSMEM_BITS) - 1)
         |                                   ^~~~~~~~~~~~~~~~
   include/linux/minmax.h:93:38: note: in definition of macro '__cmp_once_unique'
      93 |         ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); })
         |                                      ^
   include/linux/minmax.h:213:27: note: in expansion of macro '__cmp_once'
     213 | #define min_t(type, x, y) __cmp_once(min, type, x, y)
         |                           ^~~~~~~~~~
   kernel/resource.c:1891:24: note: in expansion of macro 'min_t'
    1891 |                addr <= min_t(resource_size_t, base->end, PHYSMEM_END);
         |                        ^~~~~
   kernel/resource.c:1891:58: note: in expansion of macro 'PHYSMEM_END'
    1891 |                addr <= min_t(resource_size_t, base->end, PHYSMEM_END);
         |                                                          ^~~~~~~~~~~

Kconfig warnings: (for reference only)
   WARNING: unmet direct dependencies detected for GET_FREE_REGION
   Depends on [n]: SPARSEMEM [=n]
   Selected by [m]:
   - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m]


vim +/MAX_PHYSMEM_BITS +101 include/linux/mm.h

d07e22597d1d35 Daniel Cashman  2016-01-14   99  
ea72ce5da22806 Thomas Gleixner 2024-08-14  100  #ifndef PHYSMEM_END
ea72ce5da22806 Thomas Gleixner 2024-08-14 @101  # define PHYSMEM_END	((1ULL << MAX_PHYSMEM_BITS) - 1)
ea72ce5da22806 Thomas Gleixner 2024-08-14  102  #endif
ea72ce5da22806 Thomas Gleixner 2024-08-14  103  

:::::: The code at line 101 was first introduced by commit
:::::: ea72ce5da22806d5713f3ffb39a6d5ae73841f93 x86/kaslr: Expose and use the end of the physical memory address space

:::::: TO: Thomas Gleixner <tglx@linutronix.de>
:::::: CC: Thomas Gleixner <tglx@linutronix.de>

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

Re: [linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[Andrew Morton]

On Tue, 10 Sep 2024 09:33:48 +0800 kernel test robot <lkp@intel.com> wrote:

> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
> head:   100cc857359b5d731407d1038f7e76cd0e871d94
> commit: 5f445800cbdfc4b4185d496a43dfd78df63d2265 [10352/10516] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> config: m68k-allmodconfig (https://download.01.org/0day-ci/archive/20240910/202409100913.RxkfrKU6-lkp@intel.com/config)
> compiler: m68k-linux-gcc (GCC) 14.1.0
> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240910/202409100913.RxkfrKU6-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/202409100913.RxkfrKU6-lkp@intel.com/
> 
> All errors (new ones prefixed by >>):
> 
>    In file included from include/linux/ioport.h:15,
>                     from kernel/resource.c:15:
>    kernel/resource.c: In function 'gfr_start':
> >> include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared (first use in this function)
>      101 | # define PHYSMEM_END    ((1ULL << MAX_PHYSMEM_BITS) - 1)
>          |                                   ^~~~~~~~~~~~~~~~
>    include/linux/minmax.h:93:38: note: in definition of macro '__cmp_once_unique'
>       93 |         ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); })
>          |                                      ^

Thanks. "resource, kunit: add test case for region_intersects" is the culprit.

Re: [linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[Huang, Ying]

Andrew Morton <akpm@linux-foundation.org> writes:

> On Tue, 10 Sep 2024 09:33:48 +0800 kernel test robot <lkp@intel.com> wrote:
>
>> tree:   https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
>> head:   100cc857359b5d731407d1038f7e76cd0e871d94
>> commit: 5f445800cbdfc4b4185d496a43dfd78df63d2265 [10352/10516] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>> config: m68k-allmodconfig (https://download.01.org/0day-ci/archive/20240910/202409100913.RxkfrKU6-lkp@intel.com/config)
>> compiler: m68k-linux-gcc (GCC) 14.1.0
>> reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240910/202409100913.RxkfrKU6-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/202409100913.RxkfrKU6-lkp@intel.com/
>> 
>> All errors (new ones prefixed by >>):
>> 
>>    In file included from include/linux/ioport.h:15,
>>                     from kernel/resource.c:15:
>>    kernel/resource.c: In function 'gfr_start':
>> >> include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared (first use in this function)
>>      101 | # define PHYSMEM_END    ((1ULL << MAX_PHYSMEM_BITS) - 1)
>>          |                                   ^~~~~~~~~~~~~~~~
>>    include/linux/minmax.h:93:38: note: in definition of macro '__cmp_once_unique'
>>       93 |         ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); })
>>          |                                      ^
>
> Thanks. "resource, kunit: add test case for region_intersects" is the culprit.

Yes.  Although the definition in include/linux/mm.h introduced in

  commit ea72ce5da228 ("x86/kaslr: Expose and use the end of the physical memory address space")

doesn't compile on m68k.  There are no users of PHYSMEM_END before patch
"resource, kunit: add test case for region_intersects".  This can be
fixed via the following patch.

---------------------------------8<--------------------------------------
From 00d176e0cd07e3df1ea37a5e56ca576c819b585a Mon Sep 17 00:00:00 2001
From: Huang Ying <ying.huang@intel.com>
Date: Tue, 10 Sep 2024 13:20:40 +0800
Subject: [PATCH] mm: fix PHYSMEM_END build error on m68k

0Day build system reported build error on m68k architecture for missing
the definition of MAX_PHYSMEM_BITS when defining PHYSMEM_END.  Fixed it
via making PHYSMEM_END definition depends on MAX_PHYSMEM_BITS definition
conditionally.

Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202409100913.RxkfrKU6-lkp@intel.com/
---
 include/linux/mm.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 147073601716..62bb7e7e0a17 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -98,7 +98,11 @@ extern int mmap_rnd_compat_bits __read_mostly;
 #endif
 
 #ifndef PHYSMEM_END
-# define PHYSMEM_END	((1ULL << MAX_PHYSMEM_BITS) - 1)
+# ifdef MAX_PHYSMEM_BITS
+#  define PHYSMEM_END		((1ULL << MAX_PHYSMEM_BITS) - 1)
+# else
+#  define PHYSMEM_END		(-1ULL)
+# endif
 #endif
 
 #include <asm/page.h>
-- 
2.39.2

Re: [linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[Andrew Morton]

On Tue, 10 Sep 2024 13:42:30 +0800 "Huang, Ying" <ying.huang@intel.com> wrote:

> >>       93 |         ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); })
> >>          |                                      ^
> >
> > Thanks. "resource, kunit: add test case for region_intersects" is the culprit.
> 
> Yes.  Although the definition in include/linux/mm.h introduced in
> 
>   commit ea72ce5da228 ("x86/kaslr: Expose and use the end of the physical memory address space")
> 
> doesn't compile on m68k.  There are no users of PHYSMEM_END before patch
> "resource, kunit: add test case for region_intersects".  This can be
> fixed via the following patch.
> 
> ---------------------------------8<--------------------------------------
> >From 00d176e0cd07e3df1ea37a5e56ca576c819b585a Mon Sep 17 00:00:00 2001
> From: Huang Ying <ying.huang@intel.com>
> Date: Tue, 10 Sep 2024 13:20:40 +0800
> Subject: [PATCH] mm: fix PHYSMEM_END build error on m68k
> 
> 0Day build system reported build error on m68k architecture for missing
> the definition of MAX_PHYSMEM_BITS when defining PHYSMEM_END.  Fixed it
> via making PHYSMEM_END definition depends on MAX_PHYSMEM_BITS definition
> conditionally.
> 
> Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202409100913.RxkfrKU6-lkp@intel.com/
> ---
>  include/linux/mm.h | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 147073601716..62bb7e7e0a17 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -98,7 +98,11 @@ extern int mmap_rnd_compat_bits __read_mostly;
>  #endif
>  
>  #ifndef PHYSMEM_END
> -# define PHYSMEM_END	((1ULL << MAX_PHYSMEM_BITS) - 1)
> +# ifdef MAX_PHYSMEM_BITS
> +#  define PHYSMEM_END		((1ULL << MAX_PHYSMEM_BITS) - 1)
> +# else
> +#  define PHYSMEM_END		(-1ULL)
> +# endif
>  #endif
>  
>  #include <asm/page.h>

I'm not really understanding.  This patch (which I assume is against
linux-next?) requires the presence of ea72ce5da228 ("x86/kaslr: Expose
and use the end of the physical memory address space"), which is not
present in mm.git.  Yet mm.git exhibits the build failure.

Re: [linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[Huang, Ying]

Andrew Morton <akpm@linux-foundation.org> writes:

> On Tue, 10 Sep 2024 13:42:30 +0800 "Huang, Ying" <ying.huang@intel.com> wrote:
>
>> >>       93 |         ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); })
>> >>          |                                      ^
>> >
>> > Thanks. "resource, kunit: add test case for region_intersects" is the culprit.
>> 
>> Yes.  Although the definition in include/linux/mm.h introduced in
>> 
>>   commit ea72ce5da228 ("x86/kaslr: Expose and use the end of the physical memory address space")
>> 
>> doesn't compile on m68k.  There are no users of PHYSMEM_END before patch
>> "resource, kunit: add test case for region_intersects".  This can be
>> fixed via the following patch.
>> 
>> ---------------------------------8<--------------------------------------
>> >From 00d176e0cd07e3df1ea37a5e56ca576c819b585a Mon Sep 17 00:00:00 2001
>> From: Huang Ying <ying.huang@intel.com>
>> Date: Tue, 10 Sep 2024 13:20:40 +0800
>> Subject: [PATCH] mm: fix PHYSMEM_END build error on m68k
>> 
>> 0Day build system reported build error on m68k architecture for missing
>> the definition of MAX_PHYSMEM_BITS when defining PHYSMEM_END.  Fixed it
>> via making PHYSMEM_END definition depends on MAX_PHYSMEM_BITS definition
>> conditionally.
>> 
>> Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
>> Cc: Thomas Gleixner <tglx@linutronix.de>
>> Reported-by: kernel test robot <lkp@intel.com>
>> Closes: https://lore.kernel.org/oe-kbuild-all/202409100913.RxkfrKU6-lkp@intel.com/
>> ---
>>  include/linux/mm.h | 6 +++++-
>>  1 file changed, 5 insertions(+), 1 deletion(-)
>> 
>> diff --git a/include/linux/mm.h b/include/linux/mm.h
>> index 147073601716..62bb7e7e0a17 100644
>> --- a/include/linux/mm.h
>> +++ b/include/linux/mm.h
>> @@ -98,7 +98,11 @@ extern int mmap_rnd_compat_bits __read_mostly;
>>  #endif
>>  
>>  #ifndef PHYSMEM_END
>> -# define PHYSMEM_END	((1ULL << MAX_PHYSMEM_BITS) - 1)
>> +# ifdef MAX_PHYSMEM_BITS
>> +#  define PHYSMEM_END		((1ULL << MAX_PHYSMEM_BITS) - 1)
>> +# else
>> +#  define PHYSMEM_END		(-1ULL)
>> +# endif
>>  #endif
>>  
>>  #include <asm/page.h>
>
> I'm not really understanding.  This patch (which I assume is against
> linux-next?) requires the presence of ea72ce5da228 ("x86/kaslr: Expose
> and use the end of the physical memory address space"), which is not
> present in mm.git.  Yet mm.git exhibits the build failure.

The original test report is against linux-next tree instead mm tree.

https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

The first bad commit (bisection result) is:

5f445800cbdfc4b4185d496a43dfd78df63d2265 [10352/10516] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

That is, mm tree is merged in linux-next, and commit ea72ce5da228
("x86/kaslr: Expose and use the end of the physical memory address
space") is merged in linux-next too.  In fact, there's a merge conflict
for MAX_PHYSMEM_BITS related code.  Maybe this can be part of merge
conflict resolving patch?

Hi, Stephen,

Can you use the patch above as part of merged conflict resolving patch
for patch

e2941fe697c8 ("resource, kunit: add test case for region_intersects()")

You have resolved it in

https://lore.kernel.org/lkml/20240909100043.60668995@canb.auug.org.au/

--
Best Regards,
Huang, Ying

Re: [linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

Hi Ying,

On Wed, 11 Sep 2024 09:06:53 +0800 "Huang, Ying" <ying.huang@intel.com> wrote:
>
> Can you use the patch above as part of merged conflict resolving patch
> for patch
> 
> e2941fe697c8 ("resource, kunit: add test case for region_intersects()")

I will apply your patch to the merge of the mm tree from tomorrow (and
I have sneaked it in today in another, later merge).

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[Andrew Morton]

On Wed, 11 Sep 2024 09:06:53 +0800 "Huang, Ying" <ying.huang@intel.com> wrote:

> > linux-next?) requires the presence of ea72ce5da228 ("x86/kaslr: Expose
> > and use the end of the physical memory address space"), which is not
> > present in mm.git.  Yet mm.git exhibits the build failure.
> 
> The original test report is against linux-next tree instead mm tree.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> 
> The first bad commit (bisection result) is:
> 
> 5f445800cbdfc4b4185d496a43dfd78df63d2265 [10352/10516] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> 
> That is, mm tree is merged in linux-next, and commit ea72ce5da228
> ("x86/kaslr: Expose and use the end of the physical memory address
> space") is merged in linux-next too.  In fact, there's a merge conflict
> for MAX_PHYSMEM_BITS related code.  Maybe this can be part of merge
> conflict resolving patch?
> 
> Hi, Stephen,
> 
> Can you use the patch above as part of merged conflict resolving patch
> for patch
> 
> e2941fe697c8 ("resource, kunit: add test case for region_intersects()")
> 
> You have resolved it in
> 
> https://lore.kernel.org/lkml/20240909100043.60668995@canb.auug.org.au/

mm-unstable is presently broken, and fixing up linux-next won't change that.

I'd prefer to fix mm-stable and then provide Linus directions for merging that
with the x86 tree.

Re: [linux-next:master 10352/10516] include/linux/mm.h:101:35: error: 'MAX_PHYSMEM_BITS' undeclared

[Huang, Ying]

Andrew Morton <akpm@linux-foundation.org> writes:

> On Wed, 11 Sep 2024 09:06:53 +0800 "Huang, Ying" <ying.huang@intel.com> wrote:
>
>> > linux-next?) requires the presence of ea72ce5da228 ("x86/kaslr: Expose
>> > and use the end of the physical memory address space"), which is not
>> > present in mm.git.  Yet mm.git exhibits the build failure.
>> 
>> The original test report is against linux-next tree instead mm tree.
>> 
>> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
>> 
>> The first bad commit (bisection result) is:
>> 
>> 5f445800cbdfc4b4185d496a43dfd78df63d2265 [10352/10516] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>> 
>> That is, mm tree is merged in linux-next, and commit ea72ce5da228
>> ("x86/kaslr: Expose and use the end of the physical memory address
>> space") is merged in linux-next too.  In fact, there's a merge conflict
>> for MAX_PHYSMEM_BITS related code.  Maybe this can be part of merge
>> conflict resolving patch?
>> 
>> Hi, Stephen,
>> 
>> Can you use the patch above as part of merged conflict resolving patch
>> for patch
>> 
>> e2941fe697c8 ("resource, kunit: add test case for region_intersects()")
>> 
>> You have resolved it in
>> 
>> https://lore.kernel.org/lkml/20240909100043.60668995@canb.auug.org.au/
>
> mm-unstable is presently broken, and fixing up linux-next won't change that.
>
> I'd prefer to fix mm-stable and then provide Linus directions for merging that
> with the x86 tree.

The real bug fix patch is [1/3]:

  resource: Fix region_intersects() vs add_memory_driver_managed()

The merge conflict is for the new kunit test case, which isn't urgent.

So, another option is to merge the bug fix ([1/3]) through mm now and
backport it to stable kernels.  Then I can resend the kunit test case
after v6.12-rc1 is released.

--
Best Regards,
Huang, Ying