core: dump ftrace data with ldelf

Uses ldelf to dump ftrace data from a TA.

Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey960)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Author: jenswi-linaro

core/arch/arm/include/kernel/ftrace.h

@@ -25,6 +25,7 @@ SLIST_HEAD(load_seg_head, load_seg);
  * @entry_func:		Entry address in TA
  * @dump_entry_func:	Entry address in TA for dumping address mappings
  *			and stack trace
+ * @ftrace_entry_func:	Entry address in ldelf for dumping ftrace data
  * @ldelf_stack_ptr:	Stack pointer used for dumping address mappings and
  *			stack trace
  * @is_32bit:		True if 32-bit TA, false if 64-bit TA
@@ -44,6 +45,9 @@ SLIST_HEAD(load_seg_head, load_seg);
 struct user_ta_ctx {
 	uaddr_t entry_func;
 	uaddr_t dump_entry_func;
+#ifdef CFG_TA_FTRACE_SUPPORT
+	uaddr_t ftrace_entry_func;
+#endif
 	uaddr_t ldelf_stack_ptr;
 	bool is_32bit;
 	bool is_initializing;

core/arch/arm/include/kernel/user_ta.h

@@ -5,7 +5,6 @@
 
 #include <arm.h>
 #include <kernel/abort.h>
-#include <kernel/ftrace.h>
 #include <kernel/linker.h>
 #include <kernel/misc.h>
 #include <kernel/panic.h>
@@ -298,7 +297,8 @@ void abort_print_current_ta(void)
 
 	s->ctx->ops->dump_state(s->ctx);
 
-	ta_fbuf_dump(s);
+	if (s->ctx->ops->dump_ftrace)
+		s->ctx->ops->dump_ftrace(s->ctx);
 }
 
 static void save_abort_info_in_tsd(struct abort_info *ai)

core/arch/arm/kernel/abort.c

@@ -56,8 +56,6 @@ endif
 
 srcs-$(CFG_VIRTUALIZATION) += virtualization.c
 
-srcs-$(CFG_TA_FTRACE_SUPPORT) += ftrace.c
-
 srcs-y += link_dummies.c
 
 asm-defines-y += asm-defines.c

core/arch/arm/kernel/ftrace.c

@@ -30,7 +30,6 @@
  */
 
 #include <arm.h>
-#include <kernel/ftrace.h>
 #include <kernel/thread.h>
 #include <kernel/unwind.h>
 #include <kernel/tee_misc.h>
@@ -67,9 +66,6 @@ bool unwind_stack_arm64(struct unwind_state_arm64 *frame, bool kernel_stack,
 	if (!copy_in_reg(&frame->pc, fp + 8, kernel_stack))
 		return false;
 
-	if (!kernel_stack)
-		ftrace_ta_map_lr(&frame->pc);
-
 	frame->pc -= 4;
 
 	return true;
@@ -82,8 +78,6 @@ void print_stack_arm64(int level, struct unwind_state_arm64 *state,
 {
 	trace_printf_helper_raw(level, true, "Call stack:");
 
-	if (!kernel_stack)
-		ftrace_ta_map_lr(&state->pc);
 	do {
 		trace_printf_helper_raw(level, true, " 0x%016" PRIx64,
 					state->pc);