From patchwork Sat Nov 21 01:23:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 7673201 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EC3E29F2EC for ; Sat, 21 Nov 2015 01:26:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2529205DF for ; Sat, 21 Nov 2015 01:26:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9DF9520614 for ; Sat, 21 Nov 2015 01:26:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZzwuB-0001a2-RM; Sat, 21 Nov 2015 01:23:55 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zzwtw-0001VV-RD for linux-arm-kernel@lists.infradead.org; Sat, 21 Nov 2015 01:23:43 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 78A1413FF43; Sat, 21 Nov 2015 01:23:19 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 6429F13FFFF; Sat, 21 Nov 2015 01:23:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from sboyd-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6EA5913FF43; Sat, 21 Nov 2015 01:23:18 +0000 (UTC) From: Stephen Boyd To: linux-arm-kernel@lists.infradead.org Subject: [RFC/PATCH 1/3] scripts: Allow recordmcount to be used without tracing enabled Date: Fri, 20 Nov 2015 17:23:15 -0800 Message-Id: <1448068997-26631-2-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 2.6.3.369.g91ad409 In-Reply-To: <1448068997-26631-1-git-send-email-sboyd@codeaurora.org> References: <1448068997-26631-1-git-send-email-sboyd@codeaurora.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151120_172341_016978_4D0F8041 X-CRM114-Status: GOOD ( 21.05 ) X-Spam-Score: -3.2 (---) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= , Arnd Bergmann , Nicolas Pitre , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Steven Rostedt Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In the next patch we're going to modify recordmcount to also record locations of calls to __aeabi_{u}idiv(). Lay the groundwork for this by adding a flag to recordmcount that indicates if we're expected to find calls to mcount or not. Cc: Nicolas Pitre Cc: Arnd Bergmann Cc: Steven Rostedt Cc: Måns Rullgård Signed-off-by: Stephen Boyd --- kernel/trace/Kconfig | 4 ++++ scripts/Makefile.build | 15 +++++---------- scripts/recordmcount.c | 10 +++++++--- scripts/recordmcount.h | 2 +- scripts/recordmcount.pl | 11 ++++++++--- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 8d6363f42169..578b666ed7d9 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -57,6 +57,10 @@ config HAVE_C_RECORDMCOUNT help C version of recordmcount available? +config RUN_RECORDMCOUNT + def_bool y + depends on DYNAMIC_FTRACE && HAVE_FTRACE_MCOUNT_RECORD + config TRACER_MAX_TRACE bool diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 01df30af4d4a..22f2eb10d434 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -210,7 +210,7 @@ cmd_modversions = \ fi; endif -ifdef CONFIG_FTRACE_MCOUNT_RECORD +ifdef CONFIG_RUN_RECORDMCOUNT ifdef BUILD_C_RECORDMCOUNT ifeq ("$(origin RECORDMCOUNT_WARN)", "command line") RECORDMCOUNT_FLAGS = -w @@ -219,26 +219,21 @@ endif # The empty.o file is created in the make process in order to determine # the target endianness and word size. It is made before all other C # files, including recordmcount. -sub_cmd_record_mcount = \ +cmd_record_mcount = \ if [ $(@) != "scripts/mod/empty.o" ]; then \ - $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \ + $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) $(if $(findstring $(CC_FLAGS_FTRACE),$(_c_flags)),-t,) "$(@)"; \ fi; recordmcount_source := $(srctree)/scripts/recordmcount.c \ $(srctree)/scripts/recordmcount.h else -sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ +cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ "$(if $(CONFIG_64BIT),64,32)" \ "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \ "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ - "$(if $(part-of-module),1,0)" "$(@)"; + "$(if $(part-of-module),1,0)" "$(if $(findstring $(CC_FLAGS_FTRACE),$(_c_flags)),1,0)" "$(@)"; recordmcount_source := $(srctree)/scripts/recordmcount.pl endif -cmd_record_mcount = \ - if [ "$(findstring $(CC_FLAGS_FTRACE),$(_c_flags))" = \ - "$(CC_FLAGS_FTRACE)" ]; then \ - $(sub_cmd_record_mcount) \ - fi; endif define rule_cc_o_c diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c index 698768bdc581..b6b4a5df647a 100644 --- a/scripts/recordmcount.c +++ b/scripts/recordmcount.c @@ -54,6 +54,7 @@ static struct stat sb; /* Remember .st_size, etc. */ static jmp_buf jmpenv; /* setjmp/longjmp per-file error escape */ static const char *altmcount; /* alternate mcount symbol name */ static int warn_on_notrace_sect; /* warn when section has mcount not being recorded */ +static int trace_mcount; /* Record mcount callers */ /* setjmp() return values */ enum { @@ -453,19 +454,22 @@ main(int argc, char *argv[]) int c; int i; - while ((c = getopt(argc, argv, "w")) >= 0) { + while ((c = getopt(argc, argv, "wt")) >= 0) { switch (c) { case 'w': warn_on_notrace_sect = 1; break; + case 't': + trace_mcount = 1; + break; default: - fprintf(stderr, "usage: recordmcount [-w] file.o...\n"); + fprintf(stderr, "usage: recordmcount [-wt] file.o...\n"); return 0; } } if ((argc - optind) < 1) { - fprintf(stderr, "usage: recordmcount [-w] file.o...\n"); + fprintf(stderr, "usage: recordmcount [-wt] file.o...\n"); return 0; } diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h index b9897e2be404..6e196dba748d 100644 --- a/scripts/recordmcount.h +++ b/scripts/recordmcount.h @@ -323,7 +323,7 @@ static uint_t *sift_rel_mcount(uint_t *mlocp, get_sym_str_and_relp(relhdr, ehdr, &sym0, &str0, &relp); for (t = nrel; t; --t) { - if (!mcountsym) + if (trace_mcount && !mcountsym) mcountsym = get_mcountsym(sym0, relp, str0); if (mcountsym == Elf_r_sym(relp) && !is_fake_mcount(relp)) { diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 826470d7f000..cff3040ddbdc 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -113,20 +113,25 @@ $P =~ s@.*/@@g; my $V = '0.1'; -if ($#ARGV != 11) { - print "usage: $P arch endian bits objdump objcopy cc ld nm rm mv is_module inputfile\n"; +if ($#ARGV != 12) { + print "usage: $P arch endian bits objdump objcopy cc ld nm rm mv is_module is_traced inputfile\n"; print "version: $V\n"; exit(1); } my ($arch, $endian, $bits, $objdump, $objcopy, $cc, - $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV; + $ld, $nm, $rm, $mv, $is_module, $is_traced, $inputfile) = @ARGV; # This file refers to mcount and shouldn't be ftraced, so lets' ignore it if ($inputfile =~ m,kernel/trace/ftrace\.o$,) { exit(0); } +# We only trace mcount calls +if ($is_traced eq "0") { + exit(0); +} + # Acceptable sections to record. my %text_sections = ( ".text" => 1,