Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Steven Rostedt
On Wed, 19 Nov 2014 19:29:25 +0100 (CET)
Thomas Gleixner  wrote:

> On Wed, 19 Nov 2014, Steven Rostedt wrote:
> > From: "Steven Rostedt (Red Hat)" 
> > Date: Tue, 18 Nov 2014 21:14:11 -0500
> > Subject: [PATCH] ftrace/x86/extable: Add is_ftrace_trampoline() function
> > 
> > Stack traces that happen from function tracing check if the address
> > on the stack is a __kernel_text_address(). That is, is the address
> > kernel code. This calls core_kernel_text() which returns true
> > if the address is part of the builtin kernel code. It also calls
> > is_module_text_address() which returns true if the address belongs
> > to module code.
> > 
> > But what is missing is ftrace dynamically allocated trampolines.
> > These trampolines are allocated for individual ftrace_ops that
> > call the ftrace_ops callback functions directly. But if they do a
> > stack trace, the code checking the stack wont detect them as they
> > are neither core kernel code nor module address space.
> > 
> > Adding another field to ftrace_ops that also stores the size of
> > the trampoline assigned to it we can create a new function called
> > is_ftrace_trampoline() that returns true if the address is a
> > dynamically allocate ftrace trampoline. Note, it ignores trampolines
> > that are not dynamically allocated as they will return true with
> > the core_kernel_text() function.
> > 
> > Link: http://lkml.kernel.org/r/20141119034829.497125...@goodmis.org
> > 
> > Cc: Thomas Gleixner 
> > Cc: Ingo Molnar 
> > Cc: "H. Peter Anvin" 
> > Signed-off-by: Steven Rostedt 
> 
> Acked-by: Thomas Gleixner 

Thanks!

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


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Thomas Gleixner
On Wed, 19 Nov 2014, Steven Rostedt wrote:
> From: "Steven Rostedt (Red Hat)" 
> Date: Tue, 18 Nov 2014 21:14:11 -0500
> Subject: [PATCH] ftrace/x86/extable: Add is_ftrace_trampoline() function
> 
> Stack traces that happen from function tracing check if the address
> on the stack is a __kernel_text_address(). That is, is the address
> kernel code. This calls core_kernel_text() which returns true
> if the address is part of the builtin kernel code. It also calls
> is_module_text_address() which returns true if the address belongs
> to module code.
> 
> But what is missing is ftrace dynamically allocated trampolines.
> These trampolines are allocated for individual ftrace_ops that
> call the ftrace_ops callback functions directly. But if they do a
> stack trace, the code checking the stack wont detect them as they
> are neither core kernel code nor module address space.
> 
> Adding another field to ftrace_ops that also stores the size of
> the trampoline assigned to it we can create a new function called
> is_ftrace_trampoline() that returns true if the address is a
> dynamically allocate ftrace trampoline. Note, it ignores trampolines
> that are not dynamically allocated as they will return true with
> the core_kernel_text() function.
> 
> Link: http://lkml.kernel.org/r/20141119034829.497125...@goodmis.org
> 
> Cc: Thomas Gleixner 
> Cc: Ingo Molnar 
> Cc: "H. Peter Anvin" 
> Signed-off-by: Steven Rostedt 

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


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Steven Rostedt
On Wed, 19 Nov 2014 17:16:55 +0900
Namhyung Kim  wrote:

> 
> [SNIP]
> > @@ -102,6 +103,8 @@ int __kernel_text_address(unsigned long addr)
> > return 1;
> > if (is_module_text_address(addr))
> > return 1;
> > +   if (is_ftrace_trampoline(addr))
> > +   return 1;
> 
> What about kernel_text_address()?  It seems some archs like ARM use it
> instead of __kernel_text_address() although trampoline is only enabled
> on x86 for now.

Here's the new patch:

>From 418f77ed7636c01e40627ee6609f4bd859c62c75 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" 
Date: Tue, 18 Nov 2014 21:14:11 -0500
Subject: [PATCH] ftrace/x86/extable: Add is_ftrace_trampoline() function

Stack traces that happen from function tracing check if the address
on the stack is a __kernel_text_address(). That is, is the address
kernel code. This calls core_kernel_text() which returns true
if the address is part of the builtin kernel code. It also calls
is_module_text_address() which returns true if the address belongs
to module code.

But what is missing is ftrace dynamically allocated trampolines.
These trampolines are allocated for individual ftrace_ops that
call the ftrace_ops callback functions directly. But if they do a
stack trace, the code checking the stack wont detect them as they
are neither core kernel code nor module address space.

