2019-01-16 18:27:10

by Mike Rapoport

Subject: [PATCH] mm/page_alloc: check return value of memblock_alloc_node_nopanic()

There are two early memory allocations that use
memblock_alloc_node_nopanic() and do not check its return value.
While this happens very early during boot and chances that the allocation
will fail are diminishing, it is still worth to have proper checks for the
allocation errors.

Signed-off-by: Mike Rapoport <[email protected]>
---
mm/page_alloc.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d295c9bc01a8..7801accbe02a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6376,10 +6376,14 @@ static void __ref setup_usemap(struct pglist_data *pgdat,
{
unsigned long usemapsize = usemap_size(zone_start_pfn, zonesize);
zone->pageblock_flags = NULL;
- if (usemapsize)
+ if (usemapsize) {
zone->pageblock_flags =
memblock_alloc_node_nopanic(usemapsize,
pgdat->node_id);
+ if (!zone->pageblock_flags)
+ panic("Failed to allocate %ld bytes for zone %s pageblock flags\n",
+ usemapsize, zone->name);
+ }
}
#else
static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone,
@@ -6609,6 +6613,9 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat)
end = ALIGN(end, MAX_ORDER_NR_PAGES);
size = (end - start) * sizeof(struct page);
map = memblock_alloc_node_nopanic(size, pgdat->node_id);
+ if (!map)
+ panic("Failed to allocate %ld bytes for memory map\n",
+ size);
pgdat->node_mem_map = map + offset;
}
pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n",
--
2.7.4

2019-01-17 10:21:13

by William Kucharski

Subject: Re: [PATCH] mm/page_alloc: check return value of memblock_alloc_node_nopanic()

This seems very reasonable, but if the code is just going to panic if the allocation fails, why not call memblock_alloc_node() instead?

If there is a reason we'd prefer to call memblock_alloc_node_nopanic(), I'd like to see pgdat->nodeid printed in the panic message as well.

2019-01-17 11:52:33

by Mike Rapoport

Subject: Re: [PATCH] mm/page_alloc: check return value of memblock_alloc_node_nopanic()

On Thu, Jan 17, 2019 at 03:19:35AM -0700, William Kucharski wrote:
>
> This seems very reasonable, but if the code is just going to panic if the
> allocation fails, why not call memblock_alloc_node() instead?

I've sent patches [1] that remove panic() from memblock_alloc*() and drop
_nopanic variants. After they will be (hopefully) merged,
memblock_alloc_node() will return NULL on error.

> If there is a reason we'd prefer to call memblock_alloc_node_nopanic(),
> I'd like to see pgdat->nodeid printed in the panic message as well.

Sure.

[1] https://lore.kernel.org/lkml/[email protected]/

--
Sincerely yours,
Mike.

2019-01-17 15:16:00

by William Kucharski

Subject: Re: [PATCH] mm/page_alloc: check return value of memblock_alloc_node_nopanic()

> On Jan 17, 2019, at 4:26 AM, Mike Rapoport <[email protected]> wrote:
>
> On Thu, Jan 17, 2019 at 03:19:35AM -0700, William Kucharski wrote:
>>
>> This seems very reasonable, but if the code is just going to panic if the
>> allocation fails, why not call memblock_alloc_node() instead?
>
> I've sent patches [1] that remove panic() from memblock_alloc*() and drop
> _nopanic variants. After they will be (hopefully) merged,
> memblock_alloc_node() will return NULL on error.
>
>> If there is a reason we'd prefer to call memblock_alloc_node_nopanic(),
>> I'd like to see pgdat->nodeid printed in the panic message as well.
>
> Sure.

Thanks for the quick response.

Reviewed-by: William Kucharski <[email protected]>