From patchwork Thu Mar 13 16:22:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14015404 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3121268FC9; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882957; cv=none; b=fCU+uoQDyCZCNFn2ePoJfJ88v4ISjo2eTQyeNMhzMSfdqzjSqbSl+HicyKXHXLZt2T8fseg8yqMEiQhxRJmzQ5rx/32ZNL815+tqNqRqfzLKGzcPQ4V4yB8HJUfvmnElepfQXP0bHFmP/z9MHgjODuQV3nJxeBVHsqlR4IMxUXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882957; c=relaxed/simple; bh=99SvQXLjoPiWd0/gxkEdf3AsdJ/IenQsyJp3SptYBS0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gSD61TXVQAaLxHfc72XiF2DTfzvP5Sk7U8367KINnXjYgFQm2SCzEkdhmFH6eeLL5ncQT1KI9KqQ6nmWLell5OO58fFirNM4hZA2DdGZgc2A1MgZR2TrrpRkg7cP9izZHYMeAqs6b5UlYr7qmNqZHj5YsjBH5M+cNvbKCQ0HhDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e+rPjJfN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="e+rPjJfN" Received: by smtp.kernel.org (Postfix) with ESMTPS id 35A2AC4CEEA; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741882957; bh=99SvQXLjoPiWd0/gxkEdf3AsdJ/IenQsyJp3SptYBS0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=e+rPjJfNZRP3RNYfOziJX8ZIx9x/X9P0zrRIzSkcTA72NDNCfNlk2Y65A2/+uBXJK QI1ScIbFu6G6GqXrWEEB7ncokaCHVn8ffBwUB2jmojmKTL93/OJmDf1BWXNsmgxqYn aKUZsP0GuIhYCPasm2p8E53X9XZiKoPb6YQwCFWWtMeSwQfKFzg/CfmeuRQbxv2m3C VMxIHkRkX17h+j3+TM4ZvdpbbQMCIhpyM2+M3kB/O6gN5/iVwwZK3yhRbxvStUi989 DGATr6F5HAfk+bb04JeaZ2gwYyjwps6qPxJbKPALN2TiXuSxHd43CF1YXovO4EG/Hp PJmYTZOoH4Gkw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F7D1C282DE; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) From: Joel Granados Date: Thu, 13 Mar 2025 17:22:23 +0100 Subject: [PATCH v3 1/5] panic: Move panic ctl tables into panic.c Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-jag-mv_ctltables-v3-1-91f3bb434d27@kernel.org> References: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> In-Reply-To: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> To: Kees Cook , Joel Granados , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3223; i=joel.granados@kernel.org; h=from:subject:message-id; bh=99SvQXLjoPiWd0/gxkEdf3AsdJ/IenQsyJp3SptYBS0=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGfTBki52Ay4X1MNDbXJN+xBjgEAqwuoqLgsZ wucLRs1EkUuOYkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJn0wZIAAoJELqXzVK3 lkFPE3gL/iS8YOsZuV5Wwt/XmvzPRNawgQ99iH2WAmO2xsfejsM8ubgObFTFQzfjqJ4PgmE0hFb i/Z8oF/qZ7ErQqxqREl1zbfIoDSewcIkbRKkjZnbWCIC1nnTznkg4yDBCItp2iUL0e1C+d/D9RC r58Qom/3jMWPJnz3+4s3EdxsmhU5fuKMUW5L7Taxd5kQ+jyaCGmEcmn2Ur/sV2odOpJP4dGB8Rn mu7natQ5G4AF6q/+Ks3dEGgvpjF+u1bmGK0eprBlSuYVkNZqBKPaCPZg9yK18VpkJiyJp3b4WEF AitFdryDXwRIqcGeh7wFX18xHBNtTttpC41wIXRifiArYummUuJSiAxf4oXWHgs/v8N02eVWgdr rXpdPq8l7bzr8QJXy2zy9LpqM5RTJ9t2Ba7qoIbCIG5ylAPIOeiLOusDRhAXphGrA7ff6WePjSN 8wELoqBr/+7bbdekdTGXZynwxAACHqhphUDy30SuxOICyl8gSrhozHAuqmqXhnJp4RgsV/JoXj6 WM= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 Move panic, panic_on_oops, panic_print, panic_on_warn into kerne/panic.c. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kerenel/sysctl.c. Signed-off-by: Joel Granados --- kernel/panic.c | 30 ++++++++++++++++++++++++++++++ kernel/sysctl.c | 31 ------------------------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index d8635d5cecb2505da1c08a4f70814e9b87ac3b37..f9bf88f4c26216cd5a93754378a36ea1e841472a 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -96,6 +96,36 @@ static const struct ctl_table kern_panic_table[] = { .extra2 = SYSCTL_ONE, }, #endif + { + .procname = "panic", + .data = &panic_timeout, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "panic_on_oops", + .data = &panic_on_oops, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "panic_print", + .data = &panic_print, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, + }, + { + .procname = "panic_on_warn", + .data = &panic_on_warn, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, { .procname = "warn_limit", .data = &warn_limit, diff --git a/kernel/sysctl.c b/kernel/sysctl.c index cb57da499ebb1216cefb3705694ab62028fee03e..7759b1ed7221f588f49ec3d81b19aeb4d2fdf2f7 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -1610,13 +1609,6 @@ int proc_do_static_key(const struct ctl_table *table, int write, } static const struct ctl_table kern_table[] = { - { - .procname = "panic", - .data = &panic_timeout, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, #ifdef CONFIG_PROC_SYSCTL { .procname = "tainted", @@ -1803,20 +1795,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif - { - .procname = "panic_on_oops", - .data = &panic_on_oops, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "panic_print", - .data = &panic_print, - .maxlen = sizeof(unsigned long), - .mode = 0644, - .proc_handler = proc_doulongvec_minmax, - }, { .procname = "ngroups_max", .data = (void *)&ngroups_max, @@ -1990,15 +1968,6 @@ static const struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE_THOUSAND, }, #endif - { - .procname = "panic_on_warn", - .data = &panic_on_warn, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, #ifdef CONFIG_TREE_RCU { .procname = "panic_on_rcu_stall", From patchwork Thu Mar 13 16:22:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14015407 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AD6D8268FDA; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882957; cv=none; b=ih6PwS7QQ0UFAI3ChJCRw1JYac69xCz6zQhT+UEL5fU8mbBoAUq9zxbis3EtzB+tkMrmR6X/ATrQkC23s+cDscRgNju1ZEyYEjX7IhJqTovizeg5zy+rXeMcOpqmoaFGDOu1wwROnIIFsSM1goACIe4CuWm76RJ7nVc/x3EpQFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882957; c=relaxed/simple; bh=fhQlgeM7080CJWOaBZsIZyVJ5TKnwevZMcoSC2ybdZQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aG5sPi4UV66fbASFeqc4fGxgFT5flDzs7PuoN9LAQa29C1WuZF7+6NwEE1+S+KO+oWyu3Go4LFxrh/iEls9ZD1tWFgpMS1XambgyvxIWwH6wTaYmMSjxZMj2PE/DoQvVA6LTr/+hpySd4Q89Q1Nmuqus5M3RoodKoAXNZ2qPt1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mdoaeJP0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mdoaeJP0" Received: by smtp.kernel.org (Postfix) with ESMTPS id 49AF6C4CEEB; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741882957; bh=fhQlgeM7080CJWOaBZsIZyVJ5TKnwevZMcoSC2ybdZQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mdoaeJP0nqabI+BeT8YIonLfd0f5QB5YbO+dreqyDa7iJVKxcwEuMVcIr746ViIYG Ig7M0JFTw+X1tMsdk0ewpzDEB0CHz4bEF+Upic9KiIJnMa2gPjsdjiFwhDtOGkxx7w n/AiZMKGlEdAtqctsZqwGSYVO8NpkDSlVxKq3Ghtr12o7OM7wEE7UL/aXzT3Mx/pr9 NwTdFhdZ5zsdalBQZvQzjMJ7BKXPD1lQ6aKDiRvWdxZUY9Z3ffl2ftw4ILcolIYMlh iTM9SgSZnvWzXtufYsbnWVC+gSbNg+Xr8oLb3bLekZ6pEMR+aJ2M+pV/w24LvK+pYb fudHRJME/gkNw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35D93C35FF4; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) From: Joel Granados Date: Thu, 13 Mar 2025 17:22:24 +0100 Subject: [PATCH v3 2/5] signal: Move signal ctl tables into signal.c Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-jag-mv_ctltables-v3-2-91f3bb434d27@kernel.org> References: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> In-Reply-To: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> To: Kees Cook , Joel Granados , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1894; i=joel.granados@kernel.org; h=from:subject:message-id; bh=fhQlgeM7080CJWOaBZsIZyVJ5TKnwevZMcoSC2ybdZQ=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGfTBkkHnWszfEhy1e1lBTDKXa5AVaVkp4UmM Mf3INLp/NWLE4kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJn0wZJAAoJELqXzVK3 lkFPeKgMAI2vXzhLEtEoUGaLnXiuYrqG/XYoXCD+SLcm00pOPFPqons9QovrJlAapqzvcqCQzFA HNlFrhEfHgB7xls52RQjy6TWlfE0J4Y0nTA6GzJUbfkSrwdeAGoF3U/w1Oit2JhyYvd23Lh9tE1 jrlgCCI/EoDZPLNP8I+CFLudtZAK0E6jqnCnhShWMj+/77np2jK3vtemPnQfMVTuUsDKFPIURnk KyRDBivTYPucZ2xF8jaEo1dju1lURmq7e+zGY3HwBJCyB/3ANZnhxGN/ysxDcCK6gL+CmoOZLiF ufex5uNJkfxo3nVyrhjYWcU0ag6H+SRnScwf9si9hRfaedc1+BTyW643ctz6W9zlK8wMgNhWiTi Wzq7RUPf7ghdguR9pvBLk8KPiBe5rqFCTHIvWa3plO2D0PrBCVq1dXw0ev+ze+cccljLResrI2g ltEqwYGXWc/syYoM1LLVj/cZDDP63E0fX8ExFlA+PEbQGu0vvZQa/gtNwNctjtpwSyxCFG+NId6 9o= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 Move print-fatal-signals into its own const ctl table array in kernel/signal.c. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kerenel/sysctl.c. Signed-off-by: Joel Granados --- kernel/signal.c | 11 +++++++++++ kernel/sysctl.c | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index 875e97f6205a2c9daecf5bece5d53ed09667f747..347b74800f927f70a1912457f96e833cd03c642d 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -4962,9 +4962,20 @@ static const struct ctl_table signal_debug_table[] = { #endif }; +static const struct ctl_table signal_table[] = { + { + .procname = "print-fatal-signals", + .data = &print_fatal_signals, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +}; + static int __init init_signal_sysctls(void) { register_sysctl_init("debug", signal_debug_table); + register_sysctl_init("kernel", signal_table); return 0; } early_initcall(init_signal_sysctls); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 7759b1ed7221f588f49ec3d81b19aeb4d2fdf2f7..6514c13800a453dd970ce60040ca8a791f831e17 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -1626,13 +1625,6 @@ static const struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, }, #endif - { - .procname = "print-fatal-signals", - .data = &print_fatal_signals, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, #ifdef CONFIG_SPARC { .procname = "reboot-cmd", From patchwork Thu Mar 13 16:22:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14015406 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABFBF268FCF; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882957; cv=none; b=qTzOIO2waVogmu2Rc8II/gJLDV0i+13ogHkzrTVc7QOukto3Bw/H3hVNIpxWuxbjgxzxAgr2e0sPnib9RV6OnOtGB+kctXS1cTXHyGz0v1t61Y5JFwZbzvtYSwP7W59NKhl6qGpphx8iU6Ra0oKywLR7jRmwT4YO3TvlRRv7+dg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882957; c=relaxed/simple; bh=ZGImg/UYYezAR5D62UZVHcZrdul61TJJRGPzQEXHI0c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Wj3E8MlsDWWAV2CvMeh1kuy+5nsUiaDn2l9Hz5NaT2+qv5I+WiNdZu3YYH28niSyEetLZvc9fnKVdKF7zMaxGzCwol8pBEqFaVvl7gEPR8MWraiZ5Y2mDLlijLZBgNPJL3xWR2owPCsiOsiXECp/CZ/OqgawrqGnRD7fTZHascE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OaqHAmOq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OaqHAmOq" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5543FC4CEF2; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741882957; bh=ZGImg/UYYezAR5D62UZVHcZrdul61TJJRGPzQEXHI0c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=OaqHAmOqtg/qwtLAc8weLUP0c2E8UCW+3nnHlwv/dDeFlmGGWHwMetiYgwaga5X/G LB7FgQCnehnjHW8+bcI9312HCfiqj+T/UkEsy5gTyOXllRJL+0aDQMrDWNZDiN7UQ2 +ABxA+O9yEYpp5jTTrwf00ozGCQL0GB7usEHWgzrzFu8O6gWIXXha77SPJ0OfBG+1w UpGvwLv3vbaIzbFtJ0mqV97j0hgS4WdfRK5kNiMPZrNjfWUGt1Srg9cN8+mTWq8ONa bJ52L3sWpDz7f2dDD9XdDmv6EnUll5BBCJdX6kS+BIpVh2NQ77uf1zSLiLewVRrME2 btzzJkaio3Ajg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49158C35FF3; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) From: Joel Granados Date: Thu, 13 Mar 2025 17:22:25 +0100 Subject: [PATCH v3 3/5] tracing: Move trace sysctls into trace.c Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-jag-mv_ctltables-v3-3-91f3bb434d27@kernel.org> References: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> In-Reply-To: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> To: Kees Cook , Joel Granados , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4358; i=joel.granados@kernel.org; h=from:subject:message-id; bh=ZGImg/UYYezAR5D62UZVHcZrdul61TJJRGPzQEXHI0c=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGfTBklj8jEAwyoKKKENR8Ja5tnyAuOwpd3A/ ikFhAEKdyevC4kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJn0wZJAAoJELqXzVK3 lkFPdxkL/1yOtb0UibDXQUSAEASNboEJAvpQhKERr51XWuDXEuao0qL6bQYvaXtIzIIT3HGAu8C 42xFXcGMEw9cVnz6ea+1SwrXExiXEsrLlqobfwiJDPlE3yXd7z9WphRUvCEHh1rHC9dV5fCvxrY vWXTCnnaD5rcr2x2zTwgWk6JqeJlJVQ8c/Rna/80zTzznqg8F+qznXSIkj2ZHMCwp58FfArdSqr 2ZNNqGfpYZKf4FPnWiGIk9a6IAFZgbWYmlTSAUskQ32Gk6KoMX2sdY2Mqc9d9FwpD4BV/9o+CIF 6PQ9ZzwRoIUPwGoWJtCImWOwxhNaDKiin8FSrOcUe1yOTPI8fo3QP0y3MZA41d/mVvt/VMutBz3 rLjfTdHkjVKLuCkhl/+0YMaQeXxwsAQS8WTD4PsVsFuO94A/gTf1+yAxBrxe+UuLdnPKYI4v7Hz tN10fTukaz4B53gpnQmkY5m1zhB0e4OX1dO/NIDl930CB08Txn8DNmcewdxYcHRwpezU/PKNJc6 Bk= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 Move trace ctl tables into their own const array in kernel/trace/trace.c. The sysctl table register is called with subsys_initcall placing if after its original place in proc_root_init. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kerenel/sysctl.c. Signed-off-by: Joel Granados Acked-by: Steven Rostedt (Google) --- include/linux/ftrace.h | 7 ------- kernel/sysctl.c | 24 ------------------------ kernel/trace/trace.c | 36 +++++++++++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index fbabc3d848b375a114936b635bc695d59ab018a6..59774513ae456a5cc7c3bfe7f93a2189c0e3706e 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -1298,16 +1298,9 @@ static inline void unpause_graph_tracing(void) { } #ifdef CONFIG_TRACING enum ftrace_dump_mode; -#define MAX_TRACER_SIZE 100 -extern char ftrace_dump_on_oops[]; extern int ftrace_dump_on_oops_enabled(void); -extern int tracepoint_printk; extern void disable_trace_on_warning(void); -extern int __disable_trace_on_warning; - -int tracepoint_printk_sysctl(const struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos); #else /* CONFIG_TRACING */ static inline void disable_trace_on_warning(void) { } diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 6514c13800a453dd970ce60040ca8a791f831e17..baa250e223a26bafc39cb7a7d7635b4f7f5dcf56 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -1684,29 +1683,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = stack_trace_sysctl, }, #endif -#ifdef CONFIG_TRACING - { - .procname = "ftrace_dump_on_oops", - .data = &ftrace_dump_on_oops, - .maxlen = MAX_TRACER_SIZE, - .mode = 0644, - .proc_handler = proc_dostring, - }, - { - .procname = "traceoff_on_warning", - .data = &__disable_trace_on_warning, - .maxlen = sizeof(__disable_trace_on_warning), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "tracepoint_printk", - .data = &tracepoint_printk, - .maxlen = sizeof(tracepoint_printk), - .mode = 0644, - .proc_handler = tracepoint_printk_sysctl, - }, -#endif #ifdef CONFIG_MODULES { .procname = "modprobe", diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 0e6d517e74e0fd19bfb31fcbcb977d57f894c78b..abfc0e56173b9da98236f83c715b155e5e952295 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -117,6 +117,7 @@ static int tracing_disabled = 1; cpumask_var_t __read_mostly tracing_buffer_mask; +#define MAX_TRACER_SIZE 100 /* * ftrace_dump_on_oops - variable to dump ftrace buffer on oops * @@ -139,7 +140,40 @@ cpumask_var_t __read_mostly tracing_buffer_mask; char ftrace_dump_on_oops[MAX_TRACER_SIZE] = "0"; /* When set, tracing will stop when a WARN*() is hit */ -int __disable_trace_on_warning; +static int __disable_trace_on_warning; + +int tracepoint_printk_sysctl(const struct ctl_table *table, int write, + void *buffer, size_t *lenp, loff_t *ppos); +static const struct ctl_table trace_sysctl_table[] = { + { + .procname = "ftrace_dump_on_oops", + .data = &ftrace_dump_on_oops, + .maxlen = MAX_TRACER_SIZE, + .mode = 0644, + .proc_handler = proc_dostring, + }, + { + .procname = "traceoff_on_warning", + .data = &__disable_trace_on_warning, + .maxlen = sizeof(__disable_trace_on_warning), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "tracepoint_printk", + .data = &tracepoint_printk, + .maxlen = sizeof(tracepoint_printk), + .mode = 0644, + .proc_handler = tracepoint_printk_sysctl, + }, +}; + +static int __init init_trace_sysctls(void) +{ + register_sysctl_init("kernel", trace_sysctl_table); + return 0; +} +subsys_initcall(init_trace_sysctls); #ifdef CONFIG_TRACE_EVAL_MAP_FILE /* Map of enums to their values, for "eval_map" file */ From patchwork Thu Mar 13 16:22:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14015405 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEFC5268FDB; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882957; cv=none; b=VEm1ZFj7D5uiETm3fovC+9YYtLNMwZzZm0pdprpNK86r7iZm7xXhxqPuXxpWYQyb5uu5PpWS37+eqzT3TA1vNjs+x+/64tzZFk4vpNZc3QQIJZbb64yyf2NJHou6g+sNWJpm/Eroa4gGEGltvDhFITCjO+FNs12lmf295pH/y6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882957; c=relaxed/simple; bh=MfSHnyZm0yVz16E71tES1BWKJpkHw6ZtGzY9orpm0ks=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jIwtqk2IQpO+1uAwcJGxTQTtlzW6PhyxrfA0+UpoxYHFLfWeLBqbsd2HoCEMZfjvThKCypvLRJN+OnNSMy6J01hDuLBUxZD3DKBp6hdXm2vOAf0wtCMDUZvVLPWX0Fg0u3qjtw1IE4Xj5hirWU0G+jcPpOqVLbJS5AUAeaqnzWI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dyX2+cwm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dyX2+cwm" Received: by smtp.kernel.org (Postfix) with ESMTPS id 60965C4CEF3; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741882957; bh=MfSHnyZm0yVz16E71tES1BWKJpkHw6ZtGzY9orpm0ks=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dyX2+cwmhKdvGCW6WrgOQ7gtPk4B/c733iJojDtU9rMtjtp+I2CdtG9zaAPCFWomz 89BVpPjf/ly8+cb4OzqlLiQZ9ok85vJf6wblHWDZDc9Jn3LkMeuBuGsuX+eqsA8WIU kP9AW7vNOslVwRTU4+4CLvduFp/QQsz2O5zefdbjXjMgeByx7Kv/NZ+y+gO/KIohNY 9eo0vLSO3E/YKN3i4Gl73vngZy+nQQ5DdjZ7H/KhjvthO4zKaoSsUi+T/IUqRec7TV gEB8+2zPc6HaySnBBjZu6iMtLwJXvj9NLTB96WI4zQJx+Vtdxsjgo2pP0A+TfZctCO 06QoS8aAHBp+g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55A90C282DE; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) From: Joel Granados Date: Thu, 13 Mar 2025 17:22:26 +0100 Subject: [PATCH v3 4/5] stack_tracer: move sysctl registration to kernel/trace/trace_stack.c Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-jag-mv_ctltables-v3-4-91f3bb434d27@kernel.org> References: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> In-Reply-To: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> To: Kees Cook , Joel Granados , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2758; i=joel.granados@kernel.org; h=from:subject:message-id; bh=MfSHnyZm0yVz16E71tES1BWKJpkHw6ZtGzY9orpm0ks=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGfTBkoivtPbtMABnBvE2KmMz4XYD8Cn2nTWJ z4m5ek2+gN2mIkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJn0wZKAAoJELqXzVK3 lkFPi2AMAIo1WRv089+BmxGptd/TJePHQVLa7cdoYx+DnuWWEF5qUWkDia4wlCQ1t1NxbD2UnVH zE4JGfXONaiyWyoRVHHg8/VGZsPjrsXL/XQvt8sohtDZeKTiHoafh9Itd9zobXxJU6AcRoa5W36 mEgSjO4nd2+yt6Q2b/5WJVT6/1CpDVYKK93dYuz4kMXY6CB/NvoBM16rhuLoK6xdsYQVaUZ7SWt J9R70xYY2E9tLBre+0hMMDj2iCHI6WxJJ0EQI6oP0kk7pLQBYWclmTVwvbp5emqXmtCq2ASLHZh Nzr5WHhJOdGKuH6+vOCubjmX8qCKRQ65HhcViojv4DBx+vMFlsQkp1rv8/PHk2H1kKlrlz6nxLu iWN7yTNr20CubFYKWcjxemnBI2Ai2kjxvEKh9GgZbjeXCQh9HvIZKxVVzZW0nQJO0UEBOjKJzux 5iv9+vQ3GKuXOGlCEfXOWAmwXMAktwC5mpYYQGv3ly5K91gW4AO564EaR5X2j/Gya4t3Z6g8227 RU= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 Move stack_tracer_enabled into trace_stack_sysctl_table. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kerenel/sysctl.c. Signed-off-by: Joel Granados --- include/linux/ftrace.h | 2 -- kernel/sysctl.c | 10 ---------- kernel/trace/trace_stack.c | 22 +++++++++++++++++++++- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 59774513ae456a5cc7c3bfe7f93a2189c0e3706e..95851a6fb9429346e279739be0045827f486cbad 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -569,8 +569,6 @@ static inline void arch_ftrace_set_direct_caller(struct ftrace_regs *fregs, #ifdef CONFIG_STACK_TRACER -extern int stack_tracer_enabled; - int stack_trace_sysctl(const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index baa250e223a26bafc39cb7a7d7635b4f7f5dcf56..dc3747cc72d470662879e4f2b7f2651505b7ca90 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -68,7 +68,6 @@ #ifdef CONFIG_X86 #include -#include #include #endif #ifdef CONFIG_SPARC @@ -1674,15 +1673,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#ifdef CONFIG_STACK_TRACER - { - .procname = "stack_tracer_enabled", - .data = &stack_tracer_enabled, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = stack_trace_sysctl, - }, -#endif #ifdef CONFIG_MODULES { .procname = "modprobe", diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 14c6f272c4d8a382070d45e1cf0ee97db38831c9..e34223c8065de544e603440827bcaa76e1894df2 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -32,7 +32,7 @@ static arch_spinlock_t stack_trace_max_lock = DEFINE_PER_CPU(int, disable_stack_tracer); static DEFINE_MUTEX(stack_sysctl_mutex); -int stack_tracer_enabled; +static int stack_tracer_enabled; static void print_max_stack(void) { @@ -578,3 +578,23 @@ static __init int stack_trace_init(void) } device_initcall(stack_trace_init); + + +static const struct ctl_table trace_stack_sysctl_table[] = { + { + .procname = "stack_tracer_enabled", + .data = &stack_tracer_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = stack_trace_sysctl, + }, +}; + +static int __init init_trace_stack_sysctls(void) +{ + register_sysctl_init("kernel", trace_stack_sysctl_table); + return 0; +} +subsys_initcall(init_trace_stack_sysctls); + + From patchwork Thu Mar 13 16:22:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14015408 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8364269839; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882958; cv=none; b=AyFntcLd5KX7pgY/gRLn1AvUjNvZHykFWBNMehForoFOfmjg+PkB+Y0vG9SnL77Q9Fn3hy1e6atv36G4hAoYFqAw51+ERCG2o2kvMRSLAqlFYzCapxvSv9vbtR8yzdioKgqrZjY3rN3EQ1cG6yqHj7wWHC/19xQF4KrJhxzYHbg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741882958; c=relaxed/simple; bh=hkSbq8mw9Uv98PWKXr8NFUOiogiYljqa0LH7OwMpcTY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FfQAqjNP0VwM/iC0gfi8CNVMz85KMaRDEDLBLqWTiiGwFjbgQEbmdeLOPNPVKl2XoeCk7q1dEg+9viyGxAkm9izIb4sNtF0+RohRgA8AEdOAwvcc+MmfcXvVoYmn/pyXzuSgpZNNgnpngcdc+Brt/uPcUORlNQV0ZRC00kQvekQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pCji8syH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pCji8syH" Received: by smtp.kernel.org (Postfix) with ESMTPS id 70FE6C4CEF5; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741882957; bh=hkSbq8mw9Uv98PWKXr8NFUOiogiYljqa0LH7OwMpcTY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pCji8syHUUiP/wNAh7ynqqKZAytlDyNabA4+4ZatFkYGeoZDhJUOjYA7yO3csvZa2 bL9uwd4EzajibFO43DqTSESeFZah3pcG+Klqpng/nFGpP5jRH1aZ7k1LRlk9OrL9ou N6hvzY8ZIhHFs2mJxxst8iBhtW3aYHZPkXI0fhwqiIT/6b5a9P1CCMppA8gCsNbLfL plWbB7onqnlLOF/QHJRdxO+dvtCmNYZarhfs+P1Nd2INpIR+VTsjEgLdyGphbcWfvd hbGR5hQgbdGCIocbtCfQGSYMUtQNK3OB711U1lWv1bKNDkfBC93djrgMDiETwED6PW teh59i6U8K+kg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67A01C35FF4; Thu, 13 Mar 2025 16:22:37 +0000 (UTC) From: Joel Granados Date: Thu, 13 Mar 2025 17:22:27 +0100 Subject: [PATCH v3 5/5] sparc: mv sparc sysctls into their own file under arch/sparc/kernel Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250313-jag-mv_ctltables-v3-5-91f3bb434d27@kernel.org> References: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> In-Reply-To: <20250313-jag-mv_ctltables-v3-0-91f3bb434d27@kernel.org> To: Kees Cook , Joel Granados , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3848; i=joel.granados@kernel.org; h=from:subject:message-id; bh=hkSbq8mw9Uv98PWKXr8NFUOiogiYljqa0LH7OwMpcTY=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGfTBkv27n1nFXAthabFOHvM68bJ7QLsY2p7Z 2GlQp3/K7or0YkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJn0wZLAAoJELqXzVK3 lkFPUhwL/2L01Xy0xGbZwBGfwHQRvlt1wWnyv/infvtLOHz9wdgdnBlNC3pvAkzHy4Ol0Ms43D0 bKmhqK3wIpxatgwTtisllTMk3HbaZ88S+ANApw2u7Max2h44bNgZGBRGdA1IWUnRyUmK+xux3R4 PsRFA1VTpEVHX3PFQBlT8NgMv++7caoGXPdoev7W2LDE+oiLUnDcwWZrf8pOp6ZJIO3vzYCQ6e2 B0KgnnBRroxlfKrFB6vpo9Pvt0p9o89lpy/XvIWUGmf0BrqZxkkq2nHiWlD39S0pEHtmHtByVj1 f94j+LpSpdkghRicozTt+wBq3cT1Lr5ayKbErr0f7ThqiZlDEcG8L3tM6IhitN3aJ/1dcxspu1W pqp0y2jxQthhRHlRyeKtqI7w+jHeDN58x8hBeOL2KYV8Tj8uEGDkiSigndBHygE9Wvw6UnHeE8s XOkGBmRH+gP4lgJkbPvj/Yg39jbL+P/+lrXk4EE++CPW9CxgiCZYNvZIDsijNyolW5oH2DgAAW6 No= X-Developer-Key: i=joel.granados@kernel.org; a=openpgp; fpr=F1F8E46D30F0F6C4A45FF4465895FAAC338C6E77 X-Endpoint-Received: by B4 Relay for joel.granados@kernel.org/default with auth_id=239 Move sparc sysctls (reboot-cmd, stop-a, scons-poweroff and tsb-ratio) into a new file (arch/sparc/kernel/setup.c). This file will be included for both 32 and 64 bit sparc. Leave "tsb-ratio" under SPARC64 ifdef as it was in kernel/sysctl.c. The sysctl table register is called with arch_initcall placing it after its original place in proc_root_init. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kerenel/sysctl.c. Signed-off-by: Joel Granados --- arch/sparc/kernel/Makefile | 1 + arch/sparc/kernel/setup.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 35 ----------------------------------- 3 files changed, 47 insertions(+), 35 deletions(-) diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index 58ea4ef9b622bd18f2160b34762c69b48f3de8c6..3453f330e363cffe430806cd00a32b06202088b3 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile @@ -35,6 +35,7 @@ obj-y += process.o obj-y += signal_$(BITS).o obj-y += sigutil_$(BITS).o obj-$(CONFIG_SPARC32) += ioport.o +obj-y += setup.o obj-y += setup_$(BITS).o obj-y += idprom.o obj-y += sys_sparc_$(BITS).o diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c new file mode 100644 index 0000000000000000000000000000000000000000..4975867d9001b63b25770334116f2038a561c28c --- /dev/null +++ b/arch/sparc/kernel/setup.c @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +static const struct ctl_table sparc_sysctl_table[] = { + { + .procname = "reboot-cmd", + .data = reboot_command, + .maxlen = 256, + .mode = 0644, + .proc_handler = proc_dostring, + }, + { + .procname = "stop-a", + .data = &stop_a_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "scons-poweroff", + .data = &scons_pwroff, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +#ifdef CONFIG_SPARC64 + { + .procname = "tsb-ratio", + .data = &sysctl_tsb_ratio, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +#endif +}; + + +static int __init init_sparc_sysctls(void) +{ + register_sysctl_init("kernel", sparc_sysctl_table); + return 0; +} + +arch_initcall(init_sparc_sysctls); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index dc3747cc72d470662879e4f2b7f2651505b7ca90..0dc41eea1dbd34396c323118cfd0e3133c6993a1 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -70,9 +70,6 @@ #include #include #endif -#ifdef CONFIG_SPARC -#include -#endif #ifdef CONFIG_RT_MUTEXES #include #endif @@ -1623,38 +1620,6 @@ static const struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, }, #endif -#ifdef CONFIG_SPARC - { - .procname = "reboot-cmd", - .data = reboot_command, - .maxlen = 256, - .mode = 0644, - .proc_handler = proc_dostring, - }, - { - .procname = "stop-a", - .data = &stop_a_enabled, - .maxlen = sizeof (int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "scons-poweroff", - .data = &scons_pwroff, - .maxlen = sizeof (int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif -#ifdef CONFIG_SPARC64 - { - .procname = "tsb-ratio", - .data = &sysctl_tsb_ratio, - .maxlen = sizeof (int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #ifdef CONFIG_PARISC { .procname = "soft-power",