Adding another field to ftrace_ops that also stores the size of
the trampoline assigned to it we can create a new function called
is_ftrace_trampoline() that returns true if the address is a
dynamically allocate ftrace trampoline. Note, it ignores trampolines
that are not dynamically allocated as they will return true with
the core_kernel_text() function.

Link: http://lkml.kernel.org/r/20141119034829.497125...@goodmis.org

Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: "H. Peter Anvin" 
Signed-off-by: Steven Rostedt 
---
 arch/x86/kernel/ftrace.c |  9 +++--
 include/linux/ftrace.h   |  8 
 kernel/extable.c |  7 ++-
 kernel/trace/ftrace.c| 38 ++
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 1aea94d336c7..60881d919432 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -712,7 +712,8 @@ union ftrace_op_code_union {
} __attribute__((packed));
 };
 
-static unsigned long create_trampoline(struct ftrace_ops *ops)
+static unsigned long
+create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
 {
unsigned const char *jmp;
unsigned long start_offset;
@@ -749,6 +750,8 @@ static unsigned long create_trampoline(struct ftrace_ops 
*ops)
if (!trampoline)
return 0;
 
+   *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
+
/* Copy ftrace_caller onto the trampoline memory */
ret = probe_kernel_read(trampoline, (void *)start_offset, size);
if (WARN_ON(ret < 0)) {
@@ -819,6 +822,7 @@ void arch_ftrace_update_trampoline(struct ftrace_ops *ops)
unsigned char *new;
unsigned long offset;
unsigned long ip;
+   unsigned int size;
int ret;
 
if (ops->trampoline) {
@@ -829,9 +833,10 @@ void arch_ftrace_update_trampoline(struct ftrace_ops *ops)
if (!(ops->flags & FTRACE_OPS_FL_ALLOC_TRAMP))
return;
} else {
-   ops->trampoline = create_trampoline(ops);
+   ops->trampoline = create_trampoline(ops, );
if (!ops->trampoline)
return;
+   ops->trampoline_size = size;
}
 
offset = calc_trampoline_call_offset(ops->flags & 
FTRACE_OPS_FL_SAVE_REGS);
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 619e37cc17fd..7b2616fa2472 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -150,6 +150,7 @@ struct ftrace_ops {
struct ftrace_ops_hash  *func_hash;
struct ftrace_ops_hash  old_hash;
unsigned long   trampoline;
+   unsigned long   trampoline_size;
 #endif
 };
 
@@ -297,6 +298,8 @@ extern int ftrace_text_reserved(const void *start, const 
void *end);
 
 extern int ftrace_nr_registered_ops(void);
 
+bool is_ftrace_trampoline(unsigned long addr);
+
 /*
  * The dyn_ftrace record's flags field is split into two parts.
  * the first part which is '0-FTRACE_REF_MAX' is a counter of
@@ -596,6 +599,11 @@ static inline ssize_t ftrace_notrace_write(struct file 
*file, const char __user
 size_t cnt, loff_t *ppos) { return -ENODEV; }
 static inline int
 ftrace_regex_release(struct inode *inode, struct file *file) { return -ENODEV; 
}
+
+static inline bool is_ftrace_trampoline(unsigned long addr)
+{
+   return false;
+}
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
 /* totally disable ftrace - can not re-enable after this */
diff --git a/kernel/extable.c 

Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Steven Rostedt

> 
> [SNIP]
> > @@ -102,6 +103,8 @@ int __kernel_text_address(unsigned long addr)
> > return 1;
> > if (is_module_text_address(addr))
> > return 1;
> > +   if (is_ftrace_trampoline(addr))
> > +   return 1;
> 
> What about kernel_text_address()?  It seems some archs like ARM use it
> instead of __kernel_text_address() although trampoline is only enabled
> on x86 for now.
> 

Good question. I just did this to get x86 working. But as we add
trampolines to other archs, we probably should add it to that too.

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


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Namhyung Kim
Hi Steve,

On Tue, 18 Nov 2014 22:33:33 -0500, Steven Rostedt wrote:
> From: "Steven Rostedt (Red Hat)" 
>
> Stack traces that happen from function tracing check if the address
> on the stack is a __kernel_text_address(). That is, is the address
> kernel code. This calls core_kernel_text() which returns true
> if the address is part of the builtin kernel code. It also calls
> is_module_text_address() which returns true if the address belongs
> to module code.
>
> But what is missing is ftrace dynamically allocated trampolines.
> These trampolines are allocated for individual ftrace_ops that
> call the ftrace_ops callback functions directly. But if they do a
> stack trace, the code checking the stack wont detect them as they
> are neither core kernel code nor module address space.
>
> Adding another field to ftrace_ops that also stores the size of
> the trampoline assigned to it we can create a new function called
> is_ftrace_trampoline() that returns true if the address is a
> dynamically allocate ftrace trampoline. Note, it ignores trampolines
> that are not dynamically allocated as they will return true with
> the core_kernel_text() function.
>
> Cc: Thomas Gleixner 
> Cc: Ingo Molnar 
> Cc: "H. Peter Anvin" 
> Signed-off-by: Steven Rostedt 


[SNIP]
> @@ -102,6 +103,8 @@ int __kernel_text_address(unsigned long addr)
>   return 1;
>   if (is_module_text_address(addr))
>   return 1;
> + if (is_ftrace_trampoline(addr))
> + return 1;

What about kernel_text_address()?  It seems some archs like ARM use it
instead of __kernel_text_address() although trampoline is only enabled
on x86 for now.

Thanks,
Namhyung

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


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Namhyung Kim
Hi Steve,

On Tue, 18 Nov 2014 22:33:33 -0500, Steven Rostedt wrote:
 From: Steven Rostedt (Red Hat) rost...@goodmis.org

 Stack traces that happen from function tracing check if the address
 on the stack is a __kernel_text_address(). That is, is the address
 kernel code. This calls core_kernel_text() which returns true
 if the address is part of the builtin kernel code. It also calls
 is_module_text_address() which returns true if the address belongs
 to module code.

 But what is missing is ftrace dynamically allocated trampolines.
 These trampolines are allocated for individual ftrace_ops that
 call the ftrace_ops callback functions directly. But if they do a
 stack trace, the code checking the stack wont detect them as they
 are neither core kernel code nor module address space.

 Adding another field to ftrace_ops that also stores the size of
 the trampoline assigned to it we can create a new function called
 is_ftrace_trampoline() that returns true if the address is a
 dynamically allocate ftrace trampoline. Note, it ignores trampolines
 that are not dynamically allocated as they will return true with
 the core_kernel_text() function.

 Cc: Thomas Gleixner t...@linutronix.de
 Cc: Ingo Molnar mi...@redhat.com
 Cc: H. Peter Anvin h...@zytor.com
 Signed-off-by: Steven Rostedt rost...@goodmis.org


[SNIP]
 @@ -102,6 +103,8 @@ int __kernel_text_address(unsigned long addr)
   return 1;
   if (is_module_text_address(addr))
   return 1;
 + if (is_ftrace_trampoline(addr))
 + return 1;

What about kernel_text_address()?  It seems some archs like ARM use it
instead of __kernel_text_address() although trampoline is only enabled
on x86 for now.

Thanks,
Namhyung

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


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Steven Rostedt

 
 [SNIP]
  @@ -102,6 +103,8 @@ int __kernel_text_address(unsigned long addr)
  return 1;
  if (is_module_text_address(addr))
  return 1;
  +   if (is_ftrace_trampoline(addr))
  +   return 1;
 
 What about kernel_text_address()?  It seems some archs like ARM use it
 instead of __kernel_text_address() although trampoline is only enabled
 on x86 for now.
 

Good question. I just did this to get x86 working. But as we add
trampolines to other archs, we probably should add it to that too.

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


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Steven Rostedt
On Wed, 19 Nov 2014 17:16:55 +0900
Namhyung Kim namhy...@kernel.org wrote:

 
 [SNIP]
  @@ -102,6 +103,8 @@ int __kernel_text_address(unsigned long addr)
  return 1;
  if (is_module_text_address(addr))
  return 1;
  +   if (is_ftrace_trampoline(addr))
  +   return 1;
 
 What about kernel_text_address()?  It seems some archs like ARM use it
 instead of __kernel_text_address() although trampoline is only enabled
 on x86 for now.

Here's the new patch:

From 418f77ed7636c01e40627ee6609f4bd859c62c75 Mon Sep 17 00:00:00 2001
From: Steven Rostedt (Red Hat) rost...@goodmis.org
Date: Tue, 18 Nov 2014 21:14:11 -0500
Subject: [PATCH] ftrace/x86/extable: Add is_ftrace_trampoline() function

Stack traces that happen from function tracing check if the address
on the stack is a __kernel_text_address(). That is, is the address
kernel code. This calls core_kernel_text() which returns true
if the address is part of the builtin kernel code. It also calls
is_module_text_address() which returns true if the address belongs
to module code.

But what is missing is ftrace dynamically allocated trampolines.
These trampolines are allocated for individual ftrace_ops that
call the ftrace_ops callback functions directly. But if they do a
stack trace, the code checking the stack wont detect them as they
are neither core kernel code nor module address space.

Adding another field to ftrace_ops that also stores the size of
the trampoline assigned to it we can create a new function called
is_ftrace_trampoline() that returns true if the address is a
dynamically allocate ftrace trampoline. Note, it ignores trampolines
that are not dynamically allocated as they will return true with
the core_kernel_text() function.

Link: http://lkml.kernel.org/r/20141119034829.497125...@goodmis.org

Cc: Thomas Gleixner t...@linutronix.de
Cc: Ingo Molnar mi...@redhat.com
Cc: H. Peter Anvin h...@zytor.com
Signed-off-by: Steven Rostedt rost...@goodmis.org
---
 arch/x86/kernel/ftrace.c |  9 +++--
 include/linux/ftrace.h   |  8 
 kernel/extable.c |  7 ++-
 kernel/trace/ftrace.c| 38 ++
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 1aea94d336c7..60881d919432 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -712,7 +712,8 @@ union ftrace_op_code_union {
} __attribute__((packed));
 };
 
-static unsigned long create_trampoline(struct ftrace_ops *ops)
+static unsigned long
+create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
 {
unsigned const char *jmp;
unsigned long start_offset;
@@ -749,6 +750,8 @@ static unsigned long create_trampoline(struct ftrace_ops 
*ops)
if (!trampoline)
return 0;
 
+   *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
+
/* Copy ftrace_caller onto the trampoline memory */
ret = probe_kernel_read(trampoline, (void *)start_offset, size);
if (WARN_ON(ret  0)) {
@@ -819,6 +822,7 @@ void arch_ftrace_update_trampoline(struct ftrace_ops *ops)
unsigned char *new;
unsigned long offset;
unsigned long ip;
+   unsigned int size;
int ret;
 
if (ops-trampoline) {
@@ -829,9 +833,10 @@ void arch_ftrace_update_trampoline(struct ftrace_ops *ops)
if (!(ops-flags  FTRACE_OPS_FL_ALLOC_TRAMP))
return;
} else {
-   ops-trampoline = create_trampoline(ops);
+   ops-trampoline = create_trampoline(ops, size);
if (!ops-trampoline)
return;
+   ops-trampoline_size = size;
}
 
offset = calc_trampoline_call_offset(ops-flags  
FTRACE_OPS_FL_SAVE_REGS);
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index 619e37cc17fd..7b2616fa2472 100644
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -150,6 +150,7 @@ struct ftrace_ops {
struct ftrace_ops_hash  *func_hash;
struct ftrace_ops_hash  old_hash;
unsigned long   trampoline;
+   unsigned long   trampoline_size;
 #endif
 };
 
@@ -297,6 +298,8 @@ extern int ftrace_text_reserved(const void *start, const 
void *end);
 
 extern int ftrace_nr_registered_ops(void);
 
+bool is_ftrace_trampoline(unsigned long addr);
+
 /*
  * The dyn_ftrace record's flags field is split into two parts.
  * the first part which is '0-FTRACE_REF_MAX' is a counter of
@@ -596,6 +599,11 @@ static inline ssize_t ftrace_notrace_write(struct file 
*file, const char __user
 size_t cnt, loff_t *ppos) { return -ENODEV; }
 static inline int
 ftrace_regex_release(struct inode *inode, struct file *file) { return -ENODEV; 
}
+
+static inline bool is_ftrace_trampoline(unsigned long addr)
+{
+   return false;
+}
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
 /* totally disable 

Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Thomas Gleixner
On Wed, 19 Nov 2014, Steven Rostedt wrote:
 From: Steven Rostedt (Red Hat) rost...@goodmis.org
 Date: Tue, 18 Nov 2014 21:14:11 -0500
 Subject: [PATCH] ftrace/x86/extable: Add is_ftrace_trampoline() function
 
 Stack traces that happen from function tracing check if the address
 on the stack is a __kernel_text_address(). That is, is the address
 kernel code. This calls core_kernel_text() which returns true
 if the address is part of the builtin kernel code. It also calls
 is_module_text_address() which returns true if the address belongs
 to module code.
 
 But what is missing is ftrace dynamically allocated trampolines.
 These trampolines are allocated for individual ftrace_ops that
 call the ftrace_ops callback functions directly. But if they do a
 stack trace, the code checking the stack wont detect them as they
 are neither core kernel code nor module address space.
 
 Adding another field to ftrace_ops that also stores the size of
 the trampoline assigned to it we can create a new function called
 is_ftrace_trampoline() that returns true if the address is a
 dynamically allocate ftrace trampoline. Note, it ignores trampolines
 that are not dynamically allocated as they will return true with
 the core_kernel_text() function.
 
 Link: http://lkml.kernel.org/r/20141119034829.497125...@goodmis.org
 
 Cc: Thomas Gleixner t...@linutronix.de
 Cc: Ingo Molnar mi...@redhat.com
 Cc: H. Peter Anvin h...@zytor.com
 Signed-off-by: Steven Rostedt rost...@goodmis.org

Acked-by: Thomas Gleixner t...@linutronix.de
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-19 Thread Steven Rostedt
On Wed, 19 Nov 2014 19:29:25 +0100 (CET)
Thomas Gleixner t...@linutronix.de wrote:

 On Wed, 19 Nov 2014, Steven Rostedt wrote:
  From: Steven Rostedt (Red Hat) rost...@goodmis.org
  Date: Tue, 18 Nov 2014 21:14:11 -0500
  Subject: [PATCH] ftrace/x86/extable: Add is_ftrace_trampoline() function
  
  Stack traces that happen from function tracing check if the address
  on the stack is a __kernel_text_address(). That is, is the address
  kernel code. This calls core_kernel_text() which returns true
  if the address is part of the builtin kernel code. It also calls
  is_module_text_address() which returns true if the address belongs
  to module code.
  
  But what is missing is ftrace dynamically allocated trampolines.
  These trampolines are allocated for individual ftrace_ops that
  call the ftrace_ops callback functions directly. But if they do a
  stack trace, the code checking the stack wont detect them as they
  are neither core kernel code nor module address space.
  
  Adding another field to ftrace_ops that also stores the size of
  the trampoline assigned to it we can create a new function called
  is_ftrace_trampoline() that returns true if the address is a
  dynamically allocate ftrace trampoline. Note, it ignores trampolines
  that are not dynamically allocated as they will return true with
  the core_kernel_text() function.
  
  Link: http://lkml.kernel.org/r/20141119034829.497125...@goodmis.org
  
  Cc: Thomas Gleixner t...@linutronix.de
  Cc: Ingo Molnar mi...@redhat.com
  Cc: H. Peter Anvin h...@zytor.com
  Signed-off-by: Steven Rostedt rost...@goodmis.org
 
 Acked-by: Thomas Gleixner t...@linutronix.de

Thanks!

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


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-18 Thread Steven Rostedt
On Tue, 18 Nov 2014 22:33:33 -0500
Steven Rostedt  wrote:


> +/*
> + * This is used by __kernel_text_address() to return true if the
> + * the address is on a dynamically allocated trampoline that would
> + * not return true for either core_kernel_text() or
> + * is_module_text_address().
> + */
> +bool is_ftrace_trampoline(unsigned long addr)
> +{
> + struct ftrace_ops *op;
> +
> + do_for_each_ftrace_op(op, ftrace_ops_list) {
> + /*
> +  * This is to check for dynamically allocated trampolines.
> +  * Trampolines that are in kernel text will have
> +  * core_kernel_text() return true.
> +  */
> + if (op->trampoline && op->trampoline_size)
> + if (addr >= op->trampoline &&
> + addr < op->trampoline + op->trampoline_size)
> + return true;
> + } while_for_each_ftrace_op(op);
> +
> + return false;
> +}
> +

Hmm, preemption should be disabled here. We can't guarantee that the
caller will have that. Will update.

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


Re: [PATCH 2/2] ftrace/x86/extable: Add is_ftrace_trampoline() function

2014-11-18 Thread Steven Rostedt
On Tue, 18 Nov 2014 22:33:33 -0500
Steven Rostedt rost...@goodmis.org wrote:


 +/*
 + * This is used by __kernel_text_address() to return true if the
 + * the address is on a dynamically allocated trampoline that would
 + * not return true for either core_kernel_text() or
 + * is_module_text_address().
 + */
 +bool is_ftrace_trampoline(unsigned long addr)
 +{
 + struct ftrace_ops *op;
 +
 + do_for_each_ftrace_op(op, ftrace_ops_list) {
 + /*
 +  * This is to check for dynamically allocated trampolines.
 +  * Trampolines that are in kernel text will have
 +  * core_kernel_text() return true.
 +  */
 + if (op-trampoline  op-trampoline_size)
 + if (addr = op-trampoline 
 + addr  op-trampoline + op-trampoline_size)
 + return true;
 + } while_for_each_ftrace_op(op);
 +
 + return false;
 +}
 +

Hmm, preemption should be disabled here. We can't guarantee that the
caller will have that. Will update.

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