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: Michal Hocko <mhocko@suse.com> Acked-by: Mel Gorman <mgorman@suse.de> Acked-by: Hillf 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c02e50bb8a
commit
a8e99259e7
|
@ -1942,8 +1942,8 @@ extern void si_meminfo_node(struct sysinfo *val, int nid);
|
||||||
extern unsigned long arch_reserved_kernel_pages(void);
|
extern unsigned long arch_reserved_kernel_pages(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern __printf(2, 3)
|
extern __printf(3, 4)
|
||||||
void warn_alloc(gfp_t gfp_mask, const char *fmt, ...);
|
void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...);
|
||||||
|
|
||||||
extern void setup_per_cpu_pageset(void);
|
extern void setup_per_cpu_pageset(void);
|
||||||
|
|
||||||
|
|
|
@ -3028,12 +3028,13 @@ static void warn_alloc_show_mem(gfp_t gfp_mask)
|
||||||
show_mem(filter);
|
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;
|
struct va_format vaf;
|
||||||
va_list args;
|
va_list args;
|
||||||
static DEFINE_RATELIMIT_STATE(nopage_rs, DEFAULT_RATELIMIT_INTERVAL,
|
static DEFINE_RATELIMIT_STATE(nopage_rs, DEFAULT_RATELIMIT_INTERVAL,
|
||||||
DEFAULT_RATELIMIT_BURST);
|
DEFAULT_RATELIMIT_BURST);
|
||||||
|
nodemask_t *nm = (nodemask) ? nodemask : &cpuset_current_mems_allowed;
|
||||||
|
|
||||||
if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs) ||
|
if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs) ||
|
||||||
debug_guardpage_minorder() > 0)
|
debug_guardpage_minorder() > 0)
|
||||||
|
@ -3047,7 +3048,8 @@ void warn_alloc(gfp_t gfp_mask, const char *fmt, ...)
|
||||||
pr_cont("%pV", &vaf);
|
pr_cont("%pV", &vaf);
|
||||||
va_end(args);
|
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();
|
dump_stack();
|
||||||
warn_alloc_show_mem(gfp_mask);
|
warn_alloc_show_mem(gfp_mask);
|
||||||
|
@ -3724,7 +3726,7 @@ retry:
|
||||||
|
|
||||||
/* Make sure we know about allocations which stall for too long */
|
/* Make sure we know about allocations which stall for too long */
|
||||||
if (time_after(jiffies, alloc_start + stall_timeout)) {
|
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",
|
"page allocation stalls for %ums, order:%u",
|
||||||
jiffies_to_msecs(jiffies-alloc_start), order);
|
jiffies_to_msecs(jiffies-alloc_start), order);
|
||||||
stall_timeout += 10 * HZ;
|
stall_timeout += 10 * HZ;
|
||||||
|
@ -3775,7 +3777,7 @@ nopage:
|
||||||
if (read_mems_allowed_retry(cpuset_mems_cookie))
|
if (read_mems_allowed_retry(cpuset_mems_cookie))
|
||||||
goto retry_cpuset;
|
goto retry_cpuset;
|
||||||
|
|
||||||
warn_alloc(gfp_mask,
|
warn_alloc(gfp_mask, ac->nodemask,
|
||||||
"page allocation failure: order:%u", order);
|
"page allocation failure: order:%u", order);
|
||||||
got_pg:
|
got_pg:
|
||||||
return page;
|
return page;
|
||||||
|
|
|
@ -1662,7 +1662,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
|
||||||
return area->addr;
|
return area->addr;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
warn_alloc(gfp_mask,
|
warn_alloc(gfp_mask, NULL,
|
||||||
"vmalloc: allocation failure, allocated %ld of %ld bytes",
|
"vmalloc: allocation failure, allocated %ld of %ld bytes",
|
||||||
(area->nr_pages*PAGE_SIZE), area->size);
|
(area->nr_pages*PAGE_SIZE), area->size);
|
||||||
vfree(area->addr);
|
vfree(area->addr);
|
||||||
|
@ -1724,7 +1724,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
|
||||||
return addr;
|
return addr;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
warn_alloc(gfp_mask,
|
warn_alloc(gfp_mask, NULL,
|
||||||
"vmalloc: allocation failure: %lu bytes", real_size);
|
"vmalloc: allocation failure: %lu bytes", real_size);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue