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) <rppt@kernel.org>
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.

[rppt@kernel.org: fix writable address in cfi_rewrite_endbr()]
  Link: https://lkml.kernel.org/r/ZysRwR29Ji8CcbXc@kernel.org
Link: https://lkml.kernel.org/r/20241023162711.2579610-7-rppt@kernel.org
	Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
	Tested-by: kdevops <kdevops@lists.linux.dev>
	Tested-by: Nathan Chancellor <nathan@kernel.org>
	Cc: Andreas Larsson <andreas@gaisler.com>
	Cc: Andy Lutomirski <luto@kernel.org>
	Cc: Ard Biesheuvel <ardb@kernel.org>
	Cc: Arnd Bergmann <arnd@arndb.de>
	Cc: Borislav Petkov (AMD) <bp@alien8.de>
	Cc: Brian Cain <bcain@quicinc.com>
	Cc: Catalin Marinas <catalin.marinas@arm.com>
	Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
	Cc: Christoph Hellwig <hch@lst.de>
	Cc: Dave Hansen <dave.hansen@linux.intel.com>
	Cc: Dinh Nguyen <dinguyen@kernel.org>
	Cc: Geert Uytterhoeven <geert@linux-m68k.org>
	Cc: Guo Ren <guoren@kernel.org>
	Cc: Helge Deller <deller@gmx.de>
	Cc: Huacai Chen <chenhuacai@kernel.org>
	Cc: Ingo Molnar <mingo@redhat.com>
	Cc: Johannes Berg <johannes@sipsolutions.net>
	Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
	Cc: Kent Overstreet <kent.overstreet@linux.dev>
	Cc: Liam R. Howlett <Liam.Howlett@Oracle.com>
	Cc: Luis Chamberlain <mcgrof@kernel.org>
	Cc: Mark Rutland <mark.rutland@arm.com>
	Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>
	Cc: Matt Turner <mattst88@gmail.com>
	Cc: Max Filippov <jcmvbkbc@gmail.com>
	Cc: Michael Ellerman <mpe@ellerman.id.au>
	Cc: Michal Simek <monstr@monstr.eu>
	Cc: Oleg Nesterov <oleg@redhat.com>
	Cc: Palmer Dabbelt <palmer@dabbelt.com>
	Cc: Peter Zijlstra <peterz@infradead.org>
	Cc: Richard Weinberger <richard@nod.at>
	Cc: Russell King <linux@armlinux.org.uk>
	Cc: Song Liu <song@kernel.org>
	Cc: Stafford Horne <shorne@gmail.com>
	Cc: Steven Rostedt (Google) <rostedt@goodmis.org>
	Cc: Suren Baghdasaryan <surenb@google.com>
	Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
	Cc: Thomas Gleixner <tglx@linutronix.de>
	Cc: Uladzislau Rezki (Sony) <urezki@gmail.com>
	Cc: Vineet Gupta <vgupta@kernel.org>
	Cc: Will Deacon <will@kernel.org>
	Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 9bfc482)
	Signed-off-by: Jonathan Maple <jmaple@ciq.com>

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;