On Mon 13-03-17 12:44:25, Dmitry Vyukov wrote: > When vmalloc() fails it prints a very lengthy message with all the > details about memory consumption assuming that it happened due to OOM. > However, vmalloc() can also fail due to fatal signal pending. > In such case the message is quite confusing because it suggests that > it is OOM but the numbers suggest otherwise. The messages can also > pollute console considerably. > > Don't warn when vmalloc() fails due to fatal signal pending. > > Signed-off-by: Dmitry Vyukov <dvyukov@xxxxxxxxxx> > Cc: linux-mm@xxxxxxxxx Acked-by: Michal Hocko <mhocko@xxxxxxxx> > --- > mm/vmalloc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index edf15f49831e..68eb0028004b 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -1683,7 +1683,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, > > if (fatal_signal_pending(current)) { > area->nr_pages = i; > - goto fail; > + goto fail_no_warn; > } > > if (node == NUMA_NO_NODE) > @@ -1709,6 +1709,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, > warn_alloc(gfp_mask, NULL, > "vmalloc: allocation failure, allocated %ld of %ld bytes", > (area->nr_pages*PAGE_SIZE), area->size); > +fail_no_warn: > vfree(area->addr); > return NULL; > } > -- > 2.12.0.246.ga2ecc84866-goog -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>