aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMichal Nazarewicz <mina86@mina86.com>2014-11-13 18:19:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-11-13 19:17:05 -0500
commitdae803e165a11bc88ca8dbc07a11077caf97bbcb (patch)
tree88d384e3f07e1c5f78208482cbc1164edc5bf0b8 /mm
parent95069ac8da4975120ba76e968fc72948582c3509 (diff)
mm: alloc_contig_range: demote pages busy message from warn to info
Having test_pages_isolated failure message as a warning confuses users into thinking that it is more serious than it really is. In reality, if called via CMA, allocation will be retried so a single test_pages_isolated failure does not prevent allocation from succeeding. Demote the warning message to an info message and reformat it such that the text "failed" does not appear and instead a less worrying "PFNS busy" is used. This message is trivially reproducible on a 10GB x86 machine on 3.16.y kernels configured with CONFIG_DMA_CMA. Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Peter Hurley <peter@hurleysoftware.com> Cc: Minchan Kim <minchan@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fd11b913779e..181dc593962b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6397,13 +6397,12 @@ int alloc_contig_range(unsigned long start, unsigned long end,
6397 6397
6398 /* Make sure the range is really isolated. */ 6398 /* Make sure the range is really isolated. */
6399 if (test_pages_isolated(outer_start, end, false)) { 6399 if (test_pages_isolated(outer_start, end, false)) {
6400 pr_warn("alloc_contig_range test_pages_isolated(%lx, %lx) failed\n", 6400 pr_info("%s: [%lx, %lx) PFNs busy\n",
6401 outer_start, end); 6401 __func__, outer_start, end);
6402 ret = -EBUSY; 6402 ret = -EBUSY;
6403 goto done; 6403 goto done;
6404 } 6404 }
6405 6405
6406
6407 /* Grab isolated pages from freelists. */ 6406 /* Grab isolated pages from freelists. */
6408 outer_end = isolate_freepages_range(&cc, outer_start, end); 6407 outer_end = isolate_freepages_range(&cc, outer_start, end);
6409 if (!outer_end) { 6408 if (!outer_end) {