From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754661Ab2GaOh6 (ORCPT ); Tue, 31 Jul 2012 10:37:58 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:9554 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754393Ab2GaOhz (ORCPT ); Tue, 31 Jul 2012 10:37:55 -0400 X-Authority-Analysis: v=2.0 cv=StQSGYy0 c=1 sm=0 a=s5Htg7xnQOKvHEu9STBOug==:17 a=OpT9cpI26MMA:10 a=goZ1qfjQ0_kA:10 a=5SG0PmZfjMsA:10 a=Q9fys5e9bTEA:10 a=meVymXHHAAAA:8 a=ayC55rCoAAAA:8 a=VwQbUJbxAAAA:8 a=T_9CT6wo05-J89-kAzQA:9 a=PUjeQqilurYA:10 a=s5Htg7xnQOKvHEu9STBOug==:117 X-Cloudmark-Score: 0 X-Originating-IP: 72.230.195.127 Message-ID: <1343745474.27983.50.camel@gandalf.stny.rr.com> Subject: [GIT PULL][v3.7] (was: Re: [PATCH 00/19] [GIT PULL][v3.6]) ftrace: Allow kprobes to work with ftace From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Masami Hiramatsu , Frederic Weisbecker , Thomas Gleixner , "H. Peter Anvin" Date: Tue, 31 Jul 2012 10:37:54 -0400 In-Reply-To: <1343663487.27983.7.camel@gandalf.stny.rr.com> References: <20120721021943.274162381@goodmis.org> <1343663487.27983.7.camel@gandalf.stny.rr.com> Content-Type: text/plain; charset="ISO-8859-15" X-Mailer: Evolution 3.4.3-1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2012-07-30 at 11:51 -0400, Steven Rostedt wrote: > As the merge window opened the day after I sent this (which was also the > same day I left for vacation :-p ), I recommend that this goes in v3.7. > > Can you pull this in for 3.7, or do you want me to post another pull > request after the merge window closes? Hi Ingo, I just rebased the branch to include Masami's reviewed by tag that he posted for Uros Bizjak's patch. No code has changed. Please pull the latest tip/perf/core tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git tip/perf/core Head SHA1: e52538965119319447c0800c534da73142c27be2 Masami Hiramatsu (5): ftrace: add ftrace_set_filter_ip() for address based filter kprobes: cleanup to separate probe-able check kprobes: Move locks into appropriate functions kprobes: introduce ftrace based optimization kprobes/x86: ftrace based optimization for x86 Steven Rostedt (13): ftrace: Pass ftrace_ops as third parameter to function trace callback ftrace: Consolidate arch dependent functions with 'list' function ftrace: Return pt_regs to function trace callback ftrace/x86_32: Push ftrace_ops in as 3rd parameter to function tracer ftrace/x86: Add separate function to save regs ftrace/x86: Add save_regs for i386 function calls ftrace/x86: Remove function_trace_stop check from graph caller ftrace: Add default recursion protection for function tracing ftrace: Only compile ftrace selftest if selftests are enabled ftrace: Add selftest to test function trace recursion protection ftrace: Add selftest to test function save-regs support kprobes: Inverse taking of module_mutex with kprobe_mutex ftrace: Make ftrace_location() a nop on !DYNAMIC_FTRACE Uros Bizjak (1): ftrace/x86_32: Simplify parameter setup for ftrace_regs_caller ---- arch/x86/include/asm/ftrace.h | 49 +++--- arch/x86/include/asm/kprobes.h | 1 + arch/x86/kernel/entry_32.S | 75 ++++++++- arch/x86/kernel/entry_64.S | 96 +++++++++-- arch/x86/kernel/ftrace.c | 73 ++++++++- arch/x86/kernel/kprobes.c | 48 ++++++ include/linux/ftrace.h | 158 ++++++++++++++++-- include/linux/kprobes.h | 27 ++++ kernel/kprobes.c | 250 ++++++++++++++++++++-------- kernel/trace/Makefile | 2 + kernel/trace/ftrace.c | 322 ++++++++++++++++++++++++++++--------- kernel/trace/trace.h | 2 +- kernel/trace/trace_event_perf.c | 3 +- kernel/trace/trace_events.c | 4 +- kernel/trace/trace_functions.c | 14 +- kernel/trace/trace_irqsoff.c | 5 +- kernel/trace/trace_sched_wakeup.c | 5 +- kernel/trace/trace_selftest.c | 277 ++++++++++++++++++++++++++++++- kernel/trace/trace_stack.c | 4 +- 19 files changed, 1199 insertions(+), 216 deletions(-)