Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1256194

[PATCH v3 2/8] ppc use ftrace_modify_all_code default

Show all headers | View raw

Convert ppc's arch_ftrace_update_code from its own function copy
to use the generic default functionality (without stop_machine --
our instructions are properly aligned and the replacements atomic ;)

With this we gain error checking and the much-needed function_trace_op
handling.

Signed-off-by: Torsten Duwe <duwe@suse.de>
---
 arch/powerpc/kernel/ftrace.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 310137f..e419c7b 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -511,20 +511,12 @@ void ftrace_replace_code(int enable)
 	}
 }
 
+/* Use the default ftrace_modify_all_code, but without
+ * stop_machine().
+ */
 void arch_ftrace_update_code(int command)
 {
-	if (command & FTRACE_UPDATE_CALLS)
-		ftrace_replace_code(1);
-	else if (command & FTRACE_DISABLE_CALLS)
-		ftrace_replace_code(0);
-
-	if (command & FTRACE_UPDATE_TRACE_FUNC)
-		ftrace_update_ftrace_func(ftrace_trace_function);
-
-	if (command & FTRACE_START_FUNC_RET)
-		ftrace_enable_ftrace_graph_caller();
-	else if (command & FTRACE_STOP_FUNC_RET)
-		ftrace_disable_ftrace_graph_caller();
+	ftrace_modify_all_code(command);
 }
 
 int __init ftrace_dyn_arch_init(void)
-- 
1.8.5.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/8] ftrace with regs + live patching for ppc64 LE (ABI  v2) Torsten Duwe <duwe@lst.de> - 2015-10-26 18:50 +0100
  [PATCH v3 5/8] ppc64 ftrace: disable profiling for some functions Torsten Duwe <duwe@lst.de> - 2015-10-26 19:00 +0100
  Re: [PATCH v3 0/8] ftrace with regs + live patching for ppc64 LE  (ABI v2) Torsten Duwe <duwe@lst.de> - 2015-10-26 19:00 +0100
  [PATCH v3 4/8] ppc64 ftrace_with_regs: spare early boot and low  level Torsten Duwe <duwe@lst.de> - 2015-10-26 19:00 +0100
  [PATCH v3 2/8] ppc use ftrace_modify_all_code default Torsten Duwe <duwe@lst.de> - 2015-10-26 19:00 +0100
  [PATCH v3 6/8] ppc64 ftrace: disable profiling for some files Torsten Duwe <duwe@lst.de> - 2015-10-26 19:10 +0100
  [PATCH v3 3/8] ppc64 ftrace_with_regs configuration variables Torsten Duwe <duwe@lst.de> - 2015-10-26 19:10 +0100
  [PATCH v3 8/8] Enable LIVEPATCH to be configured on ppc64le and  add livepatch.o if it is selected. Torsten Duwe <duwe@lst.de> - 2015-10-26 19:10 +0100
  [PATCH v3 1/8] ppc64le FTRACE_WITH_REGS implementation Torsten Duwe <duwe@lst.de> - 2015-10-26 19:10 +0100
  [PATCH v3 7/8] Implement kernel live patching for ppc64le (ABIv2) Torsten Duwe <duwe@lst.de> - 2015-10-26 19:10 +0100

csiph-web