powerpc/64/kexec: Fix MMU cleanup on radix
PATCH 2/4 powerpc/64/kexec: Fix MMU cleanup on radix
Just using the hash ops won't work anymore since radix will have NULL in there. Instead create an mmu_cleanup_all() function which will do the right thing based on the MMU mode.
For Radix, for now I clear UPRT and the PTCR, effectively switching back to Radix with no partition table setup.
Currently set it to NULL on BookE thought it might be a good idea to wipe the TLB there (Scott ?)
---
Currently only compile tested
arch/powerpc/include/asm/book3s/64/mmu.h | 3 +++ arch/powerpc/include/asm/mmu-book3e.h | 3 +++ arch/powerpc/include/asm/mmu.h | 3 +++ arch/powerpc/kernel/machine_kexec_64.c | 10 +--------- arch/powerpc/mm/pgtable-book3s64.c | 9 +++++++++ arch/powerpc/mm/pgtable-radix.c | 10 ++++++++++ 6 files changed, 29 insertions(+), 9 deletions(-)
arch/powerpc/include/asm/book3s/64/mmu.h +3 -0
@@ -135,5 +135,8 @@ static inline void setup_initial_memory_limit(phys_addr_t first_memblock_base,return hash__setup_initial_memory_limit (first_memblock_base, first_memblock_size); } + +extern void radix__mmu_cleanup_all (void ); +#endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_BOOK3S_64_MMU_H_ */
arch/powerpc/include/asm/mmu-book3e.h +3 -0
@@ -313,6 +313,9 @@ extern int book3e_htw_mode;* return 1, indicating that the tlb requires preloading. */ #define HUGETLB_NEED_PRELOAD + +#define mmu_cleanup_all NULL +#endif #endif /* !__ASSEMBLY__ */
arch/powerpc/include/asm/mmu.h +3 -0
@@ -148,6 +148,9 @@ extern unsigned int __start___mmu_ftr_fixup, __stop___mmu_ftr_fixup;* make it match the size our of bolted TLB area */ extern u64 ppc64_rma_size; + +/* Cleanup function used by kexec */ +extern void mmu_cleanup_all (void );#endif /* CONFIG_PPC64 */ struct mm_struct ;
arch/powerpc/kernel/machine_kexec_64.c +1 -9
@@ -54,9 +54,6 @@ int default_machine_kexec_prepare(struct kimage *image)const unsigned long *basep;const unsigned int *sizep; -if (!mmu_hash_ops.hpte_clear_all) -return -ENOENT ; -/* * Since we use the kernel fault handlers and paging code to * handle the virtual mode, we must make sure no destination
@@ -379,12 +376,7 @@ void default_machine_kexec(struct kimage *image)*/ kexec_sequence (&kexec_stack, image->start, image,page_address (image->control_code_page), -#ifdef CONFIG_PPC_BOOK3E - NULL -#else - mmu_hash_ops.hpte_clear_all -#endif - ); + mmu_cleanup_all);/* NOTREACHED */ }
arch/powerpc/mm/pgtable-book3s64.c +9 -0
@@ -115,3 +115,12 @@ void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr, return; }#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + +/* For use by kexec */ +void mmu_cleanup_all (void ) +{ +if (radix_enabled ()) +radix__mmu_cleanup_all (); +else if (mmu_hash_ops.hpte_clear_all) + mmu_hash_ops.hpte_clear_all (); +}
arch/powerpc/mm/pgtable-radix.c +10 -0
@@ -366,6 +366,16 @@ void radix__early_init_mmu_secondary(void) } } +void radix__mmu_cleanup_all (void ) +{ +unsigned long lpcr; +if (!firmware_has_feature (FW_FEATURE_LPAR )) { + lpcr =mfspr (SPRN_LPCR ); +mtspr (SPRN_LPCR , lpcr & ~LPCR_UPRT ); +mtspr (SPRN_PTCR ,0 ); + } +} +void radix__setup_initial_memory_limit (phys_addr_t first_memblock_base,phys_addr_t first_memblock_size) {
Quoted 11 lines · Benjamin Herrenschmidt
Just using the hash ops won't work anymore since radix will have NULL in there. Instead create an
mmu_cleanup_all()function which will do the right thing based on the MMU mode.For Radix, for now I clear UPRT and the PTCR, effectively switching back to Radix with no partition table setup.
Currently set it to NULL on BookE thought it might be a good idea to wipe the TLB there (Scott ?)
Signed-off-by Benjamin Herrenschmidt <[email protected]>
<snip>
arch/powerpc/mm/pgtable-book3s64.c void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr, · line 123
Quoted 6 lines
arch/powerpc/mm/pgtable-book3s64.c +6
-0+ +/* For use by kexec */ +void mmu_cleanup_all (void ) +{ +if (radix_enabled ()) +radix__mmu_cleanup_all ();
Should this be more than just radix -- cpu_has_feature(CPU_FTR_ARCH_300)?
Quoted 8 lines
arch/powerpc/mm/pgtable-book3s64.c +3
-0+else if (mmu_hash_ops.hpte_clear_all) + mmu_hash_ops.hpte_clear_all (); +}arch/powerpc/mm/pgtable-radix.c +0
-0
arch/powerpc/mm/pgtable-radix.c void radix__early_init_mmu_secondary(void) · line 375
Quoted 10 lines
arch/powerpc/mm/pgtable-radix.c +7
-0@@ -366,6 +366,16 @@ void radix__early_init_mmu_secondary(void) } } +void radix__mmu_cleanup_all (void ) +{ +unsigned long lpcr; +if (!firmware_has_feature (FW_FEATURE_LPAR )) { + lpcr =mfspr (SPRN_LPCR ); +mtspr (SPRN_LPCR , lpcr & ~LPCR_UPRT ); +mtspr (SPRN_PTCR ,0 );
Free up the patb data structure here?
We also need tlbie's to invalidate any caches pointing to the patb entries
Balbir Singh.
Quoted 9 lines · Balbir Singh
+
arch/powerpc/mm/pgtable-book3s64.c void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr, · line 123
Quoted 5 lines
arch/powerpc/mm/pgtable-book3s64.c +5
-0+/* For use by kexec */ +void mmu_cleanup_all (void ) +{ + if (radix_enabled()) + radix__mmu_cleanup_all();Should this be more than just radix --
cpu_has_feature(CPU_FTR_ARCH_300)?
I don't understand... We need to cleanup the radix if we use a radix, otherwise we cleanup the hash ...
Basically this will switch back to hash mode before kexec.
Quoted 12 lines
Quoted 12 lines
+ else if (mmu_hash_ops.hpte_clear_all)
+ mmu_hash_ops.hpte_clear_all();(quoted diff) +1
-0+}arch/powerpc/mm/pgtable-radix.c +0
-0@@ -366,6 +366,16 @@ void radix__early_init_mmu_secondary(void) } }
+voidradix__mmu_cleanup_all(void)
Quoted 8 lines
Quoted 6 lines
+{
+ unsigned long lpcr;
+ if (!firmware_has_feature(FW_FEATURE_LPAR)) { + lpcr =mfspr(SPRN_LPCR);
+ mtspr(SPRN_LPCR, lpcr & ~LPCR_UPRT); + mtspr(SPRN_PTCR, 0);Free up the patb data structure here?
Why do we care freeing it ? We're about to kexec.
Quoted 1 line
We also need tlbie's to invalidate any caches pointing to the patb entries
Yes, that would be definitely a useful addition, I shuld have mentioned this is a stub so we don't crash due to a NULL pointer, but more work is needed to properly support kexec, which I'll let Aneesh do.
On the other hand for safety, the new kernel should also flush its TLB on entry I reckon. Especially since I don't think we do the cleanup on crashdump.
Cheers,
Ben.