Skip to content

L
linux
Commit b86206e4 authored by Anton Blanchard's avatar Anton Blanchard
Browse files
Options

powerpc: Fix branch patching code for ABIv2 

The MMU hashtable and SLB branch patching code uses function
pointers for the update sites. This creates a difference between
ABIv1 and ABIv2 because we don't have function descriptors on
ABIv2.

Get rid of the function pointer and just point at the update
sites directly. This works on both ABIs.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
parent 26f92060
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 33 deletions
arch/powerpc/mm/hash_low_64.S
View file @ b86206e4
...@@ -201,7 +201,8 @@ htab_insert_pte: ...@@ -201,7 +201,8 @@ htab_insert_pte:
li r8,MMU_PAGE_4K /* page size */ li r8,MMU_PAGE_4K /* page size */
li r9,MMU_PAGE_4K /* actual page size */ li r9,MMU_PAGE_4K /* actual page size */
ld r10,STK_PARAM(R9)(r1) /* segment size */ ld r10,STK_PARAM(R9)(r1) /* segment size */
_GLOBAL(htab_call_hpte_insert1) .globl htab_call_hpte_insert1
htab_call_hpte_insert1:
bl . /* Patched by htab_finish_init() */ bl . /* Patched by htab_finish_init() */
cmpdi 0,r3,0 cmpdi 0,r3,0
bge htab_pte_insert_ok /* Insertion successful */ bge htab_pte_insert_ok /* Insertion successful */
...@@ -225,7 +226,8 @@ _GLOBAL(htab_call_hpte_insert1) ...@@ -225,7 +226,8 @@ _GLOBAL(htab_call_hpte_insert1)
li r8,MMU_PAGE_4K /* page size */ li r8,MMU_PAGE_4K /* page size */
li r9,MMU_PAGE_4K /* actual page size */ li r9,MMU_PAGE_4K /* actual page size */
ld r10,STK_PARAM(R9)(r1) /* segment size */ ld r10,STK_PARAM(R9)(r1) /* segment size */
_GLOBAL(htab_call_hpte_insert2) .globl htab_call_hpte_insert2
htab_call_hpte_insert2:
bl . /* Patched by htab_finish_init() */ bl . /* Patched by htab_finish_init() */
cmpdi 0,r3,0 cmpdi 0,r3,0
bge+ htab_pte_insert_ok /* Insertion successful */ bge+ htab_pte_insert_ok /* Insertion successful */
...@@ -242,7 +244,8 @@ _GLOBAL(htab_call_hpte_insert2) ...@@ -242,7 +244,8 @@ _GLOBAL(htab_call_hpte_insert2)
2: and r0,r5,r27 2: and r0,r5,r27
rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */ rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */
/* Call ppc_md.hpte_remove */ /* Call ppc_md.hpte_remove */
_GLOBAL(htab_call_hpte_remove) .globl htab_call_hpte_remove
htab_call_hpte_remove:
bl . /* Patched by htab_finish_init() */ bl . /* Patched by htab_finish_init() */
/* Try all again */ /* Try all again */
...@@ -296,7 +299,8 @@ htab_modify_pte: ...@@ -296,7 +299,8 @@ htab_modify_pte:
li r7,MMU_PAGE_4K /* actual page size */ li r7,MMU_PAGE_4K /* actual page size */
ld r8,STK_PARAM(R9)(r1) /* segment size */ ld r8,STK_PARAM(R9)(r1) /* segment size */
ld r9,STK_PARAM(R8)(r1) /* get "local" param */ ld r9,STK_PARAM(R8)(r1) /* get "local" param */
_GLOBAL(htab_call_hpte_updatepp) .globl htab_call_hpte_updatepp
htab_call_hpte_updatepp:
bl . /* Patched by htab_finish_init() */ bl . /* Patched by htab_finish_init() */
/* if we failed because typically the HPTE wasn't really here /* if we failed because typically the HPTE wasn't really here
...@@ -526,7 +530,8 @@ htab_special_pfn: ...@@ -526,7 +530,8 @@ htab_special_pfn:
li r8,MMU_PAGE_4K /* page size */ li r8,MMU_PAGE_4K /* page size */
li r9,MMU_PAGE_4K /* actual page size */ li r9,MMU_PAGE_4K /* actual page size */
ld r10,STK_PARAM(R9)(r1) /* segment size */ ld r10,STK_PARAM(R9)(r1) /* segment size */
_GLOBAL(htab_call_hpte_insert1) .globl htab_call_hpte_insert1
htab_call_hpte_insert1:
bl . /* patched by htab_finish_init() */ bl . /* patched by htab_finish_init() */
cmpdi 0,r3,0 cmpdi 0,r3,0
bge htab_pte_insert_ok /* Insertion successful */ bge htab_pte_insert_ok /* Insertion successful */
...@@ -554,7 +559,8 @@ _GLOBAL(htab_call_hpte_insert1) ...@@ -554,7 +559,8 @@ _GLOBAL(htab_call_hpte_insert1)
li r8,MMU_PAGE_4K /* page size */ li r8,MMU_PAGE_4K /* page size */
li r9,MMU_PAGE_4K /* actual page size */ li r9,MMU_PAGE_4K /* actual page size */
ld r10,STK_PARAM(R9)(r1) /* segment size */ ld r10,STK_PARAM(R9)(r1) /* segment size */
_GLOBAL(htab_call_hpte_insert2) .globl htab_call_hpte_insert2
htab_call_hpte_insert2:
bl . /* patched by htab_finish_init() */ bl . /* patched by htab_finish_init() */
cmpdi 0,r3,0 cmpdi 0,r3,0
bge+ htab_pte_insert_ok /* Insertion successful */ bge+ htab_pte_insert_ok /* Insertion successful */
...@@ -571,7 +577,8 @@ _GLOBAL(htab_call_hpte_insert2) ...@@ -571,7 +577,8 @@ _GLOBAL(htab_call_hpte_insert2)
2: and r0,r5,r27 2: and r0,r5,r27
rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */ rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */
/* Call ppc_md.hpte_remove */ /* Call ppc_md.hpte_remove */
_GLOBAL(htab_call_hpte_remove) .globl htab_call_hpte_remove
htab_call_hpte_remove:
bl . /* patched by htab_finish_init() */ bl . /* patched by htab_finish_init() */
/* Try all again */ /* Try all again */
...@@ -660,7 +667,8 @@ htab_modify_pte: ...@@ -660,7 +667,8 @@ htab_modify_pte:
li r7,MMU_PAGE_4K /* actual page size */ li r7,MMU_PAGE_4K /* actual page size */
ld r8,STK_PARAM(R9)(r1) /* segment size */ ld r8,STK_PARAM(R9)(r1) /* segment size */
ld r9,STK_PARAM(R8)(r1) /* get "local" param */ ld r9,STK_PARAM(R8)(r1) /* get "local" param */
_GLOBAL(htab_call_hpte_updatepp) .globl htab_call_hpte_updatepp
htab_call_hpte_updatepp:
bl . /* patched by htab_finish_init() */ bl . /* patched by htab_finish_init() */
/* if we failed because typically the HPTE wasn't really here /* if we failed because typically the HPTE wasn't really here
...@@ -857,7 +865,8 @@ ht64_insert_pte: ...@@ -857,7 +865,8 @@ ht64_insert_pte:
li r8,MMU_PAGE_64K li r8,MMU_PAGE_64K
li r9,MMU_PAGE_64K /* actual page size */ li r9,MMU_PAGE_64K /* actual page size */
ld r10,STK_PARAM(R9)(r1) /* segment size */ ld r10,STK_PARAM(R9)(r1) /* segment size */
_GLOBAL(ht64_call_hpte_insert1) .globl ht64_call_hpte_insert1
ht64_call_hpte_insert1:
bl . /* patched by htab_finish_init() */ bl . /* patched by htab_finish_init() */
cmpdi 0,r3,0 cmpdi 0,r3,0
bge ht64_pte_insert_ok /* Insertion successful */ bge ht64_pte_insert_ok /* Insertion successful */
...@@ -881,7 +890,8 @@ _GLOBAL(ht64_call_hpte_insert1) ...@@ -881,7 +890,8 @@ _GLOBAL(ht64_call_hpte_insert1)
li r8,MMU_PAGE_64K li r8,MMU_PAGE_64K
li r9,MMU_PAGE_64K /* actual page size */ li r9,MMU_PAGE_64K /* actual page size */
ld r10,STK_PARAM(R9)(r1) /* segment size */ ld r10,STK_PARAM(R9)(r1) /* segment size */
_GLOBAL(ht64_call_hpte_insert2) .globl ht64_call_hpte_insert2
ht64_call_hpte_insert2:
bl . /* patched by htab_finish_init() */ bl . /* patched by htab_finish_init() */
cmpdi 0,r3,0 cmpdi 0,r3,0
bge+ ht64_pte_insert_ok /* Insertion successful */ bge+ ht64_pte_insert_ok /* Insertion successful */
...@@ -898,7 +908,8 @@ _GLOBAL(ht64_call_hpte_insert2) ...@@ -898,7 +908,8 @@ _GLOBAL(ht64_call_hpte_insert2)
2: and r0,r5,r27 2: and r0,r5,r27
rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */ rldicr r3,r0,3,63-3 /* r0 = (hash & mask) << 3 */
/* Call ppc_md.hpte_remove */ /* Call ppc_md.hpte_remove */
_GLOBAL(ht64_call_hpte_remove) .globl ht64_call_hpte_remove
ht64_call_hpte_remove:
bl . /* patched by htab_finish_init() */ bl . /* patched by htab_finish_init() */
/* Try all again */ /* Try all again */
...@@ -952,7 +963,8 @@ ht64_modify_pte: ...@@ -952,7 +963,8 @@ ht64_modify_pte:
li r7,MMU_PAGE_64K /* actual page size */ li r7,MMU_PAGE_64K /* actual page size */
ld r8,STK_PARAM(R9)(r1) /* segment size */ ld r8,STK_PARAM(R9)(r1) /* segment size */
ld r9,STK_PARAM(R8)(r1) /* get "local" param */ ld r9,STK_PARAM(R8)(r1) /* get "local" param */
_GLOBAL(ht64_call_hpte_updatepp) .globl ht64_call_hpte_updatepp
ht64_call_hpte_updatepp:
bl . /* patched by htab_finish_init() */ bl . /* patched by htab_finish_init() */
/* if we failed because typically the HPTE wasn't really here /* if we failed because typically the HPTE wasn't really here
......
arch/powerpc/mm/hash_utils_64.c
View file @ b86206e4
...@@ -603,19 +603,18 @@ int remove_section_mapping(unsigned long start, unsigned long end) ...@@ -603,19 +603,18 @@ int remove_section_mapping(unsigned long start, unsigned long end)
} }
#endif /* CONFIG_MEMORY_HOTPLUG */ #endif /* CONFIG_MEMORY_HOTPLUG */
extern u32 htab_call_hpte_insert1[];
extern u32 htab_call_hpte_insert2[];
extern u32 htab_call_hpte_remove[];
extern u32 htab_call_hpte_updatepp[];
extern u32 ht64_call_hpte_insert1[];
extern u32 ht64_call_hpte_insert2[];
extern u32 ht64_call_hpte_remove[];
extern u32 ht64_call_hpte_updatepp[];
static void __init htab_finish_init(void) static void __init htab_finish_init(void)
{ {
extern unsigned int *htab_call_hpte_insert1;
extern unsigned int *htab_call_hpte_insert2;
extern unsigned int *htab_call_hpte_remove;
extern unsigned int *htab_call_hpte_updatepp;
#ifdef CONFIG_PPC_HAS_HASH_64K #ifdef CONFIG_PPC_HAS_HASH_64K
extern unsigned int *ht64_call_hpte_insert1;
extern unsigned int *ht64_call_hpte_insert2;
extern unsigned int *ht64_call_hpte_remove;
extern unsigned int *ht64_call_hpte_updatepp;
patch_branch(ht64_call_hpte_insert1, patch_branch(ht64_call_hpte_insert1,
ppc_function_entry(ppc_md.hpte_insert), ppc_function_entry(ppc_md.hpte_insert),
BRANCH_SET_LINK); BRANCH_SET_LINK);
...@@ -628,7 +627,6 @@ static void __init htab_finish_init(void) ...@@ -628,7 +627,6 @@ static void __init htab_finish_init(void)
patch_branch(ht64_call_hpte_updatepp, patch_branch(ht64_call_hpte_updatepp,
ppc_function_entry(ppc_md.hpte_updatepp), ppc_function_entry(ppc_md.hpte_updatepp),
BRANCH_SET_LINK); BRANCH_SET_LINK);
#endif /* CONFIG_PPC_HAS_HASH_64K */ #endif /* CONFIG_PPC_HAS_HASH_64K */
patch_branch(htab_call_hpte_insert1, patch_branch(htab_call_hpte_insert1,
......
arch/powerpc/mm/slb.c
View file @ b86206e4
...@@ -256,10 +256,14 @@ static inline void patch_slb_encoding(unsigned int *insn_addr, ...@@ -256,10 +256,14 @@ static inline void patch_slb_encoding(unsigned int *insn_addr,
patch_instruction(insn_addr, insn); patch_instruction(insn_addr, insn);
} }
extern u32 slb_compare_rr_to_size[];
extern u32 slb_miss_kernel_load_linear[];
extern u32 slb_miss_kernel_load_io[];
extern u32 slb_compare_rr_to_size[];
extern u32 slb_miss_kernel_load_vmemmap[];
void slb_set_size(u16 size) void slb_set_size(u16 size)
{ {
extern unsigned int *slb_compare_rr_to_size;
if (mmu_slb_size == size) if (mmu_slb_size == size)
return; return;
...@@ -272,11 +276,7 @@ void slb_initialize(void) ...@@ -272,11 +276,7 @@ void slb_initialize(void)
unsigned long linear_llp, vmalloc_llp, io_llp; unsigned long linear_llp, vmalloc_llp, io_llp;
unsigned long lflags, vflags; unsigned long lflags, vflags;
static int slb_encoding_inited; static int slb_encoding_inited;
extern unsigned int *slb_miss_kernel_load_linear;
extern unsigned int *slb_miss_kernel_load_io;
extern unsigned int *slb_compare_rr_to_size;
#ifdef CONFIG_SPARSEMEM_VMEMMAP #ifdef CONFIG_SPARSEMEM_VMEMMAP
extern unsigned int *slb_miss_kernel_load_vmemmap;
unsigned long vmemmap_llp; unsigned long vmemmap_llp;
#endif #endif
......
arch/powerpc/mm/slb_low.S
View file @ b86206e4
...@@ -59,7 +59,8 @@ _GLOBAL(slb_allocate_realmode) ...@@ -59,7 +59,8 @@ _GLOBAL(slb_allocate_realmode)
/* Linear mapping encoding bits, the "li" instruction below will /* Linear mapping encoding bits, the "li" instruction below will
* be patched by the kernel at boot * be patched by the kernel at boot
*/ */
_GLOBAL(slb_miss_kernel_load_linear) .globl slb_miss_kernel_load_linear
slb_miss_kernel_load_linear:
li r11,0 li r11,0
/* /*
* context = (MAX_USER_CONTEXT) + ((ea >> 60) - 0xc) + 1 * context = (MAX_USER_CONTEXT) + ((ea >> 60) - 0xc) + 1
...@@ -79,7 +80,8 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT) ...@@ -79,7 +80,8 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)
/* Check virtual memmap region. To be patches at kernel boot */ /* Check virtual memmap region. To be patches at kernel boot */
cmpldi cr0,r9,0xf cmpldi cr0,r9,0xf
bne 1f bne 1f
_GLOBAL(slb_miss_kernel_load_vmemmap) .globl slb_miss_kernel_load_vmemmap
slb_miss_kernel_load_vmemmap:
li r11,0 li r11,0
b 6f b 6f
1: 1:
...@@ -95,7 +97,8 @@ _GLOBAL(slb_miss_kernel_load_vmemmap) ...@@ -95,7 +97,8 @@ _GLOBAL(slb_miss_kernel_load_vmemmap)
b 6f b 6f
5: 5:
/* IO mapping */ /* IO mapping */
_GLOBAL(slb_miss_kernel_load_io) .globl slb_miss_kernel_load_io
slb_miss_kernel_load_io:
li r11,0 li r11,0
6: 6:
/* /*
...@@ -250,7 +253,8 @@ slb_finish_load: ...@@ -250,7 +253,8 @@ slb_finish_load:
7: ld r10,PACASTABRR(r13) 7: ld r10,PACASTABRR(r13)
addi r10,r10,1 addi r10,r10,1
/* This gets soft patched on boot. */ /* This gets soft patched on boot. */
_GLOBAL(slb_compare_rr_to_size) .globl slb_compare_rr_to_size
slb_compare_rr_to_size:
cmpldi r10,0 cmpldi r10,0
blt+ 4f blt+ 4f
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7