From: wangnan0@huawei.com (Wang Nan)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH v2 07/26] ftrace: allow search ftrace addr before ftrace fully inited.
Date: Thu, 12 Feb 2015 20:19:46 +0800 [thread overview]
Message-ID: <1423743586-12310-1-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1423743476-11927-1-git-send-email-wangnan0@huawei.com>
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
kernel/trace/ftrace.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index a6a6b09..79b3e88 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1539,6 +1539,8 @@ static unsigned long ftrace_location_range(unsigned long start, unsigned long en
return 0;
}
+static unsigned long ftrace_search_mcount_ip(unsigned long ip);
+
/**
* ftrace_location - return true if the ip giving is a traced location
* @ip: the instruction pointer to check
@@ -1550,6 +1552,9 @@ static unsigned long ftrace_location_range(unsigned long start, unsigned long en
*/
unsigned long ftrace_location(unsigned long ip)
{
+ if (unlikely(!ftrace_pages_start))
+ return ftrace_search_mcount_ip(ip);
+
return ftrace_location_range(ip, ip);
}
@@ -4733,6 +4738,18 @@ static int ftrace_cmp_ips(const void *a, const void *b)
return 0;
}
+static int ftrace_cmp_ips_insn(const void *a, const void *b)
+{
+ const unsigned long *ipa = a;
+ const unsigned long *ipb = b;
+
+ if (*ipa >= *ipb + MCOUNT_INSN_SIZE)
+ return 1;
+ if (*ipa < *ipb)
+ return -1;
+ return 0;
+}
+
static void ftrace_swap_ips(void *a, void *b, int size)
{
unsigned long *ipa = a;
@@ -4764,6 +4781,27 @@ static void ftrace_sort_mcount_area(void)
}
}
+static unsigned long ftrace_search_mcount_ip(unsigned long ip)
+{
+ extern unsigned long __start_mcount_loc[];
+ extern unsigned long __stop_mcount_loc[];
+
+ unsigned long *mcount_start = __start_mcount_loc;
+ unsigned long *mcount_end = __stop_mcount_loc;
+ unsigned long count = mcount_end - mcount_start;
+ unsigned long *retval;
+
+ if (!mcount_sorted)
+ return 0;
+
+ retval = bsearch(&ip, mcount_start, count,
+ sizeof(unsigned long), ftrace_cmp_ips_insn);
+ if (!retval)
+ return 0;
+
+ return ftrace_call_adjust(ip);
+}
+
static int ftrace_process_locs(struct module *mod,
unsigned long *start,
unsigned long *end)
--
1.8.4
next prev parent reply other threads:[~2015-02-12 12:19 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-12 12:17 [RFC PATCH v2 00/26] Early kprobe: enable kprobes at very early booting stage Wang Nan
2015-02-12 12:19 ` [RFC PATCH v2 01/26] kprobes: set kprobes_all_disarmed earlier to enable re-optimization Wang Nan
2015-02-12 12:19 ` [RFC PATCH v2 02/26] kprobes: makes kprobes/enabled works correctly for optimized kprobes Wang Nan
2015-02-12 12:19 ` [RFC PATCH v2 03/26] kprobes: x86: mark 2 bytes NOP as boostable Wang Nan
2015-02-12 12:19 ` [RFC PATCH v2 04/26] ftrace: don't update record flags if code modification fail Wang Nan
2015-02-12 12:19 ` [RFC PATCH v2 05/26] ftrace/x86: Ensure rec->flags no change when failure occures Wang Nan
2015-02-12 12:19 ` [RFC PATCH v2 06/26] ftrace: sort ftrace entries earlier Wang Nan
2015-02-12 17:35 ` Steven Rostedt
2015-02-12 12:19 ` Wang Nan [this message]
2015-02-12 17:38 ` [RFC PATCH v2 07/26] ftrace: allow search ftrace addr before ftrace fully inited Steven Rostedt
2015-02-12 12:19 ` [RFC PATCH v2 08/26] ftrace: enable other subsystems make ftrace nop before ftrace_init() Wang Nan
2015-02-12 17:39 ` Steven Rostedt
2015-02-13 1:29 ` Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 10/26] ftrace: x86: try to fix ftrace when ftrace_replace_code Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 11/26] early kprobes: introduce kprobe_is_early for futher early kprobe use Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 12/26] early kprobes: Add an KPROBE_FLAG_EARLY for early kprobe Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 13/26] early kprobes: ARM: directly modify code Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 14/26] early kprobes: ARM: introduce early kprobes related code area Wang Nan
2015-02-13 17:32 ` Russell King - ARM Linux
2015-02-15 8:26 ` [RFC PATCH 0/3] early kprobes: rearrange vmlinux.lds related code Wang Nan
2015-02-15 8:27 ` [RFC PATCH 1/3] early kprobes: ARM: add definition for vmlinux.lds use Wang Nan
2015-02-15 8:27 ` [RFC PATCH 2/3] early kprobes: x86: " Wang Nan
2015-02-15 8:27 ` [RFC PATCH 3/3] early kprobes: introduce early kprobes related code area Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 15/26] early kprobes: x86: directly modify code Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 16/26] early kprobes: x86: introduce early kprobes related code area Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 17/26] early kprobes: introduces macros for allocing early kprobe resources Wang Nan
2015-02-12 12:20 ` [RFC PATCH v2 18/26] early kprobes: allows __alloc_insn_slot() from early kprobes slots Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 19/26] early kprobes: perhibit probing at early kprobe reserved area Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 20/26] early kprobes: core logic of eraly kprobes Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 21/26] early kprobes: add CONFIG_EARLY_KPROBES option Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 22/26] early kprobes: introduce arch_fix_ftrace_early_kprobe() Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 23/26] early kprobes: x86: arch_restore_optimized_kprobe() Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 24/26] early kprobes: core logic to support early kprobe on ftrace Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 25/26] early kprobes: introduce kconfig option " Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 26/26] kprobes: enable 'ekprobe=' cmdline option for early kprobes Wang Nan
2015-02-12 12:21 ` [RFC PATCH v2 09/26] ftrace: callchain and ftrace_bug_tryfix Wang Nan
2015-02-13 5:38 ` [RFC PATCH v3 00/26] Early kprobe: enable kprobes at very early booting stage Wang Nan
2015-02-13 17:15 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1423743586-12310-1-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).