From patchwork Thu Dec 20 11:11:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 1899351 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2EA99DF23A for ; Thu, 20 Dec 2012 11:20:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751367Ab2LTLU6 (ORCPT ); Thu, 20 Dec 2012 06:20:58 -0500 Received: from us01smtp2.synopsys.com ([198.182.44.80]:34854 "EHLO kiruna.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750781Ab2LTLU6 (ORCPT ); Thu, 20 Dec 2012 06:20:58 -0500 X-Greylist: delayed 427 seconds by postgrey-1.27 at vger.kernel.org; Thu, 20 Dec 2012 06:20:58 EST Received: from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238]) by kiruna.synopsys.com (Postfix) with ESMTP id 6294FF7E8; Thu, 20 Dec 2012 03:13:50 -0800 (PST) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 3F376FCA; Thu, 20 Dec 2012 03:13:50 -0800 (PST) Received: from US01WXQAHTC1.internal.synopsys.com (us01wxqahtc1.internal.synopsys.com [10.12.238.230]) by mailhost.synopsys.com (Postfix) with ESMTP id CB72BFC7; Thu, 20 Dec 2012 03:13:49 -0800 (PST) Received: from IN01WEHTC2.internal.synopsys.com (10.144.199.212) by US01WXQAHTC1.internal.synopsys.com (10.12.238.230) with Microsoft SMTP Server (TLS) id 14.2.298.4; Thu, 20 Dec 2012 03:12:11 -0800 Received: from localhost.localdomain (10.12.197.205) by in01wehtc2.internal.synopsys.com (10.144.199.243) with Microsoft SMTP Server (TLS) id 14.2.298.4; Thu, 20 Dec 2012 16:42:06 +0530 From: To: CC: Vineet Gupta , Tony Luck , Fenghua Yu , "James E.J. Bottomley" , "Eric W. Biederman" , "Serge Hallyn" , "David S. Miller" , "Paul E. McKenney" , , , Subject: [PATCH] sysctl: convert arch specific unaligned access regulators to generic ones Date: Thu, 20 Dec 2012 16:41:38 +0530 Message-ID: <1356001898-2960-2-git-send-email-vgupta@synopsys.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1356001898-2960-1-git-send-email-vgupta@synopsys.com> References: <50D2B75A.3000208@synopsys.com> <1356001898-2960-1-git-send-email-vgupta@synopsys.com> MIME-Version: 1.0 X-Originating-IP: [10.12.197.205] Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org From: Vineet Gupta * parisc: /proc/sys/kernel/unaligned-trap => SYSCTL_ARCH_UNALIGN_ALLOW * ia64: /proc/sys/kernel/ignore-unaligned-usertrap => SYSCTL_ARCH_UNALIGN_NO_WARN This allows other architectures, specifically ARC to reuse these sysctl knobs. Signed-off-by: Vineet Gupta Cc: Tony Luck Cc: Fenghua Yu Cc: "James E.J. Bottomley" Cc: "Eric W. Biederman" Cc: Serge Hallyn Cc: "David S. Miller" Cc: "Paul E. McKenney" Cc: linux-ia64@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/ia64/Kconfig | 1 + arch/parisc/Kconfig | 1 + init/Kconfig | 16 ++++++++++++++++ kernel/sysctl.c | 16 +++++++++++++--- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 3279646..5fb1064 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -40,6 +40,7 @@ config IA64 select ARCH_THREAD_INFO_ALLOCATOR select ARCH_CLOCKSOURCE_DATA select GENERIC_TIME_VSYSCALL_OLD + select SYSCTL_ARCH_UNALIGN_NO_WARN select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA default y diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 11def45..7d9de54 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -20,6 +20,7 @@ config PARISC select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_SMP_IDLE_THREAD select GENERIC_STRNCPY_FROM_USER + select SYSCTL_ARCH_UNALIGN_ALLOW select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA diff --git a/init/Kconfig b/init/Kconfig index 6fdd6e3..de4b184 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1169,6 +1169,22 @@ config SYSCTL_EXCEPTION_TRACE help Enable support for /proc/sys/debug/exception-trace. +config SYSCTL_ARCH_UNALIGN_NO_WARN + bool + help + Enable support for /proc/sys/kernel/ignore-unaligned-usertrap + Allows arch to define/use @no_unaligned_warning to possbly warn about + unaligned access emulation going on under the hood. + see arch/ia64/kernel/unaligned.c for reference + +config SYSCTL_ARCH_UNALIGN_ALLOW + bool + help + Enable support for /proc/sys/kernel/unaligned-trap + Allows arches to define/use @unaligned_enabled to runtime toggle + the unaligned access emulation. + see arch/parisc/kernel/unaligned.c for reference + config KALLSYMS bool "Load all symbols for debugging/ksymoops" if EXPERT default y diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 26f65ea..9c618bf 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -157,14 +157,20 @@ extern int sysctl_tsb_ratio; #ifdef __hppa__ extern int pwrsw_enabled; -extern int unaligned_enabled; #endif #ifdef CONFIG_IA64 -extern int no_unaligned_warning; extern int unaligned_dump_stack; #endif +#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW +extern int unaligned_enabled; +#endif + +#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN +extern int no_unaligned_warning; +#endif + #ifdef CONFIG_PROC_SYSCTL static int proc_do_cad_pid(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); @@ -504,6 +510,8 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, +#endif +#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW { .procname = "unaligned-trap", .data = &unaligned_enabled, @@ -870,7 +878,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_doulongvec_minmax, }, #endif -#ifdef CONFIG_IA64 +#ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN { .procname = "ignore-unaligned-usertrap", .data = &no_unaligned_warning, @@ -878,6 +886,8 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dointvec, }, +#endif +#ifdef CONFIG_IA64 { .procname = "unaligned-dump-stack", .data = &unaligned_dump_stack,