* [PATCH] mm/memblock: add missing include <linux/bootmem.h> and #ifdef
@ 2018-06-22 21:05 Mathieu Malaterre
2018-06-25 14:03 ` Michal Hocko
2018-06-25 17:15 ` [PATCH v2] mm/memblock: add missing include <linux/bootmem.h> Mathieu Malaterre
0 siblings, 2 replies; 10+ messages in thread
From: Mathieu Malaterre @ 2018-06-22 21:05 UTC (permalink / raw)
To: Andrew Morton
Cc: Tony Luck, Mathieu Malaterre, Michal Hocko, Pavel Tatashin,
Daniel Jordan, Steven Sistare, Daniel Vacek, Stefan Agner,
Joe Perches, Andy Shevchenko, linux-mm, linux-kernel
Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
introduced two new function definitions:
memblock_virt_alloc_try_nid_nopanic()
memblock_virt_alloc_try_nid()
Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
introduced the following function definition:
memblock_virt_alloc_try_nid_raw()
This commit adds an include of header file <linux/bootmem.h> to provide
the missing function prototypes. Silence the following gcc warning
(W=1):
mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes]
mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes]
mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes]
As seen in commit 6cc22dc08a24 ("revert "mm/memblock: add missing include
<linux/bootmem.h>"") #ifdef blockers were missing which lead to compilation
failure on mips/ia64 where CONFIG_NO_BOOTMEM=n.
Suggested-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
mm/memblock.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/memblock.c b/mm/memblock.c
index 4c98672bc3e2..f4b6766d7907 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -20,6 +20,7 @@
#include <linux/kmemleak.h>
#include <linux/seq_file.h>
#include <linux/memblock.h>
+#include <linux/bootmem.h>
#include <asm/sections.h>
#include <linux/io.h>
@@ -1226,6 +1227,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
}
+#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
/**
* memblock_virt_alloc_internal - allocate boot memory block
* @size: size of memory block to be allocated in bytes
@@ -1433,6 +1435,7 @@ void * __init memblock_virt_alloc_try_nid(
(u64)max_addr);
return NULL;
}
+#endif
/**
* __memblock_free_early - free boot memory block
--
2.11.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] mm/memblock: add missing include <linux/bootmem.h> and #ifdef
2018-06-22 21:05 [PATCH] mm/memblock: add missing include <linux/bootmem.h> and #ifdef Mathieu Malaterre
@ 2018-06-25 14:03 ` Michal Hocko
2018-06-25 14:26 ` Mathieu Malaterre
2018-06-25 17:15 ` [PATCH v2] mm/memblock: add missing include <linux/bootmem.h> Mathieu Malaterre
1 sibling, 1 reply; 10+ messages in thread
From: Michal Hocko @ 2018-06-25 14:03 UTC (permalink / raw)
To: Mathieu Malaterre
Cc: Andrew Morton, Tony Luck, Pavel Tatashin, Daniel Jordan,
Steven Sistare, Daniel Vacek, Stefan Agner, Joe Perches,
Andy Shevchenko, linux-mm, linux-kernel
On Fri 22-06-18 23:05:41, Mathieu Malaterre wrote:
> Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
> introduced two new function definitions:
>
> memblock_virt_alloc_try_nid_nopanic()
> memblock_virt_alloc_try_nid()
>
> Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
> introduced the following function definition:
>
> memblock_virt_alloc_try_nid_raw()
>
> This commit adds an include of header file <linux/bootmem.h> to provide
> the missing function prototypes. Silence the following gcc warning
> (W=1):
>
> mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes]
> mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes]
> mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes]
>
> As seen in commit 6cc22dc08a24 ("revert "mm/memblock: add missing include
> <linux/bootmem.h>"") #ifdef blockers were missing which lead to compilation
> failure on mips/ia64 where CONFIG_NO_BOOTMEM=n.
>
> Suggested-by: Tony Luck <tony.luck@intel.com>
> Signed-off-by: Mathieu Malaterre <malat@debian.org>
I was not aware of -Wmissing-prototypes
> ---
> mm/memblock.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/mm/memblock.c b/mm/memblock.c
> index 4c98672bc3e2..f4b6766d7907 100644
> --- a/mm/memblock.c
> +++ b/mm/memblock.c
> @@ -20,6 +20,7 @@
> #include <linux/kmemleak.h>
> #include <linux/seq_file.h>
> #include <linux/memblock.h>
> +#include <linux/bootmem.h>
>
> #include <asm/sections.h>
> #include <linux/io.h>
> @@ -1226,6 +1227,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
> return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
> }
>
> +#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
Why do you need CONFIG_HAVE_MEMBLOCK dependency?
mm/Makefile says
obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
so we even do not compile this code for !HAVE_MEMBLOCK AFAICS.
> /**
> * memblock_virt_alloc_internal - allocate boot memory block
> * @size: size of memory block to be allocated in bytes
> @@ -1433,6 +1435,7 @@ void * __init memblock_virt_alloc_try_nid(
> (u64)max_addr);
> return NULL;
> }
> +#endif
>
> /**
> * __memblock_free_early - free boot memory block
> --
> 2.11.0
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] mm/memblock: add missing include <linux/bootmem.h> and #ifdef
2018-06-25 14:03 ` Michal Hocko
@ 2018-06-25 14:26 ` Mathieu Malaterre
0 siblings, 0 replies; 10+ messages in thread
From: Mathieu Malaterre @ 2018-06-25 14:26 UTC (permalink / raw)
To: Michal Hocko
Cc: Andrew Morton, Tony Luck, Pavel Tatashin, Daniel Jordan,
Steven Sistare, Daniel Vacek, Stefan Agner, Joe Perches,
Andy Shevchenko, linux-mm, LKML
On Mon, Jun 25, 2018 at 4:03 PM Michal Hocko <mhocko@kernel.org> wrote:
>
> On Fri 22-06-18 23:05:41, Mathieu Malaterre wrote:
> > Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
> > introduced two new function definitions:
> >
> > memblock_virt_alloc_try_nid_nopanic()
> > memblock_virt_alloc_try_nid()
> >
> > Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
> > introduced the following function definition:
> >
> > memblock_virt_alloc_try_nid_raw()
> >
> > This commit adds an include of header file <linux/bootmem.h> to provide
> > the missing function prototypes. Silence the following gcc warning
> > (W=1):
> >
> > mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes]
> > mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes]
> > mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes]
> >
> > As seen in commit 6cc22dc08a24 ("revert "mm/memblock: add missing include
> > <linux/bootmem.h>"") #ifdef blockers were missing which lead to compilation
> > failure on mips/ia64 where CONFIG_NO_BOOTMEM=n.
> >
> > Suggested-by: Tony Luck <tony.luck@intel.com>
> > Signed-off-by: Mathieu Malaterre <malat@debian.org>
>
> I was not aware of -Wmissing-prototypes
(not tested) sparse would report something like:
symbol 'memblock_virt_alloc_try_nid_raw' was not declared. Should it be static?
> > ---
> > mm/memblock.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/mm/memblock.c b/mm/memblock.c
> > index 4c98672bc3e2..f4b6766d7907 100644
> > --- a/mm/memblock.c
> > +++ b/mm/memblock.c
> > @@ -20,6 +20,7 @@
> > #include <linux/kmemleak.h>
> > #include <linux/seq_file.h>
> > #include <linux/memblock.h>
> > +#include <linux/bootmem.h>
> >
> > #include <asm/sections.h>
> > #include <linux/io.h>
> > @@ -1226,6 +1227,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
> > return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
> > }
> >
> > +#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
>
> Why do you need CONFIG_HAVE_MEMBLOCK dependency?
> mm/Makefile says
> obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
>
> so we even do not compile this code for !HAVE_MEMBLOCK AFAICS.
Right, that can be simplified. I took it directly from Tony. I
originally found it more readable since it matched sentinels used for
the prototypes in <linux/bootmem.h>
$ grep -B 7 memblock_virt_alloc_try_nid_raw include/linux/bootmem.h | head -1
#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
I'll send a v2 shortly.
> > /**
> > * memblock_virt_alloc_internal - allocate boot memory block
> > * @size: size of memory block to be allocated in bytes
> > @@ -1433,6 +1435,7 @@ void * __init memblock_virt_alloc_try_nid(
> > (u64)max_addr);
> > return NULL;
> > }
> > +#endif
> >
> > /**
> > * __memblock_free_early - free boot memory block
> > --
> > 2.11.0
>
> --
> Michal Hocko
> SUSE Labs
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] mm/memblock: add missing include <linux/bootmem.h>
2018-06-22 21:05 [PATCH] mm/memblock: add missing include <linux/bootmem.h> and #ifdef Mathieu Malaterre
2018-06-25 14:03 ` Michal Hocko
@ 2018-06-25 17:15 ` Mathieu Malaterre
2018-06-25 18:07 ` Michal Hocko
2018-06-26 18:44 ` [PATCH v3] " Mathieu Malaterre
1 sibling, 2 replies; 10+ messages in thread
From: Mathieu Malaterre @ 2018-06-25 17:15 UTC (permalink / raw)
To: Andrew Morton
Cc: Tony Luck, Michal Hocko, Mathieu Malaterre, Michal Hocko,
Pavel Tatashin, Daniel Jordan, Steven Sistare, Daniel Vacek,
Stefan Agner, Joe Perches, Andy Shevchenko, linux-mm,
linux-kernel
Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
introduced two new function definitions:
memblock_virt_alloc_try_nid_nopanic()
memblock_virt_alloc_try_nid()
Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
introduced the following function definition:
memblock_virt_alloc_try_nid_raw()
This commit adds an include of header file <linux/bootmem.h> to provide
the missing function prototypes. Silence the following gcc warning
(W=1):
mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes]
mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes]
mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes]
It also adds #ifdef blockers to prevent compilation failure on mips/ia64
where CONFIG_NO_BOOTMEM=n. Because Makefile already does:
obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
The #ifdef has been simplified from:
#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
to simply:
#if defined(CONFIG_NO_BOOTMEM)
Suggested-by: Tony Luck <tony.luck@intel.com>
Suggested-by: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
v2: Simplify #ifdef
mm/memblock.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/memblock.c b/mm/memblock.c
index 03d48d8835ba..611a970ac902 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -20,6 +20,7 @@
#include <linux/kmemleak.h>
#include <linux/seq_file.h>
#include <linux/memblock.h>
+#include <linux/bootmem.h>
#include <asm/sections.h>
#include <linux/io.h>
@@ -1224,6 +1225,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
}
+#if defined(CONFIG_NO_BOOTMEM)
/**
* memblock_virt_alloc_internal - allocate boot memory block
* @size: size of memory block to be allocated in bytes
@@ -1431,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid(
(u64)max_addr);
return NULL;
}
+#endif
/**
* __memblock_free_early - free boot memory block
--
2.11.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] mm/memblock: add missing include <linux/bootmem.h>
2018-06-25 17:15 ` [PATCH v2] mm/memblock: add missing include <linux/bootmem.h> Mathieu Malaterre
@ 2018-06-25 18:07 ` Michal Hocko
2018-06-26 6:14 ` Mathieu Malaterre
2018-06-27 10:05 ` Mike Rapoport
2018-06-26 18:44 ` [PATCH v3] " Mathieu Malaterre
1 sibling, 2 replies; 10+ messages in thread
From: Michal Hocko @ 2018-06-25 18:07 UTC (permalink / raw)
To: Mathieu Malaterre
Cc: Andrew Morton, Tony Luck, Pavel Tatashin, Daniel Jordan,
Steven Sistare, Daniel Vacek, Stefan Agner, Joe Perches,
Andy Shevchenko, linux-mm, linux-kernel
On Mon 25-06-18 19:15:12, Mathieu Malaterre wrote:
> Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
> introduced two new function definitions:
>
> memblock_virt_alloc_try_nid_nopanic()
> memblock_virt_alloc_try_nid()
>
> Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
> introduced the following function definition:
>
> memblock_virt_alloc_try_nid_raw()
>
> This commit adds an include of header file <linux/bootmem.h> to provide
> the missing function prototypes. Silence the following gcc warning
> (W=1):
>
> mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes]
> mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes]
> mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes]
>
> It also adds #ifdef blockers to prevent compilation failure on mips/ia64
> where CONFIG_NO_BOOTMEM=n. Because Makefile already does:
>
> obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
>
> The #ifdef has been simplified from:
>
> #if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
>
> to simply:
>
> #if defined(CONFIG_NO_BOOTMEM)
Well, I would apreciate an explanation why do we need NO_BOOTMEM guard
in the first place rather than why HAVE_MEMBLOCK is not needed.
> Suggested-by: Tony Luck <tony.luck@intel.com>
> Suggested-by: Michal Hocko <mhocko@kernel.org>
> Signed-off-by: Mathieu Malaterre <malat@debian.org>
Anyway this looks better. I wish we can actually get rid of bootmem
allocator which would simplify this as well but that is another topic.
Acked-by: Michal Hocko <mhocko@suse.com>
> ---
> v2: Simplify #ifdef
>
> mm/memblock.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/mm/memblock.c b/mm/memblock.c
> index 03d48d8835ba..611a970ac902 100644
> --- a/mm/memblock.c
> +++ b/mm/memblock.c
> @@ -20,6 +20,7 @@
> #include <linux/kmemleak.h>
> #include <linux/seq_file.h>
> #include <linux/memblock.h>
> +#include <linux/bootmem.h>
>
> #include <asm/sections.h>
> #include <linux/io.h>
> @@ -1224,6 +1225,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
> return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
> }
>
> +#if defined(CONFIG_NO_BOOTMEM)
> /**
> * memblock_virt_alloc_internal - allocate boot memory block
> * @size: size of memory block to be allocated in bytes
> @@ -1431,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid(
> (u64)max_addr);
> return NULL;
> }
> +#endif
>
> /**
> * __memblock_free_early - free boot memory block
> --
> 2.11.0
>
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] mm/memblock: add missing include <linux/bootmem.h>
2018-06-25 18:07 ` Michal Hocko
@ 2018-06-26 6:14 ` Mathieu Malaterre
2018-06-27 10:05 ` Mike Rapoport
1 sibling, 0 replies; 10+ messages in thread
From: Mathieu Malaterre @ 2018-06-26 6:14 UTC (permalink / raw)
To: Michal Hocko
Cc: Andrew Morton, Tony Luck, Pavel Tatashin, Daniel Jordan,
Steven Sistare, Daniel Vacek, Stefan Agner, Joe Perches,
Andy Shevchenko, linux-mm, LKML
On Mon, Jun 25, 2018 at 8:07 PM Michal Hocko <mhocko@kernel.org> wrote:
>
> On Mon 25-06-18 19:15:12, Mathieu Malaterre wrote:
> > Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
> > introduced two new function definitions:
> >
> > memblock_virt_alloc_try_nid_nopanic()
> > memblock_virt_alloc_try_nid()
> >
> > Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
> > introduced the following function definition:
> >
> > memblock_virt_alloc_try_nid_raw()
> >
> > This commit adds an include of header file <linux/bootmem.h> to provide
> > the missing function prototypes. Silence the following gcc warning
> > (W=1):
> >
> > mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes]
> > mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes]
> > mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes]
> >
> > It also adds #ifdef blockers to prevent compilation failure on mips/ia64
> > where CONFIG_NO_BOOTMEM=n. Because Makefile already does:
> >
> > obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
> >
> > The #ifdef has been simplified from:
> >
> > #if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
> >
> > to simply:
> >
> > #if defined(CONFIG_NO_BOOTMEM)
>
> Well, I would apreciate an explanation why do we need NO_BOOTMEM guard
> in the first place rather than why HAVE_MEMBLOCK is not needed.
Right, I am missing the explicit reference to commit 6cc22dc08a247b
("revert "mm/memblock: add missing include <linux/bootmem.h>""), I can
tweak the commit message in a v3.
> > Suggested-by: Tony Luck <tony.luck@intel.com>
> > Suggested-by: Michal Hocko <mhocko@kernel.org>
> > Signed-off-by: Mathieu Malaterre <malat@debian.org>
>
> Anyway this looks better. I wish we can actually get rid of bootmem
> allocator which would simplify this as well but that is another topic.
>
> Acked-by: Michal Hocko <mhocko@suse.com>
Thanks !
> > ---
> > v2: Simplify #ifdef
> >
> > mm/memblock.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/mm/memblock.c b/mm/memblock.c
> > index 03d48d8835ba..611a970ac902 100644
> > --- a/mm/memblock.c
> > +++ b/mm/memblock.c
> > @@ -20,6 +20,7 @@
> > #include <linux/kmemleak.h>
> > #include <linux/seq_file.h>
> > #include <linux/memblock.h>
> > +#include <linux/bootmem.h>
> >
> > #include <asm/sections.h>
> > #include <linux/io.h>
> > @@ -1224,6 +1225,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
> > return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
> > }
> >
> > +#if defined(CONFIG_NO_BOOTMEM)
> > /**
> > * memblock_virt_alloc_internal - allocate boot memory block
> > * @size: size of memory block to be allocated in bytes
> > @@ -1431,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid(
> > (u64)max_addr);
> > return NULL;
> > }
> > +#endif
> >
> > /**
> > * __memblock_free_early - free boot memory block
> > --
> > 2.11.0
> >
>
> --
> Michal Hocko
> SUSE Labs
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3] mm/memblock: add missing include <linux/bootmem.h>
2018-06-25 17:15 ` [PATCH v2] mm/memblock: add missing include <linux/bootmem.h> Mathieu Malaterre
2018-06-25 18:07 ` Michal Hocko
@ 2018-06-26 18:44 ` Mathieu Malaterre
2018-07-20 19:16 ` Tony Luck
1 sibling, 1 reply; 10+ messages in thread
From: Mathieu Malaterre @ 2018-06-26 18:44 UTC (permalink / raw)
To: Andrew Morton
Cc: Tony Luck, Michal Hocko, Mathieu Malaterre, Michal Hocko,
Pavel Tatashin, Steven Sistare, Daniel Jordan, Daniel Vacek,
Stefan Agner, Joe Perches, Andy Shevchenko, linux-mm,
linux-kernel
Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
introduced two new function definitions:
memblock_virt_alloc_try_nid_nopanic()
memblock_virt_alloc_try_nid()
Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
introduced the following function definition:
memblock_virt_alloc_try_nid_raw()
This commit adds an include of header file <linux/bootmem.h> to provide
the missing function prototypes. Silence the following gcc warning
(W=1):
mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes]
mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes]
mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes]
Also adds #ifdef blockers to prevent compilation failure on mips/ia64 where
CONFIG_NO_BOOTMEM=n as could be seen in commit commit 6cc22dc08a24 ("revert
"mm/memblock: add missing include <linux/bootmem.h>"").
Because Makefile already does:
obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
The #ifdef has been simplified from:
#if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
to simply:
#if defined(CONFIG_NO_BOOTMEM)
Suggested-by: Tony Luck <tony.luck@intel.com>
Suggested-by: Michal Hocko <mhocko@kernel.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
v3: Add missing reference to commit 6cc22dc08a24
v2: Simplify #ifdef
mm/memblock.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/memblock.c b/mm/memblock.c
index 03d48d8835ba..611a970ac902 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -20,6 +20,7 @@
#include <linux/kmemleak.h>
#include <linux/seq_file.h>
#include <linux/memblock.h>
+#include <linux/bootmem.h>
#include <asm/sections.h>
#include <linux/io.h>
@@ -1224,6 +1225,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
}
+#if defined(CONFIG_NO_BOOTMEM)
/**
* memblock_virt_alloc_internal - allocate boot memory block
* @size: size of memory block to be allocated in bytes
@@ -1431,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid(
(u64)max_addr);
return NULL;
}
+#endif
/**
* __memblock_free_early - free boot memory block
--
2.11.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] mm/memblock: add missing include <linux/bootmem.h>
2018-06-25 18:07 ` Michal Hocko
2018-06-26 6:14 ` Mathieu Malaterre
@ 2018-06-27 10:05 ` Mike Rapoport
1 sibling, 0 replies; 10+ messages in thread
From: Mike Rapoport @ 2018-06-27 10:05 UTC (permalink / raw)
To: Michal Hocko
Cc: Mathieu Malaterre, Andrew Morton, Tony Luck, Pavel Tatashin,
Daniel Jordan, Steven Sistare, Daniel Vacek, Stefan Agner,
Joe Perches, Andy Shevchenko, linux-mm, linux-kernel
On Mon, Jun 25, 2018 at 08:07:17PM +0200, Michal Hocko wrote:
> On Mon 25-06-18 19:15:12, Mathieu Malaterre wrote:
> > Commit 26f09e9b3a06 ("mm/memblock: add memblock memory allocation apis")
> > introduced two new function definitions:
> >
> > memblock_virt_alloc_try_nid_nopanic()
> > memblock_virt_alloc_try_nid()
> >
> > Commit ea1f5f3712af ("mm: define memblock_virt_alloc_try_nid_raw")
> > introduced the following function definition:
> >
> > memblock_virt_alloc_try_nid_raw()
> >
> > This commit adds an include of header file <linux/bootmem.h> to provide
> > the missing function prototypes. Silence the following gcc warning
> > (W=1):
> >
> > mm/memblock.c:1334:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_raw' [-Wmissing-prototypes]
> > mm/memblock.c:1371:15: warning: no previous prototype for `memblock_virt_alloc_try_nid_nopanic' [-Wmissing-prototypes]
> > mm/memblock.c:1407:15: warning: no previous prototype for `memblock_virt_alloc_try_nid' [-Wmissing-prototypes]
> >
> > It also adds #ifdef blockers to prevent compilation failure on mips/ia64
> > where CONFIG_NO_BOOTMEM=n. Because Makefile already does:
> >
> > obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
> >
> > The #ifdef has been simplified from:
> >
> > #if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
> >
> > to simply:
> >
> > #if defined(CONFIG_NO_BOOTMEM)
>
> Well, I would apreciate an explanation why do we need NO_BOOTMEM guard
> in the first place rather than why HAVE_MEMBLOCK is not needed.
>
> > Suggested-by: Tony Luck <tony.luck@intel.com>
> > Suggested-by: Michal Hocko <mhocko@kernel.org>
> > Signed-off-by: Mathieu Malaterre <malat@debian.org>
>
> Anyway this looks better. I wish we can actually get rid of bootmem
> allocator which would simplify this as well but that is another topic.
There only 5 arches with bootmem left :)
I've started looking into it, but it goes slow :(
> Acked-by: Michal Hocko <mhocko@suse.com>
>
> > ---
> > v2: Simplify #ifdef
> >
> > mm/memblock.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/mm/memblock.c b/mm/memblock.c
> > index 03d48d8835ba..611a970ac902 100644
> > --- a/mm/memblock.c
> > +++ b/mm/memblock.c
> > @@ -20,6 +20,7 @@
> > #include <linux/kmemleak.h>
> > #include <linux/seq_file.h>
> > #include <linux/memblock.h>
> > +#include <linux/bootmem.h>
> >
> > #include <asm/sections.h>
> > #include <linux/io.h>
> > @@ -1224,6 +1225,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
> > return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
> > }
> >
> > +#if defined(CONFIG_NO_BOOTMEM)
> > /**
> > * memblock_virt_alloc_internal - allocate boot memory block
> > * @size: size of memory block to be allocated in bytes
> > @@ -1431,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid(
> > (u64)max_addr);
> > return NULL;
> > }
> > +#endif
> >
> > /**
> > * __memblock_free_early - free boot memory block
> > --
> > 2.11.0
> >
>
> --
> Michal Hocko
> SUSE Labs
>
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3] mm/memblock: add missing include <linux/bootmem.h>
2018-06-26 18:44 ` [PATCH v3] " Mathieu Malaterre
@ 2018-07-20 19:16 ` Tony Luck
2018-07-20 19:30 ` Andrew Morton
0 siblings, 1 reply; 10+ messages in thread
From: Tony Luck @ 2018-07-20 19:16 UTC (permalink / raw)
To: Mathieu Malaterre
Cc: Andrew Morton, Michal Hocko, Michal Hocko, Pavel Tatashin,
Steven Sistare, Daniel Jordan, Daniel Vacek, Stefan Agner,
Joe Perches, Andy Shevchenko, linux-mm,
Linux Kernel Mailing List
On Tue, Jun 26, 2018 at 11:44 AM, Mathieu Malaterre <malat@debian.org> wrote:
> Because Makefile already does:
>
> obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
>
> The #ifdef has been simplified from:
>
> #if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
>
> to simply:
>
> #if defined(CONFIG_NO_BOOTMEM)
Is this sitting in a queue somewhere ready to go to Linus?
I don't see it upstream yet.
>
> Suggested-by: Tony Luck <tony.luck@intel.com>
> Suggested-by: Michal Hocko <mhocko@kernel.org>
> Acked-by: Michal Hocko <mhocko@suse.com>
> Signed-off-by: Mathieu Malaterre <malat@debian.org>
> ---
> v3: Add missing reference to commit 6cc22dc08a24
> v2: Simplify #ifdef
>
> mm/memblock.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/mm/memblock.c b/mm/memblock.c
> index 03d48d8835ba..611a970ac902 100644
> --- a/mm/memblock.c
> +++ b/mm/memblock.c
> @@ -20,6 +20,7 @@
> #include <linux/kmemleak.h>
> #include <linux/seq_file.h>
> #include <linux/memblock.h>
> +#include <linux/bootmem.h>
>
> #include <asm/sections.h>
> #include <linux/io.h>
> @@ -1224,6 +1225,7 @@ phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, i
> return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
> }
>
> +#if defined(CONFIG_NO_BOOTMEM)
> /**
> * memblock_virt_alloc_internal - allocate boot memory block
> * @size: size of memory block to be allocated in bytes
> @@ -1431,6 +1433,7 @@ void * __init memblock_virt_alloc_try_nid(
> (u64)max_addr);
> return NULL;
> }
> +#endif
>
> /**
> * __memblock_free_early - free boot memory block
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3] mm/memblock: add missing include <linux/bootmem.h>
2018-07-20 19:16 ` Tony Luck
@ 2018-07-20 19:30 ` Andrew Morton
0 siblings, 0 replies; 10+ messages in thread
From: Andrew Morton @ 2018-07-20 19:30 UTC (permalink / raw)
To: Tony Luck
Cc: Mathieu Malaterre, Michal Hocko, Michal Hocko, Pavel Tatashin,
Steven Sistare, Daniel Jordan, Daniel Vacek, Stefan Agner,
Joe Perches, Andy Shevchenko, linux-mm,
Linux Kernel Mailing List
On Fri, 20 Jul 2018 12:16:05 -0700 Tony Luck <tony.luck@gmail.com> wrote:
> On Tue, Jun 26, 2018 at 11:44 AM, Mathieu Malaterre <malat@debian.org> wrote:
> > Because Makefile already does:
> >
> > obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
> >
> > The #ifdef has been simplified from:
> >
> > #if defined(CONFIG_HAVE_MEMBLOCK) && defined(CONFIG_NO_BOOTMEM)
> >
> > to simply:
> >
> > #if defined(CONFIG_NO_BOOTMEM)
>
> Is this sitting in a queue somewhere ready to go to Linus?
linux-next ;)
> I don't see it upstream yet.
For some brainfarty reason I had it for 4.19-rc1. Shall send it in
today.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-07-20 19:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-22 21:05 [PATCH] mm/memblock: add missing include <linux/bootmem.h> and #ifdef Mathieu Malaterre
2018-06-25 14:03 ` Michal Hocko
2018-06-25 14:26 ` Mathieu Malaterre
2018-06-25 17:15 ` [PATCH v2] mm/memblock: add missing include <linux/bootmem.h> Mathieu Malaterre
2018-06-25 18:07 ` Michal Hocko
2018-06-26 6:14 ` Mathieu Malaterre
2018-06-27 10:05 ` Mike Rapoport
2018-06-26 18:44 ` [PATCH v3] " Mathieu Malaterre
2018-07-20 19:16 ` Tony Luck
2018-07-20 19:30 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).