From patchwork Thu Apr 18 15:06:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 237672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id CC22A2C0205 for ; Fri, 19 Apr 2013 01:06:31 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1USqPh-0003EJ-NW; Thu, 18 Apr 2013 15:06:17 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1USqPg-0003E0-6p for kernel-team@lists.ubuntu.com; Thu, 18 Apr 2013 15:06:16 +0000 Received: from 64-126-112-59.dyn.everestkc.net ([64.126.112.59] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1USqPf-00007U-R6 for kernel-team@lists.ubuntu.com; Thu, 18 Apr 2013 15:06:16 +0000 From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] CONFIG_DEBUG_RODATA=n Date: Thu, 18 Apr 2013 10:06:13 -0500 Message-Id: <1366297573-18391-1-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com It turns out we had two options enabled which were making the kernel text read only. Turning off CONFIG_STRICT_MEMORY_RWX fixed function tracing, but kprobes still don't work. CONFIG_DEBUG_RODATA seems to be something added by Google to mimic the same option in x86, but the x86 version does some tricks to make kprobes work which are lacking in the ARM version. Turn off this option so that kprobes will work and remove the corresponding enforcer rule. Signed-off-by: Seth Forshee --- debian.nexus4/config/config.common.ubuntu | 3 +-- debian.nexus4/config/enforce | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian.nexus4/config/config.common.ubuntu b/debian.nexus4/config/config.common.ubuntu index fcf42e8..3ae1a29 100644 --- a/debian.nexus4/config/config.common.ubuntu +++ b/debian.nexus4/config/config.common.ubuntu @@ -487,8 +487,7 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set # CONFIG_DEBUG_PREEMPT is not set -CONFIG_DEBUG_RODATA=y -# CONFIG_DEBUG_RODATA_TEST is not set +# CONFIG_DEBUG_RODATA is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set # CONFIG_DEBUG_SG is not set diff --git a/debian.nexus4/config/enforce b/debian.nexus4/config/enforce index 2021810..c967afb 100644 --- a/debian.nexus4/config/enforce +++ b/debian.nexus4/config/enforce @@ -15,7 +15,6 @@ value CONFIG_DEFAULT_SECURITY_APPARMOR y # For architectures which support this option ensure it is enabled. !exists CONFIG_SECCOMP | value CONFIG_SECCOMP y !exists CONFIG_CC_STACKPROTECTOR | value CONFIG_CC_STACKPROTECTOR y -!exists CONFIG_DEBUG_RODATA | value CONFIG_DEBUG_RODATA y !exists CONFIG_STRICT_DEVMEM | value CONFIG_STRICT_DEVMEM y # For architectures which support this option ensure it is disabled. !exists CONFIG_COMPAT_VDSO | value CONFIG_COMPAT_VDSO n