x86/module: prepare module loading for ROX allocations of text

jira LE-4694
Rebuild_History Non-Buildable kernel-6.12.0-55.43.1.el10_0
commit-author Mike Rapoport (Microsoft) <[email protected]>
commit 9bfc482

When module text memory will be allocated with ROX permissions, the memory
at the actual address where the module will live will contain invalid
instructions and there will be a writable copy that contains the actual
module code.

Update relocations and alternatives patching to deal with it.

[[email protected]: fix writable address in cfi_rewrite_endbr()]
  Link: https://lkml.kernel.org/r/[email protected]
Link: https://lkml.kernel.org/r/[email protected]
	Signed-off-by: Mike Rapoport (Microsoft) <[email protected]>
	Tested-by: kdevops <[email protected]>
	Tested-by: Nathan Chancellor <[email protected]>
	Cc: Andreas Larsson <[email protected]>
	Cc: Andy Lutomirski <[email protected]>
	Cc: Ard Biesheuvel <[email protected]>
	Cc: Arnd Bergmann <[email protected]>
	Cc: Borislav Petkov (AMD) <[email protected]>
	Cc: Brian Cain <[email protected]>
	Cc: Catalin Marinas <[email protected]>
	Cc: Christophe Leroy <[email protected]>
	Cc: Christoph Hellwig <[email protected]>
	Cc: Dave Hansen <[email protected]>
	Cc: Dinh Nguyen <[email protected]>
	Cc: Geert Uytterhoeven <[email protected]>
	Cc: Guo Ren <[email protected]>
	Cc: Helge Deller <[email protected]>
	Cc: Huacai Chen <[email protected]>
	Cc: Ingo Molnar <[email protected]>
	Cc: Johannes Berg <[email protected]>
	Cc: John Paul Adrian Glaubitz <[email protected]>
	Cc: Kent Overstreet <[email protected]>
	Cc: Liam R. Howlett <[email protected]>
	Cc: Luis Chamberlain <[email protected]>
	Cc: Mark Rutland <[email protected]>
	Cc: Masami Hiramatsu (Google) <[email protected]>
	Cc: Matt Turner <[email protected]>
	Cc: Max Filippov <[email protected]>
	Cc: Michael Ellerman <[email protected]>
	Cc: Michal Simek <[email protected]>
	Cc: Oleg Nesterov <[email protected]>
	Cc: Palmer Dabbelt <[email protected]>
	Cc: Peter Zijlstra <[email protected]>
	Cc: Richard Weinberger <[email protected]>
	Cc: Russell King <[email protected]>
	Cc: Song Liu <[email protected]>
	Cc: Stafford Horne <[email protected]>
	Cc: Steven Rostedt (Google) <[email protected]>
	Cc: Suren Baghdasaryan <[email protected]>
	Cc: Thomas Bogendoerfer <[email protected]>
	Cc: Thomas Gleixner <[email protected]>
	Cc: Uladzislau Rezki (Sony) <[email protected]>
	Cc: Vineet Gupta <[email protected]>
	Cc: Will Deacon <[email protected]>
	Signed-off-by: Andrew Morton <[email protected]>
(cherry picked from commit 9bfc482)
	Signed-off-by: Jonathan Maple <[email protected]>

Author: PlaidCat

arch/um/kernel/um_arch.c

@@ -435,24 +435,25 @@ void __init arch_cpu_finalize_init(void)
 	os_check_bugs();
 }
 
-void apply_seal_endbr(s32 *start, s32 *end)
+void apply_seal_endbr(s32 *start, s32 *end, struct module *mod)
 {
 }
 
-void apply_retpolines(s32 *start, s32 *end)
+void apply_retpolines(s32 *start, s32 *end, struct module *mod)
 {
 }
 
-void apply_returns(s32 *start, s32 *end)
+void apply_returns(s32 *start, s32 *end, struct module *mod)
 {
 }
 
 void apply_fineibt(s32 *start_retpoline, s32 *end_retpoline,
-		   s32 *start_cfi, s32 *end_cfi)
+		   s32 *start_cfi, s32 *end_cfi, struct module *mod)
 {
 }
 
-void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
+void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
+			struct module *mod)
 {
 }
 

arch/x86/entry/vdso/vma.c

@@ -54,7 +54,8 @@ int __init init_vdso_image(const struct vdso_image *image)
 
 	apply_alternatives((struct alt_instr *)(image->data + image->alt),
 			   (struct alt_instr *)(image->data + image->alt +
-						image->alt_len));
+						image->alt_len),
+			   NULL);
 
 	return 0;
 }

arch/x86/include/asm/alternative.h

@@ -96,16 +96,16 @@ extern struct alt_instr __alt_instructions[], __alt_instructions_end[];
  * instructions were patched in already:
  */
 extern int alternatives_patched;
+struct module;
 
 extern void alternative_instructions(void);
-extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end);
-extern void apply_retpolines(s32 *start, s32 *end);
-extern void apply_returns(s32 *start, s32 *end);
-extern void apply_seal_endbr(s32 *start, s32 *end);
+extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end,
+			       struct module *mod);
+extern void apply_retpolines(s32 *start, s32 *end, struct module *mod);
+extern void apply_returns(s32 *start, s32 *end, struct module *mod);
+extern void apply_seal_endbr(s32 *start, s32 *end, struct module *mod);
 extern void apply_fineibt(s32 *start_retpoline, s32 *end_retpoine,
-			  s32 *start_cfi, s32 *end_cfi);
-
-struct module;
+			  s32 *start_cfi, s32 *end_cfi, struct module *mod);
 
 struct callthunk_sites {
 	s32				*call_start, *call_end;