Commit 607289a7 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Kees Cook
Browse files

treewide: Drop function_nocfi 



With -fsanitize=kcfi, we no longer need function_nocfi() as
the compiler won't change function references to point to a
jump table. Remove all implementations and uses of the macro.

Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220908215504.3686827-14-samitolvanen@google.com
parent 5dbbb3ea

arch/arm64/include/asm/ftrace.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS

#define ARCH_SUPPORTS_FTRACE_OPS 1

#else

#define MCOUNT_ADDR		((unsigned long)function_nocfi(_mcount))

#define MCOUNT_ADDR		((unsigned long)_mcount)

#endif



/* The BL at the callsite's adjusted rec->ip */

arch/arm64/include/asm/mmu_context.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static inline void cpu_replace_ttbr1(pgd_t *pgdp, pgd_t *idmap) 
		ttbr1 |= TTBR_CNP_BIT;

	}



	replace_phys = (void *)__pa_symbol(function_nocfi(idmap_cpu_replace_ttbr1));

	replace_phys = (void *)__pa_symbol(idmap_cpu_replace_ttbr1);



	__cpu_install_idmap(idmap);

	replace_phys(ttbr1);

arch/arm64/kernel/acpi_parking_protocol.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int acpi_parking_protocol_cpu_boot(unsigned int cpu) 
	 * that read this address need to convert this address to the

	 * Boot-Loader's endianness before jumping.

	 */

	writeq_relaxed(__pa_symbol(function_nocfi(secondary_entry)),

	writeq_relaxed(__pa_symbol(secondary_entry),

		       &mailbox->entry_point);

	writel_relaxed(cpu_entry->gic_cpu_id, &mailbox->cpu_id);

arch/arm64/kernel/cpufeature.c

+1 −1
Original line number Diff line number Diff line
@@ -1713,7 +1713,7 @@ kpti_install_ng_mappings(const struct arm64_cpu_capabilities *__unused) 
	if (arm64_use_ng_mappings)

		return;



	remap_fn = (void *)__pa_symbol(function_nocfi(idmap_kpti_install_ng_mappings));

	remap_fn = (void *)__pa_symbol(idmap_kpti_install_ng_mappings);



	if (!cpu) {

		alloc = __get_free_pages(GFP_ATOMIC | __GFP_ZERO, order);

arch/arm64/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func) 
	unsigned long pc;

	u32 new;



	pc = (unsigned long)function_nocfi(ftrace_call);

	pc = (unsigned long)ftrace_call;

	new = aarch64_insn_gen_branch_imm(pc, (unsigned long)func,

					  AARCH64_INSN_BRANCH_LINK);