leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: print physical addresses consistently with other parts of kernel

Browse Source 
Print physical address info in a style consistent with the %pR style used
elsewhere in the kernel.  For example:

    -found SMP MP-table at [ffff8800000fce90] fce90
    +found SMP MP-table at [mem 0x000fce90-0x000fce9f] mapped at [ffff8800000fce90]
    -initial memory mapped : 0 - 20000000
    +initial memory mapped: [mem 0x00000000-0x1fffffff]
    -Base memory trampoline at [ffff88000009c000] 9c000 size 8192
    +Base memory trampoline [mem 0x0009c000-0x0009dfff] mapped at [ffff88000009c000]
    -SRAT: Node 0 PXM 0 0-80000000
    +SRAT: Node 0 PXM 0 [mem 0x00000000-0x7fffffff]

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Bjorn Helgaas 2012-05-29 15:06:29 -07:00 committed by Linus Torvalds
parent 91eb0f67c3
commit 365811d6f9
7 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/kernel/mpparse.c
View File

@ -568,8 +568,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length)
struct mpf_intel *mpf; struct mpf_intel *mpf;
unsigned long mem; unsigned long mem;
apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n", apic_printk(APIC_VERBOSE, "Scan for SMP in [mem %#010lx-%#010lx]\n",
bp, length); base, base + length - 1);
BUILD_BUG_ON(sizeof(*mpf) != 16); BUILD_BUG_ON(sizeof(*mpf) != 16);
while (length > 0) { while (length > 0) {
@ -584,8 +584,10 @@ static int __init smp_scan_config(unsigned long base, unsigned long length)
#endif #endif
mpf_found = mpf; mpf_found = mpf;
printk(KERN_INFO "found SMP MP-table at [%p] %llx\n", printk(KERN_INFO "found SMP MP-table at [mem %#010llx-%#010llx] mapped at [%p]\n",
mpf, (u64)virt_to_phys(mpf)); (unsigned long long) virt_to_phys(mpf),
(unsigned long long) virt_to_phys(mpf) +
sizeof(*mpf) - 1, mpf);
mem = virt_to_phys(mpf); mem = virt_to_phys(mpf);
memblock_reserve(mem, sizeof(*mpf)); memblock_reserve(mem, sizeof(*mpf));

16
arch/x86/kernel/setup.c
View File

@ -334,8 +334,8 @@ static void __init relocate_initrd(void)
memblock_reserve(ramdisk_here, area_size); memblock_reserve(ramdisk_here, area_size);
initrd_start = ramdisk_here + PAGE_OFFSET; initrd_start = ramdisk_here + PAGE_OFFSET;
initrd_end = initrd_start + ramdisk_size; initrd_end = initrd_start + ramdisk_size;
printk(KERN_INFO "Allocated new RAMDISK: %08llx - %08llx\n", printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n",
ramdisk_here, ramdisk_here + ramdisk_size); ramdisk_here, ramdisk_here + ramdisk_size - 1);
q = (char *)initrd_start; q = (char *)initrd_start;
@ -366,8 +366,8 @@ static void __init relocate_initrd(void)
/* high pages is not converted by early_res_to_bootmem */ /* high pages is not converted by early_res_to_bootmem */
ramdisk_image = boot_params.hdr.ramdisk_image; ramdisk_image = boot_params.hdr.ramdisk_image;
ramdisk_size = boot_params.hdr.ramdisk_size; ramdisk_size = boot_params.hdr.ramdisk_size;
printk(KERN_INFO "Move RAMDISK from %016llx - %016llx to" printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to"
" %08llx - %08llx\n", " [mem %#010llx-%#010llx]\n",
ramdisk_image, ramdisk_image + ramdisk_size - 1, ramdisk_image, ramdisk_image + ramdisk_size - 1,
ramdisk_here, ramdisk_here + ramdisk_size - 1); ramdisk_here, ramdisk_here + ramdisk_size - 1);
} }
@ -392,8 +392,8 @@ static void __init reserve_initrd(void)
ramdisk_size, end_of_lowmem>>1); ramdisk_size, end_of_lowmem>>1);
} }
printk(KERN_INFO "RAMDISK: %08llx - %08llx\n", ramdisk_image, printk(KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n", ramdisk_image,
ramdisk_end); ramdisk_end - 1);
if (ramdisk_end <= end_of_lowmem) { if (ramdisk_end <= end_of_lowmem) {
@ -906,8 +906,8 @@ void __init setup_arch(char **cmdline_p)
setup_bios_corruption_check(); setup_bios_corruption_check();
#endif #endif
printk(KERN_DEBUG "initial memory mapped : 0 - %08lx\n", printk(KERN_DEBUG "initial memory mapped: [mem 0x00000000-%#010lx]\n",
max_pfn_mapped<<PAGE_SHIFT); (max_pfn_mapped<<PAGE_SHIFT) - 1);
setup_trampolines(); setup_trampolines();

16
arch/x86/mm/init.c
View File

@ -84,8 +84,9 @@ static void __init find_early_table_space(struct map_range *mr, unsigned long en
pgt_buf_end = pgt_buf_start; pgt_buf_end = pgt_buf_start;
pgt_buf_top = pgt_buf_start + (tables >> PAGE_SHIFT); pgt_buf_top = pgt_buf_start + (tables >> PAGE_SHIFT);
printk(KERN_DEBUG "kernel direct mapping tables up to %lx @ %lx-%lx\n", printk(KERN_DEBUG "kernel direct mapping tables up to %#lx @ [mem %#010lx-%#010lx]\n",
end, pgt_buf_start << PAGE_SHIFT, pgt_buf_top << PAGE_SHIFT); end - 1, pgt_buf_start << PAGE_SHIFT,
(pgt_buf_top << PAGE_SHIFT) - 1);
} }
void __init native_pagetable_reserve(u64 start, u64 end) void __init native_pagetable_reserve(u64 start, u64 end)
@ -132,7 +133,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
int nr_range, i; int nr_range, i;
int use_pse, use_gbpages; int use_pse, use_gbpages;
printk(KERN_INFO "init_memory_mapping: %016lx-%016lx\n", start, end); printk(KERN_INFO "init_memory_mapping: [mem %#010lx-%#010lx]\n",
start, end - 1);
#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KMEMCHECK) #if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KMEMCHECK)
/* /*
@ -251,8 +253,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
} }
for (i = 0; i < nr_range; i++) for (i = 0; i < nr_range; i++)
printk(KERN_DEBUG " %010lx - %010lx page %s\n", printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n",
mr[i].start, mr[i].end, mr[i].start, mr[i].end - 1,
(mr[i].page_size_mask & (1<<PG_LEVEL_1G))?"1G":( (mr[i].page_size_mask & (1<<PG_LEVEL_1G))?"1G":(
(mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k")); (mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k"));
@ -350,8 +352,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
* create a kernel page fault: * create a kernel page fault:
*/ */
#ifdef CONFIG_DEBUG_PAGEALLOC #ifdef CONFIG_DEBUG_PAGEALLOC
printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n", printk(KERN_INFO "debug: unmapping init [mem %#010lx-%#010lx]\n",
begin, end); begin, end - 1);
set_memory_np(begin, (end - begin) >> PAGE_SHIFT); set_memory_np(begin, (end - begin) >> PAGE_SHIFT);
#else #else
/* /*

32
arch/x86/mm/numa.c
View File

@ -141,8 +141,8 @@ static int __init numa_add_memblk_to(int nid, u64 start, u64 end,
/* whine about and ignore invalid blks */ /* whine about and ignore invalid blks */
if (start > end || nid < 0 || nid >= MAX_NUMNODES) { if (start > end || nid < 0 || nid >= MAX_NUMNODES) {
pr_warning("NUMA: Warning: invalid memblk node %d (%Lx-%Lx)\n", pr_warning("NUMA: Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n",
nid, start, end); nid, start, end - 1);
return 0; return 0;
} }
@ -210,8 +210,8 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
start = roundup(start, ZONE_ALIGN); start = roundup(start, ZONE_ALIGN);
printk(KERN_INFO "Initmem setup node %d %016Lx-%016Lx\n", printk(KERN_INFO "Initmem setup node %d [mem %#010Lx-%#010Lx]\n",
nid, start, end); nid, start, end - 1);
/* /*
* Allocate node data. Try remap allocator first, node-local * Allocate node data. Try remap allocator first, node-local
@ -232,7 +232,7 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
} }
/* report and initialize */ /* report and initialize */
printk(KERN_INFO " NODE_DATA [%016Lx - %016Lx]%s\n", printk(KERN_INFO " NODE_DATA [mem %#010Lx-%#010Lx]%s\n",
nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : ""); nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : "");
tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT); tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
if (!remapped && tnid != nid) if (!remapped && tnid != nid)
@ -291,14 +291,14 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi)
*/ */
if (bi->end > bj->start && bi->start < bj->end) { if (bi->end > bj->start && bi->start < bj->end) {
if (bi->nid != bj->nid) { if (bi->nid != bj->nid) {
pr_err("NUMA: node %d (%Lx-%Lx) overlaps with node %d (%Lx-%Lx)\n", pr_err("NUMA: node %d [mem %#010Lx-%#010Lx] overlaps with node %d [mem %#010Lx-%#010Lx]\n",
bi->nid, bi->start, bi->end, bi->nid, bi->start, bi->end - 1,
bj->nid, bj->start, bj->end); bj->nid, bj->start, bj->end - 1);
return -EINVAL; return -EINVAL;
} }
pr_warning("NUMA: Warning: node %d (%Lx-%Lx) overlaps with itself (%Lx-%Lx)\n", pr_warning("NUMA: Warning: node %d [mem %#010Lx-%#010Lx] overlaps with itself [mem %#010Lx-%#010Lx]\n",
bi->nid, bi->start, bi->end, bi->nid, bi->start, bi->end - 1,
bj->start, bj->end); bj->start, bj->end - 1);
} }
/* /*
@ -320,9 +320,9 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi)
} }
if (k < mi->nr_blks) if (k < mi->nr_blks)
continue; continue;
printk(KERN_INFO "NUMA: Node %d [%Lx,%Lx) + [%Lx,%Lx) -> [%Lx,%Lx)\n", printk(KERN_INFO "NUMA: Node %d [mem %#010Lx-%#010Lx] + [mem %#010Lx-%#010Lx] -> [mem %#010Lx-%#010Lx]\n",
bi->nid, bi->start, bi->end, bj->start, bj->end, bi->nid, bi->start, bi->end - 1, bj->start,
start, end); bj->end - 1, start, end - 1);
bi->start = start; bi->start = start;
bi->end = end; bi->end = end;
numa_remove_memblk_from(j--, mi); numa_remove_memblk_from(j--, mi);
@ -616,8 +616,8 @@ static int __init dummy_numa_init(void)
{ {
printk(KERN_INFO "%s\n", printk(KERN_INFO "%s\n",
numa_off ? "NUMA turned off" : "No NUMA configuration found"); numa_off ? "NUMA turned off" : "No NUMA configuration found");
printk(KERN_INFO "Faking a node at %016Lx-%016Lx\n", printk(KERN_INFO "Faking a node at [mem %#018Lx-%#018Lx]\n",
0LLU, PFN_PHYS(max_pfn)); 0LLU, PFN_PHYS(max_pfn) - 1);
node_set(0, numa_nodes_parsed); node_set(0, numa_nodes_parsed);
numa_add_memblk(0, 0, PFN_PHYS(max_pfn)); numa_add_memblk(0, 0, PFN_PHYS(max_pfn));

4
arch/x86/mm/numa_emulation.c
View File

@ -68,8 +68,8 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei,
numa_remove_memblk_from(phys_blk, pi); numa_remove_memblk_from(phys_blk, pi);
} }
printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid, printk(KERN_INFO "Faking node %d at [mem %#018Lx-%#018Lx] (%LuMB)\n",
eb->start, eb->end, (eb->end - eb->start) >> 20); nid, eb->start, eb->end - 1, (eb->end - eb->start) >> 20);
return 0; return 0;
} }

42
arch/x86/mm/pat.c
View File

@ -209,9 +209,8 @@ static int reserve_ram_pages_type(u64 start, u64 end, unsigned long req_type,
page = pfn_to_page(pfn); page = pfn_to_page(pfn);
type = get_page_memtype(page); type = get_page_memtype(page);
if (type != -1) { if (type != -1) {
printk(KERN_INFO "reserve_ram_pages_type failed " printk(KERN_INFO "reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%lx, req 0x%lx\n",
"0x%Lx-0x%Lx, track 0x%lx, req 0x%lx\n", start, end - 1, type, req_type);
start, end, type, req_type);
if (new_type) if (new_type)
*new_type = type; *new_type = type;
@ -314,9 +313,9 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
err = rbt_memtype_check_insert(new, new_type); err = rbt_memtype_check_insert(new, new_type);
if (err) { if (err) {
printk(KERN_INFO "reserve_memtype failed 0x%Lx-0x%Lx, " printk(KERN_INFO "reserve_memtype failed [mem %#010Lx-%#010Lx], track %s, req %s\n",
"track %s, req %s\n", start, end - 1,
start, end, cattr_name(new->type), cattr_name(req_type)); cattr_name(new->type), cattr_name(req_type));
kfree(new); kfree(new);
spin_unlock(&memtype_lock); spin_unlock(&memtype_lock);
@ -325,8 +324,8 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
spin_unlock(&memtype_lock); spin_unlock(&memtype_lock);
dprintk("reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n", dprintk("reserve_memtype added [mem %#010Lx-%#010Lx], track %s, req %s, ret %s\n",
start, end, cattr_name(new->type), cattr_name(req_type), start, end - 1, cattr_name(new->type), cattr_name(req_type),
new_type ? cattr_name(*new_type) : "-"); new_type ? cattr_name(*new_type) : "-");
return err; return err;
@ -360,14 +359,14 @@ int free_memtype(u64 start, u64 end)
spin_unlock(&memtype_lock); spin_unlock(&memtype_lock);
if (!entry) { if (!entry) {
printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n", printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
current->comm, current->pid, start, end); current->comm, current->pid, start, end - 1);
return -EINVAL; return -EINVAL;
} }
kfree(entry); kfree(entry);
dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end); dprintk("free_memtype request [mem %#010Lx-%#010Lx]\n", start, end - 1);
return 0; return 0;
} }
@ -491,9 +490,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
while (cursor < to) { while (cursor < to) {
if (!devmem_is_allowed(pfn)) { if (!devmem_is_allowed(pfn)) {
printk(KERN_INFO printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
"Program %s tried to access /dev/mem between %Lx->%Lx.\n", current->comm, from, to - 1);
current->comm, from, to);
return 0; return 0;
} }
cursor += PAGE_SIZE; cursor += PAGE_SIZE;
@ -554,12 +552,11 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
size; size;
if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) { if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
printk(KERN_INFO printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
"%s:%d ioremap_change_attr failed %s " "for [mem %#010Lx-%#010Lx]\n",
"for %Lx-%Lx\n",
current->comm, current->pid, current->comm, current->pid,
cattr_name(flags), cattr_name(flags),
base, (unsigned long long)(base + size)); base, (unsigned long long)(base + size-1));
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -591,12 +588,11 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
flags = lookup_memtype(paddr); flags = lookup_memtype(paddr);
if (want_flags != flags) { if (want_flags != flags) {
printk(KERN_WARNING printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
"%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
current->comm, current->pid, current->comm, current->pid,
cattr_name(want_flags), cattr_name(want_flags),
(unsigned long long)paddr, (unsigned long long)paddr,
(unsigned long long)(paddr + size), (unsigned long long)(paddr + size - 1),
cattr_name(flags)); cattr_name(flags));
*vma_prot = __pgprot((pgprot_val(*vma_prot) & *vma_prot = __pgprot((pgprot_val(*vma_prot) &
(~_PAGE_CACHE_MASK)) | (~_PAGE_CACHE_MASK)) |
@ -614,11 +610,11 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
!is_new_memtype_allowed(paddr, size, want_flags, flags)) { !is_new_memtype_allowed(paddr, size, want_flags, flags)) {
free_memtype(paddr, paddr + size); free_memtype(paddr, paddr + size);
printk(KERN_ERR "%s:%d map pfn expected mapping type %s" printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
" for %Lx-%Lx, got %s\n", " for [mem %#010Lx-%#010Lx], got %s\n",
current->comm, current->pid, current->comm, current->pid,
cattr_name(want_flags), cattr_name(want_flags),
(unsigned long long)paddr, (unsigned long long)paddr,
(unsigned long long)(paddr + size), (unsigned long long)(paddr + size - 1),
cattr_name(flags)); cattr_name(flags));
return -EINVAL; return -EINVAL;
} }

5
arch/x86/mm/srat.c
View File

@ -176,8 +176,9 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
return; return;
} }
printk(KERN_INFO "SRAT: Node %u PXM %u %Lx-%Lx\n", node, pxm, printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
start, end); node, pxm,
(unsigned long long) start, (unsigned long long) end - 1);
} }
void __init acpi_numa_arch_fixup(void) {} void __init acpi_numa_arch_fixup(void) {}