hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc: query dynamic DEBUG_PAGEALLOC setting 

We can disable debug_pagealloc processing even if the code is compiled
with CONFIG_DEBUG_PAGEALLOC.  This patch changes the code to query
whether it is enabled or not in runtime.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joonsoo Kim 2016-03-17 14:17:59 -07:00 committed by Linus Torvalds
parent 505f6d22db
commit e7df0d88c4
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/traps.c
View File

@ -203,9 +203,8 @@ static int __kprobes __die(const char *str, struct pt_regs *regs, long err)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
printk("SMP NR_CPUS=%d ", NR_CPUS); printk("SMP NR_CPUS=%d ", NR_CPUS);
#endif #endif
#ifdef CONFIG_DEBUG_PAGEALLOC if (debug_pagealloc_enabled())
printk("DEBUG_PAGEALLOC "); printk("DEBUG_PAGEALLOC ");
#endif
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
printk("NUMA "); printk("NUMA ");
#endif #endif

36
arch/powerpc/mm/hash_utils_64.c
View File

@ -255,8 +255,10 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
if (ret < 0) if (ret < 0)
break; break;
#ifdef CONFIG_DEBUG_PAGEALLOC #ifdef CONFIG_DEBUG_PAGEALLOC
if ((paddr >> PAGE_SHIFT) < linear_map_hash_count) if (debug_pagealloc_enabled() &&
(paddr >> PAGE_SHIFT) < linear_map_hash_count)
linear_map_hash_slots[paddr >> PAGE_SHIFT] = ret | 0x80; linear_map_hash_slots[paddr >> PAGE_SHIFT] = ret | 0x80;
#endif /* CONFIG_DEBUG_PAGEALLOC */ #endif /* CONFIG_DEBUG_PAGEALLOC */
} }
@ -512,17 +514,17 @@ static void __init htab_init_page_sizes(void)
if (mmu_has_feature(MMU_FTR_16M_PAGE)) if (mmu_has_feature(MMU_FTR_16M_PAGE))
memcpy(mmu_psize_defs, mmu_psize_defaults_gp, memcpy(mmu_psize_defs, mmu_psize_defaults_gp,
sizeof(mmu_psize_defaults_gp)); sizeof(mmu_psize_defaults_gp));
found: found:
#ifndef CONFIG_DEBUG_PAGEALLOC if (!debug_pagealloc_enabled()) {
/* /*
* Pick a size for the linear mapping. Currently, we only support * Pick a size for the linear mapping. Currently, we only
* 16M, 1M and 4K which is the default * support 16M, 1M and 4K which is the default
*/ */
if (mmu_psize_defs[MMU_PAGE_16M].shift) if (mmu_psize_defs[MMU_PAGE_16M].shift)
mmu_linear_psize = MMU_PAGE_16M; mmu_linear_psize = MMU_PAGE_16M;
else if (mmu_psize_defs[MMU_PAGE_1M].shift) else if (mmu_psize_defs[MMU_PAGE_1M].shift)
mmu_linear_psize = MMU_PAGE_1M; mmu_linear_psize = MMU_PAGE_1M;
#endif /* CONFIG_DEBUG_PAGEALLOC */ }
#ifdef CONFIG_PPC_64K_PAGES #ifdef CONFIG_PPC_64K_PAGES
/* /*
@ -721,10 +723,12 @@ static void __init htab_initialize(void)
prot = pgprot_val(PAGE_KERNEL); prot = pgprot_val(PAGE_KERNEL);
#ifdef CONFIG_DEBUG_PAGEALLOC #ifdef CONFIG_DEBUG_PAGEALLOC
linear_map_hash_count = memblock_end_of_DRAM() >> PAGE_SHIFT; if (debug_pagealloc_enabled()) {
linear_map_hash_slots = __va(memblock_alloc_base(linear_map_hash_count, linear_map_hash_count = memblock_end_of_DRAM() >> PAGE_SHIFT;
1, ppc64_rma_size)); linear_map_hash_slots = __va(memblock_alloc_base(
memset(linear_map_hash_slots, 0, linear_map_hash_count); linear_map_hash_count, 1, ppc64_rma_size));
memset(linear_map_hash_slots, 0, linear_map_hash_count);
}
#endif /* CONFIG_DEBUG_PAGEALLOC */ #endif /* CONFIG_DEBUG_PAGEALLOC */
/* On U3 based machines, we need to reserve the DART area and /* On U3 based machines, we need to reserve the DART area and

8
arch/powerpc/mm/init_32.c
View File

@ -112,10 +112,10 @@ void __init MMU_setup(void)
if (strstr(boot_command_line, "noltlbs")) { if (strstr(boot_command_line, "noltlbs")) {
__map_without_ltlbs = 1; __map_without_ltlbs = 1;
} }
#ifdef CONFIG_DEBUG_PAGEALLOC if (debug_pagealloc_enabled()) {
__map_without_bats = 1; __map_without_bats = 1;
__map_without_ltlbs = 1; __map_without_ltlbs = 1;
#endif }
} }
/* /*