Commit 29423e77 (oom: suppress show_mem() for many nodes in irq context on page alloc failure) was meant to suppress printing excessive amounts of information in IRQ context on large machines. However, it uses a kernel config variable which the maximum supported number of nodes, not the number of online nodes to make the decision. Effectively, on some distribution configurations the message will be suppressed even on small machines. This patch uses nr_online_nodes to decide whether to suppress messges.
Signed-off-by: Mel Gorman <[email protected]> --- mm/page_alloc.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f170260..a66a6fa 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1978,20 +1978,6 @@ this_zone_full: return page; } -/* - * Large machines with many possible nodes should not always dump per-node - * meminfo in irq context. - */ -static inline bool should_suppress_show_mem(void) -{ - bool ret = false; - -#if NODES_SHIFT > 8 - ret = in_interrupt(); -#endif - return ret; -} - static DEFINE_RATELIMIT_STATE(nopage_rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); @@ -2034,8 +2020,15 @@ void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...) current->comm, order, gfp_mask); dump_stack(); - if (!should_suppress_show_mem()) - show_mem(filter); + + /* + * Large machines with many possible nodes should not always dump + * per-node meminfo in irq context. + */ + if (in_interrupt() && nr_online_nodes > (1 << 8)) + return; + + show_mem(filter); } static inline int -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
