From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>,
Be
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 18/37] x86, lmb: Use lmb_debug to control debug message print out
Date: Fri, 14 May 2010 12:45:44 -0700 [thread overview]
Message-ID: <1273866363-14249-19-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1273866363-14249-1-git-send-email-yinghai@kernel.org>
Also let lmb_reserve_area/lmb_free_area could print out name if lmb=debug is
specified
will also print ther name when reserve_lmb_area/free_lmb_area are called.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/mm/lmb.c | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
index 15fd3e4..5007dbf 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -121,11 +121,13 @@ static void __init subtract_lmb_reserved(struct range *range, int az)
count = lmb.reserved.cnt;
- pr_info("Subtract (%d early reservations)\n", count);
+ if (lmb_debug)
+ pr_info("Subtract (%d early reservations)\n", count);
for (i = 0; i < count; i++) {
struct lmb_region *r = &lmb.reserved.regions[i];
- pr_info(" #%d [%010llx - %010llx]\n", i, (u64)r->base, (u64)r->base + r->size);
+ if (lmb_debug)
+ pr_info(" #%d [%010llx - %010llx]\n", i, (u64)r->base, (u64)r->base + r->size);
final_start = PFN_DOWN(r->base);
final_end = PFN_UP(r->base + r->size);
if (final_start >= final_end)
@@ -205,17 +207,21 @@ void __init lmb_to_bootmem(u64 start, u64 end)
lmb_free(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max);
count = lmb.reserved.cnt;
- pr_info("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end);
+ if (lmb_debug)
+ pr_info("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end);
for (i = 0; i < count; i++) {
struct lmb_region *r = &lmb.reserved.regions[i];
- pr_info(" #%d [%010llx - %010llx] ", i, (u64)r->base, (u64)r->base + r->size);
+ if (lmb_debug)
+ pr_info(" #%d [%010llx - %010llx] ", i, (u64)r->base, (u64)r->base + r->size);
final_start = max(start, r->base);
final_end = min(end, r->base + r->size);
if (final_start >= final_end) {
- pr_cont("\n");
+ if (lmb_debug)
+ pr_cont("\n");
continue;
}
- pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end);
+ if (lmb_debug)
+ pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end);
reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT);
}
/* Clear them to avoid misusing ? */
@@ -306,6 +312,9 @@ void __init lmb_reserve_area(u64 start, u64 end, char *name)
if (WARN_ONCE(start > end, "lmb_reserve_area: wrong range [%#llx, %#llx]\n", start, end))
return;
+ if (lmb_debug)
+ pr_info(" lmb_reserve_area: [%010llx, %010llx] %16s\n", start, end, name);
+
lmb_reserve(start, end - start);
}
@@ -317,6 +326,9 @@ void __init lmb_free_area(u64 start, u64 end)
if (WARN_ONCE(start > end, "lmb_free_area: wrong range [%#llx, %#llx]\n", start, end))
return;
+ if (lmb_debug)
+ pr_info(" lmb_free_area: [%010llx, %010llx]\n", start, end);
+
lmb_free(start, end - start);
}
--
1.6.4.2
WARNING: multiple messages have this Message-ID (diff)
From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 18/37] x86, lmb: Use lmb_debug to control debug message print out
Date: Fri, 14 May 2010 12:45:44 -0700 [thread overview]
Message-ID: <1273866363-14249-19-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100514194544.r5Sis_5KQKI1LpWwGKN-U19STVamwecgV4aMb6KpYXc@z> (raw)
In-Reply-To: <1273866363-14249-1-git-send-email-yinghai@kernel.org>
Also let lmb_reserve_area/lmb_free_area could print out name if lmb=debug is
specified
will also print ther name when reserve_lmb_area/free_lmb_area are called.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/mm/lmb.c | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
index 15fd3e4..5007dbf 100644
--- a/arch/x86/mm/lmb.c
+++ b/arch/x86/mm/lmb.c
@@ -121,11 +121,13 @@ static void __init subtract_lmb_reserved(struct range *range, int az)
count = lmb.reserved.cnt;
- pr_info("Subtract (%d early reservations)\n", count);
+ if (lmb_debug)
+ pr_info("Subtract (%d early reservations)\n", count);
for (i = 0; i < count; i++) {
struct lmb_region *r = &lmb.reserved.regions[i];
- pr_info(" #%d [%010llx - %010llx]\n", i, (u64)r->base, (u64)r->base + r->size);
+ if (lmb_debug)
+ pr_info(" #%d [%010llx - %010llx]\n", i, (u64)r->base, (u64)r->base + r->size);
final_start = PFN_DOWN(r->base);
final_end = PFN_UP(r->base + r->size);
if (final_start >= final_end)
@@ -205,17 +207,21 @@ void __init lmb_to_bootmem(u64 start, u64 end)
lmb_free(__pa(lmb.reserved.regions), sizeof(struct lmb_region) * lmb.reserved.max);
count = lmb.reserved.cnt;
- pr_info("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end);
+ if (lmb_debug)
+ pr_info("(%d early reservations) ==> bootmem [%010llx - %010llx]\n", count, start, end);
for (i = 0; i < count; i++) {
struct lmb_region *r = &lmb.reserved.regions[i];
- pr_info(" #%d [%010llx - %010llx] ", i, (u64)r->base, (u64)r->base + r->size);
+ if (lmb_debug)
+ pr_info(" #%d [%010llx - %010llx] ", i, (u64)r->base, (u64)r->base + r->size);
final_start = max(start, r->base);
final_end = min(end, r->base + r->size);
if (final_start >= final_end) {
- pr_cont("\n");
+ if (lmb_debug)
+ pr_cont("\n");
continue;
}
- pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end);
+ if (lmb_debug)
+ pr_cont(" ==> [%010llx - %010llx]\n", final_start, final_end);
reserve_bootmem_generic(final_start, final_end - final_start, BOOTMEM_DEFAULT);
}
/* Clear them to avoid misusing ? */
@@ -306,6 +312,9 @@ void __init lmb_reserve_area(u64 start, u64 end, char *name)
if (WARN_ONCE(start > end, "lmb_reserve_area: wrong range [%#llx, %#llx]\n", start, end))
return;
+ if (lmb_debug)
+ pr_info(" lmb_reserve_area: [%010llx, %010llx] %16s\n", start, end, name);
+
lmb_reserve(start, end - start);
}
@@ -317,6 +326,9 @@ void __init lmb_free_area(u64 start, u64 end)
if (WARN_ONCE(start > end, "lmb_free_area: wrong range [%#llx, %#llx]\n", start, end))
return;
+ if (lmb_debug)
+ pr_info(" lmb_free_area: [%010llx, %010llx]\n", start, end);
+
lmb_free(start, end - start);
}
--
1.6.4.2
next prev parent reply other threads:[~2010-05-14 19:45 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-14 19:45 [PATCH -v17 00/37] Use lmb with x86 Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 01/37] lmb: lmb_find_base() should return LMB_ERROR on failing path Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 02/37] lmb: Prepare x86 to use lmb to replace early_res Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 03/37] lmb: Print new doubled array location info Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 04/37] lmb: Export LMB_ERROR again Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 05/37] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 06/37] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 07/37] lmb: Add lmb_find_area() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 22:39 ` Benjamin Herrenschmidt
2010-05-14 23:08 ` Yinghai
2010-05-15 0:11 ` Yinghai
2010-05-17 0:48 ` Benjamin Herrenschmidt
2010-05-17 6:09 ` Yinghai
2010-05-14 19:45 ` [PATCH 08/37] x86, lmb: Add lmb_find_area_size() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 09/37] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 10/37] x86, lmb: Add lmb_to_bootmem() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 11/37] x86,lmb: Add lmb_reserve_area/lmb_free_area Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 12/37] x86, lmb: Add get_free_all_memory_range() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 13/37] x86, lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 14/37] lmb: Add find_memory_core_early() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 15/37] x86, lmb: Add lmb_find_area_node() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 16/37] x86, lmb: Add lmb_free_memory_size() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 17/37] x86, lmb: Add lmb_memory_size() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu [this message]
2010-05-14 19:45 ` [PATCH 18/37] x86, lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-05-14 19:45 ` [PATCH 19/37] x86, lmb: Add x86 version of __lmb_find_area() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 20/37] x86: Use lmb to replace early_res Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 21/37] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 22/37] x86: Remove not used early_res code Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 23/37] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 24/37] bootmem: Add nobootmem.c to reduce the #ifdef Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 25/37] mm: move contig_page_data define to bootmem.c/nobootmem.c Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 26/37] lmb: Move __alloc_memory_core_early() to nobootmem.c Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 27/37] x86: Have nobootmem version setup_bootmem_allocator() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 28/37] x86: Put 64 bit numa node memmap above 16M Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 29/37] swiotlb: Use page alignment for early buffer allocation Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 30/37] x86: Add sanitize_e820_map() Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 31/37] x86: Change e820_saved to __initdata Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 32/37] x86: Align e820 ram range to page Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:45 ` [PATCH 33/37] x86: Use wake_system_ram_range() instead of e820_any_mapped() in agp path Yinghai Lu
2010-05-14 19:45 ` Yinghai Lu
2010-05-14 19:46 ` [PATCH 34/37] x86: Add get_centaur_ram_top() Yinghai Lu
2010-05-14 19:46 ` Yinghai Lu
2010-05-14 19:46 ` [PATCH 35/37] x86: Change e820_any_mapped() to __init Yinghai Lu
2010-05-14 19:46 ` Yinghai Lu
2010-05-14 19:46 ` [PATCH 36/37] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot Yinghai Lu
2010-05-14 19:46 ` Yinghai Lu
2010-05-14 19:46 ` [PATCH 37/37] x86: make e820 to be __initdata Yinghai Lu
2010-05-14 19:46 ` Yinghai Lu
-- strict thread matches above, loose matches on Subject: below --
2010-06-16 5:42 [PATCH -v18 00/37] Use lmb with x86 Yinghai Lu
2010-06-16 5:42 ` [PATCH 18/37] x86, lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-06-16 5:42 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1273866363-14249-19-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=hannes@cmpxchg.org \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).