From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 30 Jun 2022 11:30:55 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.9.321~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dd9d43cf87b94fd116908580e25f01e773018c2;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	powerpc-ftrace-remove-ftrace-init-tramp-once-kernel-init-is-complete.patch
---

diff --git a/queue-5.4/powerpc-ftrace-remove-ftrace-init-tramp-once-kernel-init-is-complete.patch b/queue-5.4/powerpc-ftrace-remove-ftrace-init-tramp-once-kernel-init-is-complete.patch
new file mode 100644
index 00000000000..b67c796ca15
--- /dev/null
+++ b/queue-5.4/powerpc-ftrace-remove-ftrace-init-tramp-once-kernel-init-is-complete.patch
@@ -0,0 +1,97 @@
+From 84ade0a6655bee803d176525ef457175cbf4df22 Mon Sep 17 00:00:00 2001
+From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
+Date: Mon, 16 May 2022 12:44:22 +0530
+Subject: powerpc/ftrace: Remove ftrace init tramp once kernel init is complete
+
+From: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
+
+commit 84ade0a6655bee803d176525ef457175cbf4df22 upstream.
+
+Stop using the ftrace trampoline for init section once kernel init is
+complete.
+
+Fixes: 67361cf8071286 ("powerpc/ftrace: Handle large kernel configs")
+Cc: stable@vger.kernel.org # v4.20+
+Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20220516071422.463738-1-naveen.n.rao@linux.vnet.ibm.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/powerpc/include/asm/ftrace.h  |    5 ++++-
+ arch/powerpc/kernel/trace/ftrace.c |   15 ++++++++++++---
+ arch/powerpc/mm/mem.c              |    2 ++
+ 3 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/arch/powerpc/include/asm/ftrace.h
++++ b/arch/powerpc/include/asm/ftrace.h
+@@ -96,7 +96,7 @@ static inline bool arch_syscall_match_sy
+ #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_ftrac
+ {
+ 	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__ */
+ 
+--- a/arch/powerpc/kernel/trace/ftrace.c
++++ b/arch/powerpc/kernel/trace/ftrace.c
+@@ -328,9 +328,7 @@ static int setup_mcount_compiler_tramp(u
+ 
+ 	/* 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;
+--- a/arch/powerpc/mm/mem.c
++++ b/arch/powerpc/mm/mem.c
+@@ -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();
+ }
+ 
+ /**
diff --git a/queue-5.4/series b/queue-5.4/series
index 87d6fdfcca0..6ec9839e883 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1,2 +1,3 @@
 drm-remove-drm_fb_helper_modinit.patch
 clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch
+powerpc-ftrace-remove-ftrace-init-tramp-once-kernel-init-is-complete.patch