Commit 71a5b3db authored by Jordan Niethe's avatar Jordan Niethe Committed by Michael Ellerman

powerpc/lib/code-patching: Set up Strict RWX patching earlier

setup_text_poke_area() is a late init call so it runs before
mark_rodata_ro() and after the init calls. This lets all the init code
patching simply write to their locations. In the future, kprobes is
going to allocate its instruction pages RO which means they will need
setup_text__poke_area() to have been already called for their code
patching. However, init_kprobes() (which allocates and patches some
instruction pages) is an early init call so it happens before
setup_text__poke_area().

start_kernel() calls poking_init() before any of the init calls. On
powerpc, poking_init() is currently a nop. setup_text_poke_area() relies
on kernel virtual memory, cpu hotplug and per_cpu_areas being setup.
setup_per_cpu_areas(), boot_cpu_hotplug_init() and mm_init() are called
before poking_init().

Turn setup_text_poke_area() into poking_init().
Signed-off-by: default avatarJordan Niethe <jniethe5@gmail.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarRussell Currey <ruscur@russell.cc>
[mpe: Fold in missing prototype for poking_init() from lkp]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210609013431.9805-3-jniethe5@gmail.com
parent 1f9ad21c
...@@ -76,6 +76,7 @@ extern unsigned long empty_zero_page[]; ...@@ -76,6 +76,7 @@ extern unsigned long empty_zero_page[];
extern pgd_t swapper_pg_dir[]; extern pgd_t swapper_pg_dir[];
extern void paging_init(void); extern void paging_init(void);
void poking_init(void);
extern unsigned long ioremap_bot; extern unsigned long ioremap_bot;
......
...@@ -69,22 +69,16 @@ static int text_area_cpu_down(unsigned int cpu) ...@@ -69,22 +69,16 @@ static int text_area_cpu_down(unsigned int cpu)
} }
/* /*
* Run as a late init call. This allows all the boot time patching to be done * Although BUG_ON() is rude, in this case it should only happen if ENOMEM, and
* simply by patching the code, and then we're called here prior to * we judge it as being preferable to a kernel that will crash later when
* mark_rodata_ro(), which happens after all init calls are run. Although * someone tries to use patch_instruction().
* BUG_ON() is rude, in this case it should only happen if ENOMEM, and we judge
* it as being preferable to a kernel that will crash later when someone tries
* to use patch_instruction().
*/ */
static int __init setup_text_poke_area(void) void __init poking_init(void)
{ {
BUG_ON(!cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, BUG_ON(!cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
"powerpc/text_poke:online", text_area_cpu_up, "powerpc/text_poke:online", text_area_cpu_up,
text_area_cpu_down)); text_area_cpu_down));
return 0;
} }
late_initcall(setup_text_poke_area);
/* /*
* This can be called for kernel text or a module. * This can be called for kernel text or a module.
......
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