Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d05cdb25d80f06f77aa6bddb53cd1390d4d91a0b

Authored by Steven Rostedt
Committed by Thomas Gleixner
1 parent 06fa75ab56
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ftrace: fix dynamic ftrace selftest 

With the adding of the configuration changes in the Makefile to prevent
tracing of functions in the ftrace code, all tracing of all the ftrace
code has been removed. Unfortunately, one of the selftests, relied on
a function to be traced. With the new change, the function was no longer
traced and the test failed.

This patch separates out the test function into its own file so that
we can add the "-pg" flag to the compilation of that function and the
adding of the mcount call to that function.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 4 changed files with 13 additions and 6 deletions Side-by-side Diff

kernel/trace/Makefile
Diff comments   View file @ d05cdb2
... ... @@ -4,6 +4,10 @@
4 4 ifdef CONFIG_FTRACE
5 5 ORIG_CFLAGS := $(KBUILD_CFLAGS)
6 6 KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS))
  7 +
  8 +# selftest needs instrumentation
  9 +CFLAGS_trace_selftest_dynamic.o = -pg
  10 +obj-y += trace_selftest_dynamic.o
7 11 endif
8 12  
9 13 obj-$(CONFIG_FTRACE) += libftrace.o
kernel/trace/trace.h
Diff comments   View file @ d05cdb2
... ... @@ -244,6 +244,8 @@
244 244  
245 245 #ifdef CONFIG_DYNAMIC_FTRACE
246 246 extern unsigned long ftrace_update_tot_cnt;
  247 +#define DYN_FTRACE_TEST_NAME trace_selftest_dynamic_test_func
  248 +extern int DYN_FTRACE_TEST_NAME(void);
247 249 #endif
248 250  
249 251 #ifdef CONFIG_FTRACE_STARTUP_TEST
kernel/trace/trace_selftest.c
Diff comments   View file @ d05cdb2
... ... @@ -107,14 +107,8 @@
107 107  
108 108 #ifdef CONFIG_DYNAMIC_FTRACE
109 109  
110   -#define DYN_FTRACE_TEST_NAME trace_selftest_dynamic_test_func
111 110 #define __STR(x) #x
112 111 #define STR(x) __STR(x)
113   -static int DYN_FTRACE_TEST_NAME(void)
114   -{
115   - /* used to call mcount */
116   - return 0;
117   -}
118 112  
119 113 /* Test dynamic code modification and ftrace filters */
120 114 int trace_selftest_startup_dynamic_tracing(struct tracer *trace,
kernel/trace/trace_selftest_dynamic.c
Diff comments   View file @ d05cdb2
  1 +#include "trace.h"
  2 +
  3 +int DYN_FTRACE_TEST_NAME(void)
  4 +{
  5 + /* used to call mcount */
  6 + return 0;
  7 +}