Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2856cc2e authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Be less verbose during vmemmap population. 



On a 2-node machine with 256GB of ram we get 512 lines of
console output, which is just too much.

This mimicks Yinghai Lu's x86 commit c2b91e2e
(x86_64/mm: check and print vmemmap allocation continuous) except that
we aren't ever going to get contiguous block pointers in between calls
so just print when the virtual address or node changes.

This decreases the output by an order of 16.

Also demote this to KERN_DEBUG.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a27032ee

arch/sparc/mm/init_64.c

+23 −5
Original line number Original line Diff line number Diff line
@@ -2020,6 +2020,9 @@ EXPORT_SYMBOL(_PAGE_CACHE); 
#ifdef CONFIG_SPARSEMEM_VMEMMAP

#ifdef CONFIG_SPARSEMEM_VMEMMAP

unsigned long vmemmap_table[VMEMMAP_SIZE];

unsigned long vmemmap_table[VMEMMAP_SIZE];





static long __meminitdata addr_start, addr_end;

static int __meminitdata node_start;



int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)

int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)

{

{

	unsigned long vstart = (unsigned long) start;

	unsigned long vstart = (unsigned long) start;
@@ -2050,15 +2053,30 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node) 




			*vmem_pp = pte_base | __pa(block);

			*vmem_pp = pte_base | __pa(block);





			printk(KERN_INFO "[%p-%p] page_structs=%lu "

			/* check to see if we have contiguous blocks */

			       "node=%d entry=%lu/%lu\n", start, block, nr,

			if (addr_end != addr || node_start != node) {

			       node,

				if (addr_start)

			       addr >> VMEMMAP_CHUNK_SHIFT,

					printk(KERN_DEBUG " [%lx-%lx] on node %d\n",

			       VMEMMAP_SIZE);

					       addr_start, addr_end-1, node_start);

				addr_start = addr;

				node_start = node;

			}

			addr_end = addr + VMEMMAP_CHUNK;

		}

		}

	}

	}

	return 0;

	return 0;

}

}



void __meminit vmemmap_populate_print_last(void)

{

	if (addr_start) {

		printk(KERN_DEBUG " [%lx-%lx] on node %d\n",

		       addr_start, addr_end-1, node_start);

		addr_start = 0;

		addr_end = 0;

		node_start = 0;

	}

}

#endif /* CONFIG_SPARSEMEM_VMEMMAP */

#endif /* CONFIG_SPARSEMEM_VMEMMAP */





static void prot_init_common(unsigned long page_none,

static void prot_init_common(unsigned long page_none,