Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
f5074429
Commit
f5074429
authored
Jul 21, 2010
by
Mike Frysinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Blackfin: add support for dynamic ftrace
Signed-off-by:
Mike Frysinger
<
vapier@gentoo.org
>
parent
67df6cc6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
181 additions
and
9 deletions
+181
-9
arch/blackfin/Kconfig
arch/blackfin/Kconfig
+2
-0
arch/blackfin/include/asm/ftrace.h
arch/blackfin/include/asm/ftrace.h
+16
-0
arch/blackfin/kernel/Makefile
arch/blackfin/kernel/Makefile
+1
-0
arch/blackfin/kernel/ftrace-entry.S
arch/blackfin/kernel/ftrace-entry.S
+77
-8
arch/blackfin/kernel/ftrace.c
arch/blackfin/kernel/ftrace.c
+85
-1
No files found.
arch/blackfin/Kconfig
View file @
f5074429
...
@@ -25,6 +25,8 @@ config BLACKFIN
...
@@ -25,6 +25,8 @@ config BLACKFIN
def_bool y
def_bool y
select HAVE_ARCH_KGDB
select HAVE_ARCH_KGDB
select HAVE_ARCH_TRACEHOOK
select HAVE_ARCH_TRACEHOOK
select HAVE_DYNAMIC_FTRACE
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
...
...
arch/blackfin/include/asm/ftrace.h
View file @
f5074429
...
@@ -12,6 +12,22 @@
...
@@ -12,6 +12,22 @@
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
#ifdef CONFIG_DYNAMIC_FTRACE
extern
void
_mcount
(
void
);
#define MCOUNT_ADDR ((unsigned long)_mcount)
static
inline
unsigned
long
ftrace_call_adjust
(
unsigned
long
addr
)
{
return
addr
;
}
struct
dyn_arch_ftrace
{
/* No extra data needed for Blackfin */
};
#endif
#ifdef CONFIG_FRAME_POINTER
#ifdef CONFIG_FRAME_POINTER
#include <linux/mm.h>
#include <linux/mm.h>
...
...
arch/blackfin/kernel/Makefile
View file @
f5074429
...
@@ -16,6 +16,7 @@ else
...
@@ -16,6 +16,7 @@ else
obj-y
+=
time.o
obj-y
+=
time.o
endif
endif
obj-$(CONFIG_DYNAMIC_FTRACE)
+=
ftrace.o
obj-$(CONFIG_FUNCTION_TRACER)
+=
ftrace-entry.o
obj-$(CONFIG_FUNCTION_TRACER)
+=
ftrace-entry.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER)
+=
ftrace.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER)
+=
ftrace.o
CFLAGS_REMOVE_ftrace.o
=
-pg
CFLAGS_REMOVE_ftrace.o
=
-pg
...
...
arch/blackfin/kernel/ftrace-entry.S
View file @
f5074429
...
@@ -10,6 +10,18 @@
...
@@ -10,6 +10,18 @@
.
text
.
text
#ifdef CONFIG_DYNAMIC_FTRACE
/*
Simple
stub
so
we
can
boot
the
kernel
until
runtime
patching
has
*
disabled
all
calls
to
this
.
Then
it
'll be unused.
*/
ENTRY
(
__mcount
)
# if ANOMALY_05000371
nop
; nop; nop; nop;
# endif
rts
;
ENDPROC
(
__mcount
)
/*
GCC
will
have
called
us
before
setting
up
the
function
prologue
,
so
we
/*
GCC
will
have
called
us
before
setting
up
the
function
prologue
,
so
we
*
can
clobber
the
normal
scratch
registers
,
but
we
need
to
make
sure
to
*
can
clobber
the
normal
scratch
registers
,
but
we
need
to
make
sure
to
*
save
/
restore
the
registers
used
for
argument
passing
(
R0
-
R2
)
in
case
*
save
/
restore
the
registers
used
for
argument
passing
(
R0
-
R2
)
in
case
...
@@ -20,15 +32,65 @@
...
@@ -20,15 +32,65 @@
*
function
.
And
since
GCC
pushed
the
previous
RETS
for
us
,
the
previous
*
function
.
And
since
GCC
pushed
the
previous
RETS
for
us
,
the
previous
*
function
will
be
waiting
there
.
mmmm
pie
.
*
function
will
be
waiting
there
.
mmmm
pie
.
*/
*/
ENTRY
(
_ftrace_caller
)
# ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
/
*
optional
micro
optimization
:
return
if
stopped
*/
p1.l
=
_function_trace_stop
;
p1.h
=
_function_trace_stop
;
r3
=
[
p1
]
;
cc
=
r3
==
0
;
if
!
cc
jump
_ftrace_stub
(
bp
)
;
# endif
/
*
save
first
/
second
/
third
function
arg
and
the
return
register
*/
[--
sp
]
=
r2
;
[--
sp
]
=
r0
;
[--
sp
]
=
r1
;
[--
sp
]
=
rets
;
/
*
function_trace_call
(
unsigned
long
ip
,
unsigned
long
parent_ip
)
:
*
ip
:
this
point
was
called
by
...
*
parent_ip
:
...
this
function
*
the
ip
itself
will
need
adjusting
for
the
mcount
call
*/
r0
=
rets
;
r1
=
[
sp
+
16
]
; /* skip the 4 local regs on stack */
r0
+=
-
MCOUNT_INSN_SIZE
;
.
globl
_ftrace_call
_ftrace_call
:
call
_ftrace_stub
# ifdef CONFIG_FUNCTION_GRAPH_TRACER
.
globl
_ftrace_graph_call
_ftrace_graph_call
:
nop
; /* jump _ftrace_graph_caller; */
# endif
/
*
restore
state
and
get
out
of
dodge
*/
.
Lfinish_trace
:
rets
=
[
sp
++]
;
r1
=
[
sp
++]
;
r0
=
[
sp
++]
;
r2
=
[
sp
++]
;
.
globl
_ftrace_stub
_ftrace_stub
:
rts
;
ENDPROC
(
_ftrace_caller
)
#else
/*
See
documentation
for
_ftrace_caller
*/
ENTRY
(
__mcount
)
ENTRY
(
__mcount
)
#ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
#
ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST
/
*
optional
micro
optimization
:
return
if
stopped
*/
/
*
optional
micro
optimization
:
return
if
stopped
*/
p1.l
=
_function_trace_stop
;
p1.l
=
_function_trace_stop
;
p1.h
=
_function_trace_stop
;
p1.h
=
_function_trace_stop
;
r3
=
[
p1
]
;
r3
=
[
p1
]
;
cc
=
r3
==
0
;
cc
=
r3
==
0
;
if
!
cc
jump
_ftrace_stub
(
bp
)
;
if
!
cc
jump
_ftrace_stub
(
bp
)
;
#endif
#
endif
/
*
save
third
function
arg
early
so
we
can
do
testing
below
*/
/
*
save
third
function
arg
early
so
we
can
do
testing
below
*/
[--
sp
]
=
r2
;
[--
sp
]
=
r2
;
...
@@ -44,7 +106,7 @@ ENTRY(__mcount)
...
@@ -44,7 +106,7 @@ ENTRY(__mcount)
cc
=
r2
==
r3
;
cc
=
r2
==
r3
;
if
!
cc
jump
.
Ldo_trace
;
if
!
cc
jump
.
Ldo_trace
;
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
#
ifdef CONFIG_FUNCTION_GRAPH_TRACER
/
*
if
the
ftrace_graph_return
function
pointer
is
not
set
to
/
*
if
the
ftrace_graph_return
function
pointer
is
not
set
to
*
the
ftrace_stub
entry
,
call
prepare_ftrace_return
()
.
*
the
ftrace_stub
entry
,
call
prepare_ftrace_return
()
.
*/
*/
...
@@ -64,7 +126,7 @@ ENTRY(__mcount)
...
@@ -64,7 +126,7 @@ ENTRY(__mcount)
r3
=
[
p0
]
;
r3
=
[
p0
]
;
cc
=
r2
==
r3
;
cc
=
r2
==
r3
;
if
!
cc
jump
_ftrace_graph_caller
;
if
!
cc
jump
_ftrace_graph_caller
;
#endif
#
endif
r2
=
[
sp
++]
;
r2
=
[
sp
++]
;
rts
;
rts
;
...
@@ -103,6 +165,8 @@ _ftrace_stub:
...
@@ -103,6 +165,8 @@ _ftrace_stub:
rts
;
rts
;
ENDPROC
(
__mcount
)
ENDPROC
(
__mcount
)
#endif
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
/*
The
prepare_ftrace_return
()
function
is
similar
to
the
trace
function
/*
The
prepare_ftrace_return
()
function
is
similar
to
the
trace
function
*
except
it
takes
a
pointer
to
the
location
of
the
frompc
.
This
is
so
*
except
it
takes
a
pointer
to
the
location
of
the
frompc
.
This
is
so
...
@@ -110,6 +174,7 @@ ENDPROC(__mcount)
...
@@ -110,6 +174,7 @@ ENDPROC(__mcount)
*
purposes
.
*
purposes
.
*/
*/
ENTRY
(
_ftrace_graph_caller
)
ENTRY
(
_ftrace_graph_caller
)
# ifndef CONFIG_DYNAMIC_FTRACE
/
*
save
first
/
second
function
arg
and
the
return
register
*/
/
*
save
first
/
second
function
arg
and
the
return
register
*/
[--
sp
]
=
r0
;
[--
sp
]
=
r0
;
[--
sp
]
=
r1
;
[--
sp
]
=
r1
;
...
@@ -118,9 +183,13 @@ ENTRY(_ftrace_graph_caller)
...
@@ -118,9 +183,13 @@ ENTRY(_ftrace_graph_caller)
/
*
prepare_ftrace_return
(
parent
,
self_addr
,
frame_pointer
)
*/
/
*
prepare_ftrace_return
(
parent
,
self_addr
,
frame_pointer
)
*/
r0
=
sp
; /* unsigned long *parent */
r0
=
sp
; /* unsigned long *parent */
r1
=
rets
; /* unsigned long self_addr */
r1
=
rets
; /* unsigned long self_addr */
#ifdef CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST
# else
r0
=
sp
; /* unsigned long *parent */
r1
=
[
sp
]
; /* unsigned long self_addr */
# endif
# ifdef CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST
r2
=
fp
; /* unsigned long frame_pointer */
r2
=
fp
; /* unsigned long frame_pointer */
#endif
#
endif
r0
+=
16
; /* skip the 4 local regs on stack */
r0
+=
16
; /* skip the 4 local regs on stack */
r1
+=
-
MCOUNT_INSN_SIZE
;
r1
+=
-
MCOUNT_INSN_SIZE
;
call
_prepare_ftrace_return
;
call
_prepare_ftrace_return
;
...
@@ -139,9 +208,9 @@ ENTRY(_return_to_handler)
...
@@ -139,9 +208,9 @@ ENTRY(_return_to_handler)
[--
sp
]
=
r1
;
[--
sp
]
=
r1
;
/
*
get
original
return
address
*/
/
*
get
original
return
address
*/
#ifdef CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST
#
ifdef CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST
r0
=
fp
; /* Blackfin is sane, so omit this */
r0
=
fp
; /* Blackfin is sane, so omit this */
#endif
#
endif
call
_ftrace_return_to_handler
;
call
_ftrace_return_to_handler
;
rets
=
r0
;
rets
=
r0
;
...
...
arch/blackfin/kernel/ftrace.c
View file @
f5074429
/*
/*
* ftrace graph code
* ftrace graph code
*
*
* Copyright (C) 2009 Analog Devices Inc.
* Copyright (C) 2009
-2010
Analog Devices Inc.
* Licensed under the GPL-2 or later.
* Licensed under the GPL-2 or later.
*/
*/
#include <linux/ftrace.h>
#include <linux/ftrace.h>
#include <linux/kernel.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/sched.h>
#include <linux/uaccess.h>
#include <asm/atomic.h>
#include <asm/atomic.h>
#include <asm/cacheflush.h>
#ifdef CONFIG_DYNAMIC_FTRACE
static
const
unsigned
char
mnop
[]
=
{
0x03
,
0xc0
,
0x00
,
0x18
,
/* MNOP; */
0x03
,
0xc0
,
0x00
,
0x18
,
/* MNOP; */
};
static
void
bfin_make_pcrel24
(
unsigned
char
*
insn
,
unsigned
long
src
,
unsigned
long
dst
)
{
uint32_t
pcrel
=
(
dst
-
src
)
>>
1
;
insn
[
0
]
=
pcrel
>>
16
;
insn
[
1
]
=
0xe3
;
insn
[
2
]
=
pcrel
;
insn
[
3
]
=
pcrel
>>
8
;
}
#define bfin_make_pcrel24(insn, src, dst) bfin_make_pcrel24(insn, src, (unsigned long)(dst))
static
int
ftrace_modify_code
(
unsigned
long
ip
,
const
unsigned
char
*
code
,
unsigned
long
len
)
{
int
ret
=
probe_kernel_write
((
void
*
)
ip
,
(
void
*
)
code
,
len
);
flush_icache_range
(
ip
,
ip
+
len
);
return
ret
;
}
int
ftrace_make_nop
(
struct
module
*
mod
,
struct
dyn_ftrace
*
rec
,
unsigned
long
addr
)
{
/* Turn the mcount call site into two MNOPs as those are 32bit insns */
return
ftrace_modify_code
(
rec
->
ip
,
mnop
,
sizeof
(
mnop
));
}
int
ftrace_make_call
(
struct
dyn_ftrace
*
rec
,
unsigned
long
addr
)
{
/* Restore the mcount call site */
unsigned
char
call
[
8
];
call
[
0
]
=
0x67
;
/* [--SP] = RETS; */
call
[
1
]
=
0x01
;
bfin_make_pcrel24
(
&
call
[
2
],
rec
->
ip
+
2
,
addr
);
call
[
6
]
=
0x27
;
/* RETS = [SP++]; */
call
[
7
]
=
0x01
;
return
ftrace_modify_code
(
rec
->
ip
,
call
,
sizeof
(
call
));
}
int
ftrace_update_ftrace_func
(
ftrace_func_t
func
)
{
unsigned
char
call
[
4
];
unsigned
long
ip
=
(
unsigned
long
)
&
ftrace_call
;
bfin_make_pcrel24
(
call
,
ip
,
func
);
return
ftrace_modify_code
(
ip
,
call
,
sizeof
(
call
));
}
int
__init
ftrace_dyn_arch_init
(
void
*
data
)
{
/* return value is done indirectly via data */
*
(
unsigned
long
*
)
data
=
0
;
return
0
;
}
#endif
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
# ifdef CONFIG_DYNAMIC_FTRACE
extern
void
ftrace_graph_call
(
void
);
int
ftrace_enable_ftrace_graph_caller
(
void
)
{
unsigned
long
ip
=
(
unsigned
long
)
&
ftrace_graph_call
;
uint16_t
jump_pcrel12
=
((
unsigned
long
)
&
ftrace_graph_caller
-
ip
)
>>
1
;
jump_pcrel12
|=
0x2000
;
return
ftrace_modify_code
(
ip
,
(
void
*
)
&
jump_pcrel12
,
sizeof
(
jump_pcrel12
));
}
int
ftrace_disable_ftrace_graph_caller
(
void
)
{
return
ftrace_modify_code
((
unsigned
long
)
&
ftrace_graph_call
,
empty_zero_page
,
2
);
}
# endif
/*
/*
* Hook the return address and push it in the stack of return addrs
* Hook the return address and push it in the stack of return addrs
* in current thread info.
* in current thread info.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment