Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8e99259 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

mm, page_alloc: warn_alloc print nodemask 

warn_alloc is currently used for to report an allocation failure or an
allocation stall.  We print some details of the allocation request like
the gfp mask and the request order.  We do not print the allocation
nodemask which is important when debugging the reason for the allocation
failure as well.  We alreaddy print the nodemask in the OOM report.

Add nodemask to warn_alloc and print it in warn_alloc as well.

Link: http://lkml.kernel.org/r/20170117091543.25850-3-mhocko@kernel.org


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Acked-by: default avatarHillf Danton <hillf.zj@alibaba-inc.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c02e50bb

include/linux/mm.h

+2 −2
Original line number Diff line number Diff line
@@ -1942,8 +1942,8 @@ extern void si_meminfo_node(struct sysinfo *val, int nid); 
extern unsigned long arch_reserved_kernel_pages(void);

#endif



extern __printf(2, 3)

void warn_alloc(gfp_t gfp_mask, const char *fmt, ...);

extern __printf(3, 4)

void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...);



extern void setup_per_cpu_pageset(void);

mm/page_alloc.c

+6 −4
Original line number Diff line number Diff line
@@ -3028,12 +3028,13 @@ static void warn_alloc_show_mem(gfp_t gfp_mask) 
	show_mem(filter);

}



void warn_alloc(gfp_t gfp_mask, const char *fmt, ...)

void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;

	static DEFINE_RATELIMIT_STATE(nopage_rs, DEFAULT_RATELIMIT_INTERVAL,

				      DEFAULT_RATELIMIT_BURST);

	nodemask_t *nm = (nodemask) ? nodemask : &cpuset_current_mems_allowed;



	if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs) ||

	    debug_guardpage_minorder() > 0)
@@ -3047,7 +3048,8 @@ void warn_alloc(gfp_t gfp_mask, const char *fmt, ...) 
	pr_cont("%pV", &vaf);

	va_end(args);



	pr_cont(", mode:%#x(%pGg)\n", gfp_mask, &gfp_mask);

	pr_cont(", mode:%#x(%pGg), nodemask=%*pbl\n", gfp_mask, &gfp_mask, nodemask_pr_args(nm));

	cpuset_print_current_mems_allowed();



	dump_stack();

	warn_alloc_show_mem(gfp_mask);
@@ -3724,7 +3726,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, 


	/* Make sure we know about allocations which stall for too long */

	if (time_after(jiffies, alloc_start + stall_timeout)) {

		warn_alloc(gfp_mask,

		warn_alloc(gfp_mask, ac->nodemask,

			"page allocation stalls for %ums, order:%u",

			jiffies_to_msecs(jiffies-alloc_start), order);

		stall_timeout += 10 * HZ;
@@ -3775,7 +3777,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, 
	if (read_mems_allowed_retry(cpuset_mems_cookie))

		goto retry_cpuset;



	warn_alloc(gfp_mask,

	warn_alloc(gfp_mask, ac->nodemask,

			"page allocation failure: order:%u", order);

got_pg:

	return page;

mm/vmalloc.c

+2 −2
Original line number Diff line number Diff line
@@ -1662,7 +1662,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, 
	return area->addr;



fail:

	warn_alloc(gfp_mask,

	warn_alloc(gfp_mask, NULL,

			  "vmalloc: allocation failure, allocated %ld of %ld bytes",

			  (area->nr_pages*PAGE_SIZE), area->size);

	vfree(area->addr);
@@ -1724,7 +1724,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, 
	return addr;



fail:

	warn_alloc(gfp_mask,

	warn_alloc(gfp_mask, NULL,

			  "vmalloc: allocation failure: %lu bytes", real_size);

	return NULL;

}