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

powerpc/32s: set up an early static hash table for KASAN.

Browse Source 
KASAN requires early activation of hash table, before memblock()
functions are available.

This patch implements an early hash_table statically defined in
__initdata.

During early boot, a single page table is used.

For hash32, when doing the final init, one page table is allocated
for each PGD entry because of the _PAGE_HASHPTE flag which can't be
common to several virt pages. This is done after memblock get
available but before switching to the final hash table, otherwise
there are issues with TLB flushing due to the shared entries.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2019-04-26 16:23:36 +00:00 committed by Michael Ellerman
parent 72f208c6a8
commit 215b823707
3 changed files with 68 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
arch/powerpc/kernel/head_32.S
View File

@ -160,6 +160,10 @@ __after_mmu_off:
bl flush_tlbs bl flush_tlbs
bl initial_bats bl initial_bats
bl load_segment_registers
#ifdef CONFIG_KASAN
bl early_hash_table
#endif
#if defined(CONFIG_BOOTX_TEXT) #if defined(CONFIG_BOOTX_TEXT)
bl setup_disp_bat bl setup_disp_bat
#endif #endif
@ -205,7 +209,7 @@ __after_mmu_off:
*/ */
turn_on_mmu: turn_on_mmu:
mfmsr r0 mfmsr r0
ori r0,r0,MSR_DR|MSR_IR ori r0,r0,MSR_DR|MSR_IR|MSR_RI
mtspr SPRN_SRR1,r0 mtspr SPRN_SRR1,r0
lis r0,start_here@h lis r0,start_here@h
ori r0,r0,start_here@l ori r0,r0,start_here@l
@ -884,11 +888,24 @@ _ENTRY(__restore_cpu_setup)
blr blr
#endif /* !defined(CONFIG_PPC_BOOK3S_32) */ #endif /* !defined(CONFIG_PPC_BOOK3S_32) */
/* /*
* Load stuff into the MMU. Intended to be called with * Load stuff into the MMU. Intended to be called with
* IR=0 and DR=0. * IR=0 and DR=0.
*/ */
#ifdef CONFIG_KASAN
early_hash_table:
sync /* Force all PTE updates to finish */
isync
tlbia /* Clear all TLB entries */
sync /* wait for tlbia/tlbie to finish */
TLBSYNC /* ... on all CPUs */
/* Load the SDR1 register (hash table base & size) */
lis r6, early_hash - PAGE_OFFSET@h
ori r6, r6, 3 /* 256kB table */
mtspr SPRN_SDR1, r6
blr
#endif
load_up_mmu: load_up_mmu:
sync /* Force all PTE updates to finish */ sync /* Force all PTE updates to finish */
isync isync
@ -900,6 +917,28 @@ load_up_mmu:
tophys(r6,r6) tophys(r6,r6)
lwz r6,_SDR1@l(r6) lwz r6,_SDR1@l(r6)
mtspr SPRN_SDR1,r6 mtspr SPRN_SDR1,r6
/* Load the BAT registers with the values set up by MMU_init.
MMU_init takes care of whether we're on a 601 or not. */
mfpvr r3
srwi r3,r3,16
cmpwi r3,1
lis r3,BATS@ha
addi r3,r3,BATS@l
tophys(r3,r3)
LOAD_BAT(0,r3,r4,r5)
LOAD_BAT(1,r3,r4,r5)
LOAD_BAT(2,r3,r4,r5)
LOAD_BAT(3,r3,r4,r5)
BEGIN_MMU_FTR_SECTION
LOAD_BAT(4,r3,r4,r5)
LOAD_BAT(5,r3,r4,r5)
LOAD_BAT(6,r3,r4,r5)
LOAD_BAT(7,r3,r4,r5)
END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
blr
load_segment_registers:
li r0, NUM_USER_SEGMENTS /* load up user segment register values */ li r0, NUM_USER_SEGMENTS /* load up user segment register values */
mtctr r0 /* for context 0 */ mtctr r0 /* for context 0 */
li r3, 0 /* Kp = 0, Ks = 0, VSID = 0 */ li r3, 0 /* Kp = 0, Ks = 0, VSID = 0 */
@ -923,25 +962,6 @@ load_up_mmu:
addi r3, r3, 0x111 /* increment VSID */ addi r3, r3, 0x111 /* increment VSID */
addis r4, r4, 0x1000 /* address of next segment */ addis r4, r4, 0x1000 /* address of next segment */
bdnz 3b bdnz 3b
/* Load the BAT registers with the values set up by MMU_init.
MMU_init takes care of whether we're on a 601 or not. */
mfpvr r3
srwi r3,r3,16
cmpwi r3,1
lis r3,BATS@ha
addi r3,r3,BATS@l
tophys(r3,r3)
LOAD_BAT(0,r3,r4,r5)
LOAD_BAT(1,r3,r4,r5)
LOAD_BAT(2,r3,r4,r5)
LOAD_BAT(3,r3,r4,r5)
BEGIN_MMU_FTR_SECTION
LOAD_BAT(4,r3,r4,r5)
LOAD_BAT(5,r3,r4,r5)
LOAD_BAT(6,r3,r4,r5)
LOAD_BAT(7,r3,r4,r5)
END_MMU_FTR_SECTION_IFSET(MMU_FTR_USE_HIGH_BATS)
blr blr
/* /*

23
arch/powerpc/mm/kasan/kasan_init_32.c
View File

@ -94,6 +94,13 @@ void __init kasan_mmu_init(void)
int ret; int ret;
struct memblock_region *reg; struct memblock_region *reg;
if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE)) {
ret = kasan_init_shadow_page_tables(KASAN_SHADOW_START, KASAN_SHADOW_END);
if (ret)
panic("kasan: kasan_init_shadow_page_tables() failed");
}
for_each_memblock(memory, reg) { for_each_memblock(memory, reg) {
phys_addr_t base = reg->base; phys_addr_t base = reg->base;
phys_addr_t top = min(base + reg->size, total_lowmem); phys_addr_t top = min(base + reg->size, total_lowmem);
@ -135,6 +142,20 @@ void *module_alloc(unsigned long size)
} }
#endif #endif
#ifdef CONFIG_PPC_BOOK3S_32
u8 __initdata early_hash[256 << 10] __aligned(256 << 10) = {0};
static void __init kasan_early_hash_table(void)
{
modify_instruction_site(&patch__hash_page_A0, 0xffff, __pa(early_hash) >> 16);
modify_instruction_site(&patch__flush_hash_A0, 0xffff, __pa(early_hash) >> 16);
Hash = (struct hash_pte *)early_hash;
}
#else
static void __init kasan_early_hash_table(void) {}
#endif
void __init kasan_early_init(void) void __init kasan_early_init(void)
{ {
unsigned long addr = KASAN_SHADOW_START; unsigned long addr = KASAN_SHADOW_START;
@ -152,5 +173,5 @@ void __init kasan_early_init(void)
} while (pmd++, addr = next, addr != end); } while (pmd++, addr = next, addr != end);
if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE)) if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE))
WARN(true, "KASAN not supported on hash 6xx"); kasan_early_hash_table();
} }

1
arch/powerpc/mm/mmu_decl.h
View File

@ -106,6 +106,7 @@ extern unsigned int rtas_data, rtas_size;
struct hash_pte; struct hash_pte;
extern struct hash_pte *Hash, *Hash_end; extern struct hash_pte *Hash, *Hash_end;
extern unsigned long Hash_size, Hash_mask; extern unsigned long Hash_size, Hash_mask;
extern u8 early_hash[];
#endif /* CONFIG_PPC32 */ #endif /* CONFIG_PPC32 */