From patchwork Wed May 26 17:22:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 53650 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 35916B7D1C for ; Thu, 27 May 2010 03:22:53 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OHKJc-00075v-2k; Wed, 26 May 2010 18:22:48 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OHKJZ-00075J-3j for kernel-team@lists.ubuntu.com; Wed, 26 May 2010 18:22:45 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OHKJY-0008H6-QF for ; Wed, 26 May 2010 18:22:45 +0100 Received: from cpe-75-180-27-10.columbus.res.rr.com ([75.180.27.10] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OHKJY-0007ZG-7v for kernel-team@lists.ubuntu.com; Wed, 26 May 2010 18:22:44 +0100 From: Chase Douglas To: kernel-team@lists.ubuntu.com Subject: [MAVERICK][PATCH] UBUNTU: maverick ftrace configuration changes Date: Wed, 26 May 2010 13:22:40 -0400 Message-Id: <1274894560-4094-2-git-send-email-chase.douglas@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1274894560-4094-1-git-send-email-chase.douglas@canonical.com> References: <1274894560-4094-1-git-send-email-chase.douglas@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com I've reviewed the ftrace configuration for the maverick kernel. The changes can be generalized to: * Enable syscall tracing plugin * Enable scheduler tracing plugin * Enable max stack size tracing plugin for non-ARM kernels * Disable function tracer for ARM platforms due to inability to dynamically enable and disable at runtime In general, any discrepencies between ARM and other kernels is due to ARM's inability to dynamically trace functions. Hopefully this will be resolved soon, but not soon enough for 10.10. Signed-off-by: Chase Douglas --- debian.master/config/amd64/config.common.amd64 | 2 ++ debian.master/config/armel/config.common.armel | 2 ++ debian.master/config/config.common.ubuntu | 7 +++---- debian.master/config/i386/config.common.i386 | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 206b795..2a369c3 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -47,6 +47,7 @@ CONFIG_FIRMWARE_EDID=y CONFIG_FRAMEBUFFER_CONSOLE=m CONFIG_FSAM7400=m CONFIG_FTL=m +CONFIG_FUNCTION_TRACER=y CONFIG_GAMEPORT=m CONFIG_GENERIC_CPU=y CONFIG_GENERIC_TIME_VSYSCALL=y @@ -208,6 +209,7 @@ CONFIG_SPI=y CONFIG_SPI_DESIGNWARE=y CONFIG_SPI_SPIDEV=m CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_STACK_TRACER=y # CONFIG_STANDALONE is not set CONFIG_SUNGEM=m CONFIG_SYS_HYPERVISOR=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 079d708..04b8b14 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -19,6 +19,7 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FONTS=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FSAM7400 is not set +# CONFIG_FUNCTION_TRACER is not set CONFIG_HAVE_AOUT=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y # CONFIG_HUGETLB_PAGE is not set @@ -69,6 +70,7 @@ CONFIG_SERIAL_8250_PCI=m CONFIG_SPI_DESIGNWARE=m # CONFIG_SPI_SPIDEV is not set # CONFIG_SSB_B43_PCI_BRIDGE is not set +# CONFIG_STACK_TRACER is not set CONFIG_STANDALONE=y # CONFIG_SUNGEM is not set # CONFIG_SYS_HYPERVISOR is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 69eb224..2fad368 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1276,12 +1276,11 @@ CONFIG_FTRACE=y CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_NMI_ENTER=y # CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_FTRACE_SYSCALLS is not set +CONFIG_FTRACE_SYSCALLS=y CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y -CONFIG_FUNCTION_TRACER=y CONFIG_FUSE_FS=y CONFIG_FUSION=y CONFIG_FUSION_CTL=m @@ -3326,7 +3325,7 @@ CONFIG_SCHED_HRTICK=y CONFIG_SCHED_MC=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_SCHED_SMT=y -# CONFIG_SCHED_TRACER is not set +CONFIG_SCHED_TRACER=y CONFIG_SCSI=y CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_3W_SAS=m @@ -3936,7 +3935,6 @@ CONFIG_SSB_SPROM=y CONFIG_SSFDC=m CONFIG_STACKTRACE=y CONFIG_STACKTRACE_SUPPORT=y -# CONFIG_STACK_TRACER is not set CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set CONFIG_STALDRV=y @@ -4091,6 +4089,7 @@ CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_TPS65010=m CONFIG_TR=y CONFIG_TRACEPOINTS=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_TRACING=y CONFIG_TRACING_SUPPORT=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index b2b6935..955d2be 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -48,6 +48,7 @@ CONFIG_FLATMEM_MANUAL=y CONFIG_FRAMEBUFFER_CONSOLE=m CONFIG_FSAM7400=m CONFIG_FTL=m +CONFIG_FUNCTION_TRACER=y CONFIG_GAMEPORT=m # CONFIG_GENERIC_CPU is not set # CONFIG_GENERIC_TIME_VSYSCALL is not set @@ -210,6 +211,7 @@ CONFIG_SPI=y CONFIG_SPI_DESIGNWARE=y CONFIG_SPI_SPIDEV=m CONFIG_SSB_B43_PCI_BRIDGE=y +CONFIG_STACK_TRACER=y # CONFIG_STANDALONE is not set CONFIG_SUNGEM=m CONFIG_TCG_TPM=m