Skip to contentSkip to conversation

kernel//trace/fgraph.c:111:35: error: 'MCOUNT_INSN_SIZE' undeclared; did you mean 'UCOUNT_COUNTS'?

PATCH New kbuild test robot 2 participants 4 messages Jan 1, 2020 – Jan 3, 2020

Subsystems (2)
lore
Share & tools
lore

kbuild test robot

author build bot
#0 lore raw
tree:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head:   738d2902773e30939a982c8df7a7f94293659810
commit: ff205766dbbee024a4a716638868d98ffb17748a ftrace: Fix function_graph tracer interaction with BPF trampoline
date:   3 weeks ago
config: riscv-randconfig-a001-20200102 (attached as .config)
compiler: riscv64-linux-gcc (GCC) 7.5.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
git checkout ff205766dbbee024a4a716638868d98ffb17748a
# save the attached .config to linux build tree
GCC_VERSION=7.5.0 make.cross ARCH=riscv

If you fix the issue, kindly add following tag

All errors (new ones prefixed by >>):

kernel//trace/fgraph.c: In function 'function_graph_enter':

>> kernel//trace/fgraph.c:111:35: error: 'MCOUNT_INSN_SIZE' undeclared (first use in this function); did you mean 'UCOUNT_COUNTS'?

ftrace_find_rec_direct(ret - MCOUNT_INSN_SIZE))
^~~~~~~~~~~~~~~~
UCOUNT_COUNTS
kernel//trace/fgraph.c:111:35: note: each undeclared identifier is reported only once for each function it appears in

vim +111 kernel//trace/fgraph.c

98
99 int function_graph_enter(unsigned long ret, unsigned long func,
100 unsigned long frame_pointer, unsigned long *retp)
101 {
102 struct ftrace_graph_ent trace;
103
104 /*
105 * Skip graph tracing if the return location is served by direct trampoline,
106 * since call sequence and return addresses is unpredicatable anymore.
107 * Ex: BPF trampoline may call original function and may skip frame
108 * depending on type of BPF programs attached.
109 */
110 if (ftrace_direct_func_count &&

 > 111		    ftrace_find_rec_direct(ret - MCOUNT_INSN_SIZE))

112 return -EBUSY;
113 trace.func = func;
114 trace.depth = ++current->curr_ret_depth;
115
116 if (ftrace_push_return_trace(ret, func, frame_pointer, retp))
117 goto out;
118
119 /* Only trace if the calling function expects to */
120 if (!ftrace_graph_entry(&trace))
121 goto out_ret;
122
123 return 0;
124 out_ret:
125 current->curr_ret_stack--;
126 out:
127 current->curr_ret_depth--;
128 return -EBUSY;
129 }
130

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation

maintainer
#1 lore raw
Quoted 16 lines · On Thu, 2 Jan 2020 02:09:22 +0800 kbuild test robot <[email protected]> wrote:
tree:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head:   738d2902773e30939a982c8df7a7f94293659810
commit: ff205766dbbee024a4a716638868d98ffb17748a ftrace: Fix function_graph tracer interaction with BPF trampoline
date:   3 weeks ago
config: riscv-randconfig-a001-20200102 (attached as .config)
compiler: riscv64-linux-gcc (GCC) 7.5.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
git checkout ff205766dbbee024a4a716638868d98ffb17748a
# save the attached .config to linux build tree
GCC_VERSION=7.5.0 make.cross ARCH=riscv

If you fix the issue, kindly add following tag

Quoted 10 lines

All errors (new ones prefixed by >>):

kernel//trace/fgraph.c: In function 'function_graph_enter':

Quoted 1 line
Quoted 1 line

kernel//trace/fgraph.c:111:35: error: 'MCOUNT_INSN_SIZE' undeclared (first use in this function); did you mean 'UCOUNT_COUNTS'?

ftrace_find_rec_direct(ret - MCOUNT_INSN_SIZE))
^~~~~~~~~~~~~~~~
UCOUNT_COUNTS
kernel//trace/fgraph.c:111:35: note: each undeclared identifier is reported only once for each function it appears in

The next two patches should fix this. The second patch fixes a different location with the same problem. It appears that without DYNAMIC_FTRACE (which x86 always has now) that this isn't defined.

-- Steve

maintainer
#2 lore raw

PATCH 1/1 tracing: Define MCOUNT_INSN_SIZE when not defined without direct calls

From: "Steven Rostedt (VMware)" <[email protected]>

In order to handle direct calls along side of function graph tracer, a check is made to see if the address being traced by the function graph tracer is a direct call or not. To get the address used by direct callers, the return address is subtracted by MCOUNT_INSN_SIZE.

For some archs with certain configurations, MCOUNT_INSN_SIZE is undefined here. But these should not be using direct calls anyway. Just define MCOUNT_INSN_SIZE to zero in this case.

Fixes ff205766dbbee ("ftrace: Fix function_graph tracer interaction with BPF trampoline")
---
 kernel/trace/fgraph.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
kernel/trace/fgraph.c +14 -0
index a2659735db73..1af321dec0f1 100644
@@ -96,6 +96,20 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func,
 	return 0;
 }
 
+/*
+ * Not all archs define MCOUNT_INSN_SIZE which is used to look for direct
+ * functions. But those archs currently don't support direct functions
+ * anyway, and ftrace_find_rec_direct() is just a stub for them.
+ * Define MCOUNT_INSN_SIZE to keep those archs compiling.
+ */
+#ifndef MCOUNT_INSN_SIZE
+/* Make sure this only works without direct calls */
+# ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
+#  error MCOUNT_INSN_SIZE not defined with direct calls enabled
+# endif
+# define MCOUNT_INSN_SIZE 0
+#endif
+
 int function_graph_enter(unsigned long ret, unsigned long func,
 			 unsigned long frame_pointer, unsigned long *retp)
 {
Signature · 1 line
2.20.1
maintainer
#3 lore raw

PATCH 1/1 tracing: Have stack tracer compile when MCOUNT_INSN_SIZE is not defined

In reply to Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

On some archs with some configurations, MCOUNT_INSN_SIZE is not defined, and this makes the stack tracer fail to compile. Just define it to zero in this case.

Cc stable(a)vger.kernel.org
Fixes 4df297129f622 ("tracing: Remove most or all of stack tracer stack size from stack_max_size")
---
 kernel/trace/trace_stack.c | 5 +++++
 1 file changed, 5 insertions(+)
kernel/trace/trace_stack.c +5 -0
index 4df9a209f7ca..c557f42a9397 100644
@@ -283,6 +283,11 @@ static void check_stack(unsigned long ip, unsigned long *stack)
 	local_irq_restore(flags);
 }
 
+/* Some archs may not define MCOUNT_INSN_SIZE */
+#ifndef MCOUNT_INSN_SIZE
+# define MCOUNT_INSN_SIZE 0
+#endif
+
 static void
 stack_trace_call(unsigned long ip, unsigned long parent_ip,
 		 struct ftrace_ops *op, struct pt_regs *pt_regs)
Signature · 1 line
2.20.1