powerpc: Fix ioremap_flags() with book3e pte definition
PATCH 1/1 powerpc: Fix ioremap_flags() with book3e pte definition
From: Benjamin Herrenschmidt <[email protected]>
We can't just clear the user read permission in book3e pte, because that will also clear supervisor read permission. This surely isn't desired. Fix the problem by adding the supervisor read back.
BenH: Slightly simplified the ifdef and applied to ppc64 too
---
For 2.6.34 stable commit 55052eeca6d71d76f7c3f156c0501814d8e5e6d3
arch/powerpc/mm/pgtable_32.c | 8 ++++++++ arch/powerpc/mm/pgtable_64.c | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)
arch/powerpc/mm/pgtable_32.c +8 -0
@@ -146,6 +146,14 @@ ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags)/* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */ flags &= ~(_PAGE_USER | _PAGE_EXEC); +#ifdef _PAGE_BAP_SR +/* _PAGE_USER contains _PAGE_BAP_SR on BookE using the new PTE format +* which means that we just cleared supervisor access... oops ;-) This +* restores it +*/ + flags |= _PAGE_BAP_SR; +#endif +return __ioremap_caller (addr, size, flags,__builtin_return_address (0 )); }EXPORT_SYMBOL (ioremap_flags);
arch/powerpc/mm/pgtable_64.c +8 -0
@@ -265,6 +265,14 @@ void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size,/* we don't want to let _PAGE_USER and _PAGE_EXEC leak out */ flags &= ~(_PAGE_USER | _PAGE_EXEC); +#ifdef _PAGE_BAP_SR +/* _PAGE_USER contains _PAGE_BAP_SR on BookE using the new PTE format +* which means that we just cleared supervisor access... oops ;-) This +* restores it +*/ + flags |= _PAGE_BAP_SR; +#endif +if (ppc_md.ioremap)return ppc_md.ioremap (addr, size, flags, caller);return __ioremap_caller (addr, size, flags, caller);
Signature · 1 line
1.6.0.6
PATCH 1/1 powerpc/fsl-booke: Fix InstructionTLBError execute permission check
From: Li Yang <[email protected]>
In CONFIG_PTE_64BIT the PTE format has unique permission bits for user and supervisor execute. However on !CONFIG_PTE_64BIT we overload the supervisor bit to imply user execute with _PAGE_USER set. This allows us to use the same permission check mask for user or supervisor code on !CONFIG_PTE_64BIT.
However, on CONFIG_PTE_64BIT we map _PAGE_EXEC to _PAGE_BAP_UX so we need a different permission mask based on the fault coming from a kernel address or user space.
Without unique permission masks we see issues like the following with modules:
Unable to handle kernel paging request for instruction fetch Faulting instruction address: 0xf938d040 Oops: Kernel access of bad area, sig: 11 [#1]
---
For 2.6.34 stable commit 78e2e68a2b79f394b7cd61e07987a8a89af907f7
arch/powerpc/kernel/head_fsl_booke.S | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
arch/powerpc/kernel/head_fsl_booke.S +10 -3
@@ -639,6 +639,13 @@ interrupt_base: rlwinm r12,r12,0,16,1 mtspr SPRN_MAS1,r12 + /* Make up the required permissions for kernel code */ +#ifdef CONFIG_PTE_64BIT + li r13,_PAGE_PRESENT | _PAGE_BAP_SX + oris r13,r13,_PAGE_ACCESSED@h +#else + li r13,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC +#endif b 4f /* Get the PGD for the current thread */
@@ -646,15 +653,15 @@ interrupt_base: mfspr r11,SPRN_SPRG_THREAD lwz r11,PGDIR(r11) -4: - /* Make up the required permissions */ + /* Make up the required permissions for user code */ #ifdef CONFIG_PTE_64BIT - li r13,_PAGE_PRESENT | _PAGE_EXEC + li r13,_PAGE_PRESENT | _PAGE_BAP_UX oris r13,r13,_PAGE_ACCESSED@h #else li r13,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC #endif +4: FIND_PTE andc. r13,r13,r11 /* Check permission */
Signature · 1 line
1.6.0.6
PATCH 1/1 powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace
When we build with ftrace enabled its possible that loadcam_entry would have used the stack pointer (even though the code doesn't need it). We call loadcam_entry in __secondary_start before the stack is setup. To ensure that loadcam_entry doesn't use the stack pointer the easiest solution is to just have it in asm code.
---
For 2.6.34 stable commit 78f622377f7d31d988db350a43c5689dd5f31876
arch/powerpc/kernel/asm-offsets.c | 8 ++++++++ arch/powerpc/mm/fsl_booke_mmu.c | 25 +++---------------------- arch/powerpc/mm/mmu_decl.h | 10 +++++++++- arch/powerpc/mm/tlb_nohash_low.S | 28 ++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 23 deletions(-)
arch/powerpc/kernel/asm-offsets.c +8 -0
@@ -448,6 +448,14 @@ int main(void)DEFINE (PGD_T_LOG2 ,PGD_T_LOG2 );DEFINE (PTE_T_LOG2 ,PTE_T_LOG2 );#endif +#ifdef CONFIG_FSL_BOOKE +DEFINE (TLBCAM_SIZE ,sizeof (struct tlbcam )); +DEFINE (TLBCAM_MAS0 , offsetof(struct tlbcam , MAS0)); +DEFINE (TLBCAM_MAS1 , offsetof(struct tlbcam , MAS1)); +DEFINE (TLBCAM_MAS2 , offsetof(struct tlbcam , MAS2)); +DEFINE (TLBCAM_MAS3 , offsetof(struct tlbcam , MAS3)); +DEFINE (TLBCAM_MAS7 , offsetof(struct tlbcam , MAS7)); +#endif #ifdef CONFIG_KVM_EXIT_TIMING DEFINE(VCPU_TIMING_EXIT_TBU, offsetof(struct kvm_vcpu,
arch/powerpc/mm/fsl_booke_mmu.c +3 -22
@@ -2,7 +2,7 @@* Modifications by Kumar Gala ([email protected]) to support * E500 Book E processors. * -* Copyright 2004 Freescale Semiconductor, Inc +* Copyright 2004,2010 Freescale Semiconductor, Inc. * * This file contains the routines for initializing the MMU * on the 4xx series of chips.
@@ -56,19 +56,13 @@unsigned int tlbcam_index; -#define NUM_TLBCAMS (64)#if defined(CONFIG_LOWMEM_CAM_NUM_BOOL ) && (CONFIG_LOWMEM_CAM_NUM >=NUM_TLBCAMS )#error "LOWMEM_CAM_NUM must be less than NUM_TLBCAMS"#endif -struct tlbcam { -u32 MAS0; -u32 MAS1; -unsigned long MAS2; -u32 MAS3; -u32 MAS7; -}TLBCAM [NUM_TLBCAMS ]; +#define NUM_TLBCAMS (64) +struct tlbcam TLBCAM [NUM_TLBCAMS ];struct tlbcamrange {unsigned long start;
@@ -109,19 +103,6 @@ unsigned long p_mapped_by_tlbcam(phys_addr_t pa)return 0 ; } -void loadcam_entry (int idx) -{ -mtspr (SPRN_MAS0 ,TLBCAM [idx].MAS0); -mtspr (SPRN_MAS1 ,TLBCAM [idx].MAS1); -mtspr (SPRN_MAS2 ,TLBCAM [idx].MAS2); -mtspr (SPRN_MAS3 ,TLBCAM [idx].MAS3); - -if (mmu_has_feature (MMU_FTR_BIG_PHYS )) -mtspr (SPRN_MAS7 ,TLBCAM [idx].MAS7); - - asmvolatile ("isync;tlbwe;isync" : : :"memory" ); -} -/* * Set up one of the I/D BAT (block address translation) register pairs. * The parameters are not checked; in particular size must be a power
arch/powerpc/mm/mmu_decl.h +9 -1
@@ -144,7 +144,15 @@ extern unsigned long mmu_mapin_ram(unsigned long top);extern void MMU_init_hw (void );extern unsigned long mmu_mapin_ram (unsigned long top);extern void adjust_total_lowmem (void ); - +extern void loadcam_entry (unsigned int index); + +struct tlbcam { +u32 MAS0; +u32 MAS1; +unsigned long MAS2; +u32 MAS3; +u32 MAS7; +};#elif defined(CONFIG_PPC32 )/* anything 32-bit except 4xx or 8xx */ extern void MMU_init_hw (void );
arch/powerpc/mm/tlb_nohash_low.S +28 -0
@@ -365,3 +365,31 @@ _GLOBAL(set_context) #else #error Unsupported processor type ! #endif + +#if defined(CONFIG_FSL_BOOKE) +/* + * extern void loadcam_entry(unsigned int index) + * + * Load TLBCAM[index] entry in to the L2 CAM MMU + */ +_GLOBAL(loadcam_entry) + LOAD_REG_ADDR(r4, TLBCAM) + mulli r5,r3,TLBCAM_SIZE + add r3,r5,r4 + lwz r4,TLBCAM_MAS0(r3) + mtspr SPRN_MAS0,r4 + lwz r4,TLBCAM_MAS1(r3) + mtspr SPRN_MAS1,r4 + PPC_LL r4,TLBCAM_MAS2(r3) + mtspr SPRN_MAS2,r4 + lwz r4,TLBCAM_MAS3(r3) + mtspr SPRN_MAS3,r4 +BEGIN_MMU_FTR_SECTION + lwz r4,TLBCAM_MAS7(r3) + mtspr SPRN_MAS7,r4 +END_MMU_FTR_SECTION_IFSET(MMU_FTR_BIG_PHYS) + isync + tlbwe + isync + blr +#endif
Signature · 1 line
1.6.0.6
Re: [PATCH] powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace
Quoted 5 lines · Kumar Gala
When we build with ftrace enabled its possible that
loadcam_entrywould have used the stack pointer (even though the code doesn't need it). We callloadcam_entryin__secondary_startbefore the stack is setup. To ensure thatloadcam_entrydoesn't use the stack pointer the easiest solution is to just have it in asm code.
You could move it to a separate file and have that not built with the ftrace options (-pg etc.) - but maybe that's not easier.
cheers
Quoted 8 lines · Kumar Gala
From: Benjamin Herrenschmidt <[email protected]> =20
We can't just clear the user read permission in book3e pte, because that will also clear supervisor read permission. This surely isn't desired. Fix the problem by adding the supervisor read back. =20
BenH: Slightly simplified the ifdef and applied to ppc64 too =20
Quoted 8 lines
Signed-off-by Li Yang <[email protected]>Signed-off-by Benjamin Herrenschmidt <[email protected]>---
For 2.6.34 stable commit55052eeca6d71d76f7c3f156c0501814d8e5e6d3=20arch/powerpc/mm/pgtable_32.c | 8 ++++++++ arch/powerpc/mm/pgtable_64.c | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)
Wondering what happened to this patch (and 2 other) getting into stable = queue for .34.x
- k=
Quoted 16 lines · Kumar Gala
Quoted 13 lines · Kumar Gala
From: Benjamin Herrenschmidt <[email protected]>
We can't just clear the user read permission in book3e pte, because that will also clear supervisor read permission. This surely isn't desired. Fix the problem by adding the supervisor read back.
BenH: Slightly simplified the ifdef and applied to ppc64 too
Signed-off-by Li Yang <[email protected]>Signed-off-by Benjamin Herrenschmidt <[email protected]>---
For 2.6.34 stable commit55052eeca6d71d76f7c3f156c0501814d8e5e6d3
Quoted 5 lines
Quoted 3 lines
arch/powerpc/mm/pgtable_32.c | 8 ++++++++ arch/powerpc/mm/pgtable_64.c | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)Wondering what happened to this patch (and 2 other) getting into stable queue for .34.x
They are still in the "to-apply" queue. Please be patient, I was busy with the .35-rc1 merge window and now am catching up on the stable trees. There's over 130 patches that people seem to want in the first .34 stable release, so it's taking some time to get them all in and tested.
thanks,
greg k-h