Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab3ed204 authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Greg Kroah-Hartman
Browse files

powerpc/ftrace: Remove ftrace init tramp once kernel init is complete 



commit 84ade0a6655bee803d176525ef457175cbf4df22 upstream.

Stop using the ftrace trampoline for init section once kernel init is
complete.

Fixes: 67361cf8 ("powerpc/ftrace: Handle large kernel configs")
Cc: stable@vger.kernel.org # v4.20+
Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220516071422.463738-1-naveen.n.rao@linux.vnet.ibm.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 77e2ad09

arch/powerpc/include/asm/ftrace.h

+4 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static inline bool arch_syscall_match_sym_name(const char *sym, const char *name 
#endif /* PPC64_ELF_ABI_v1 */

#endif /* CONFIG_FTRACE_SYSCALLS */



#ifdef CONFIG_PPC64

#if defined(CONFIG_PPC64) && defined(CONFIG_FUNCTION_TRACER)

#include <asm/paca.h>



static inline void this_cpu_disable_ftrace(void)
@@ -108,9 +108,12 @@ static inline void this_cpu_enable_ftrace(void) 
{

	get_paca()->ftrace_enabled = 1;

}



void ftrace_free_init_tramp(void);

#else /* CONFIG_PPC64 */

static inline void this_cpu_disable_ftrace(void) { }

static inline void this_cpu_enable_ftrace(void) { }

static inline void ftrace_free_init_tramp(void) { }

#endif /* CONFIG_PPC64 */

#endif /* !__ASSEMBLY__ */

arch/powerpc/kernel/trace/ftrace.c

+12 −3
Original line number Diff line number Diff line
@@ -328,9 +328,7 @@ static int setup_mcount_compiler_tramp(unsigned long tramp) 


	/* Is this a known long jump tramp? */

	for (i = 0; i < NUM_FTRACE_TRAMPS; i++)

		if (!ftrace_tramps[i])

			break;

		else if (ftrace_tramps[i] == tramp)

		if (ftrace_tramps[i] == tramp)

			return 0;



	/* Is this a known plt tramp? */
@@ -868,6 +866,17 @@ void arch_ftrace_update_code(int command) 


extern unsigned int ftrace_tramp_text[], ftrace_tramp_init[];



void ftrace_free_init_tramp(void)

{

	int i;



	for (i = 0; i < NUM_FTRACE_TRAMPS && ftrace_tramps[i]; i++)

		if (ftrace_tramps[i] == (unsigned long)ftrace_tramp_init) {

			ftrace_tramps[i] = 0;

			return;

		}

}



int __init ftrace_dyn_arch_init(void)

{

	int i;

arch/powerpc/mm/mem.c

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <asm/fixmap.h>

#include <asm/swiotlb.h>

#include <asm/rtas.h>

#include <asm/ftrace.h>



#include <mm/mmu_decl.h>
@@ -346,6 +347,7 @@ void free_initmem(void) 
	mark_initmem_nx();

	init_mem_is_free = true;

	free_initmem_default(POISON_FREE_INITMEM);

	ftrace_free_init_tramp();

}



/**