From: Steven Rostedt <rostedt@goodmis.org>
To: Wang Nan <wangnan0@huawei.com>
Cc: <linux@arm.linux.org.uk>, <tglx@linutronix.de>,
<mingo@redhat.com>, <hpa@zytor.com>, <ananth@in.ibm.com>,
<anil.s.keshavamurthy@intel.com>, <davem@davemloft.net>,
<masami.hiramatsu.pt@hitachi.com>, <luto@amacapital.net>,
<keescook@chromium.org>, <oleg@redhat.com>,
<dave.long@linaro.org>, <tixy@linaro.org>, <nico@linaro.org>,
<yalin.wang2010@gmail.com>, <catalin.marinas@arm.com>,
<Yalin.Wang@sonymobile.com>, <mark.rutland@arm.com>,
<dave.hansen@linux.intel.com>, <jkenisto@us.ibm.com>,
<anton@samba.org>, <stefani@seibold.net>, <JBeulich@suse.com>,
<akpm@linux-foundation.org>, <rusty@rustcorp.com.au>,
<peterz@infradead.org>, <prarit@redhat.com>, <fabf@skynet.be>,
<hannes@cmpxchg.org>, <x86@kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <lizefan@huawei.com>
Subject: Re: [RFC PATCH v2 06/26] ftrace: sort ftrace entries earlier.
Date: Thu, 12 Feb 2015 12:35:20 -0500 [thread overview]
Message-ID: <20150212123520.2ca2999c@gandalf.local.home> (raw)
In-Reply-To: <1423743581-12267-1-git-send-email-wangnan0@huawei.com>
On Thu, 12 Feb 2015 20:19:41 +0800
Wang Nan <wangnan0@huawei.com> wrote:
The header is not enough for a change log. You need to tell us why this
patch is needed.
BTW, the previous two patches look fine, and I'm willing to pull them
into my 3.21 queue as clean ups.
As for this one...
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> ---
> include/linux/ftrace.h | 2 ++
> init/main.c | 1 +
> kernel/trace/ftrace.c | 29 +++++++++++++++++++++++++++--
> 3 files changed, 30 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> index 1da6029..8db315a 100644
> --- a/include/linux/ftrace.h
> +++ b/include/linux/ftrace.h
> @@ -701,8 +701,10 @@ static inline void __ftrace_enabled_restore(int enabled)
>
> #ifdef CONFIG_FTRACE_MCOUNT_RECORD
> extern void ftrace_init(void);
> +extern void ftrace_init_early(void);
> #else
> static inline void ftrace_init(void) { }
> +static inline void ftrace_init_early(void) { }
> #endif
>
> /*
> diff --git a/init/main.c b/init/main.c
> index 6f0f1c5f..eaafc3e 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -517,6 +517,7 @@ asmlinkage __visible void __init start_kernel(void)
> boot_cpu_init();
> page_address_init();
> pr_notice("%s", linux_banner);
> + ftrace_init_early();
> setup_arch(&command_line);
> mm_init_cpumask(&init_mm);
> setup_command_line(command_line);
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 6c6cbb1..a6a6b09 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -1169,6 +1169,7 @@ struct ftrace_page {
>
> static struct ftrace_page *ftrace_pages_start;
> static struct ftrace_page *ftrace_pages;
> +static bool mcount_sorted = false;
>
> static bool __always_inline ftrace_hash_empty(struct ftrace_hash *hash)
> {
> @@ -4743,6 +4744,26 @@ static void ftrace_swap_ips(void *a, void *b, int size)
> *ipb = t;
> }
>
> +static void ftrace_sort_mcount_area(void)
> +{
> + extern unsigned long __start_mcount_loc[];
> + extern unsigned long __stop_mcount_loc[];
> +
> + unsigned long *start = __start_mcount_loc;
> + unsigned long *end = __stop_mcount_loc;
> + unsigned long count;
> +
> + count = end - start;
> + if (!count)
> + return;
> +
> + if (!mcount_sorted) {
> + sort(start, count, sizeof(*start),
> + ftrace_cmp_ips, ftrace_swap_ips);
> + mcount_sorted = true;
> + }
> +}
> +
> static int ftrace_process_locs(struct module *mod,
> unsigned long *start,
> unsigned long *end)
> @@ -4761,8 +4782,7 @@ static int ftrace_process_locs(struct module *mod,
> if (!count)
> return 0;
>
> - sort(start, count, sizeof(*start),
> - ftrace_cmp_ips, ftrace_swap_ips);
> + ftrace_sort_mcount_area();
Notice a problem with the above? You just lost start and count. They
are not always the same. You can not just hard code __start_mcount_loc.
In fact, I'm surprised this didn't crash, because the section that
holds __start_mcount_loc is freed after boot.
Modules use this code to pass in where they hold the mcount locations.
Your change ignores that and uses the stale __start_mcount_loc that no
longer exists at the point modules are loaded.
The sort routine needs to have start and end passed to it, then it
could calculate count from end - start.
-- Steve
>
> start_pg = ftrace_allocate_pages(count);
> if (!start_pg)
> @@ -4965,6 +4985,11 @@ void __init ftrace_init(void)
> ftrace_disabled = 1;
> }
>
> +void __init ftrace_init_early(void)
> +{
> + ftrace_sort_mcount_area();
> +}
> +
> /* Do nothing if arch does not support this */
> void __weak arch_ftrace_update_trampoline(struct ftrace_ops *ops)
> {
next prev parent reply other threads:[~2015-02-12 17:35 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 [this message]
2015-02-12 12:19 ` [RFC PATCH v2 07/26] ftrace: allow search ftrace addr before ftrace fully inited Wang Nan
2015-02-12 17:38 ` 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=20150212123520.2ca2999c@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=JBeulich@suse.com \
--cc=Yalin.Wang@sonymobile.com \
--cc=akpm@linux-foundation.org \
--cc=ananth@in.ibm.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=anton@samba.org \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=dave.long@linaro.org \
--cc=davem@davemloft.net \
--cc=fabf@skynet.be \
--cc=hannes@cmpxchg.org \
--cc=hpa@zytor.com \
--cc=jkenisto@us.ibm.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=lizefan@huawei.com \
--cc=luto@amacapital.net \
--cc=mark.rutland@arm.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=nico@linaro.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=prarit@redhat.com \
--cc=rusty@rustcorp.com.au \
--cc=stefani@seibold.net \
--cc=tglx@linutronix.de \
--cc=tixy@linaro.org \
--cc=wangnan0@huawei.com \
--cc=x86@kernel.org \
--cc=yalin.wang2010@gmail.com \
/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
all inboxes | Powered by JetHome®