From patchwork Thu Mar 6 11:29:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14004303 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 F3C6020FAB2; Thu, 6 Mar 2025 11:30:50 +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=1741260651; cv=none; b=PZaHEe0jNLn3erjYrAcM8LA0e1Qh4XWPUnmSDcFQVI4cSOE5hM6JlFPJbH4araf0M1PSgWMB08UChcbhdpawLapacPKrS6oi+BdiRJiCzMKtdD24dMoQkWNqnqvCWiXnAWggjDdaH0UYwUzNVUAGZMHccSHQK5WSg5hxh99Nk3w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741260651; c=relaxed/simple; bh=99SvQXLjoPiWd0/gxkEdf3AsdJ/IenQsyJp3SptYBS0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eIOgOKnbWDfnkY+9lyHaNBOtCzMcsn0pXG/nbYEzvZzMuHiTS3Zl1jFpTPVM27/g1LWjp8McqJLerCMQWtz6EinNmE/IAMNszuiU/C9P89Ee91Hg5tY4uIPEJ/ptwJWhfzoWydBqwpRvsTOLbgvKs0RVOIXIE4B0f6VZmeitlCY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MsB+83JE; 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="MsB+83JE" Received: by smtp.kernel.org (Postfix) with ESMTPS id 75BF2C116D0; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741260650; bh=99SvQXLjoPiWd0/gxkEdf3AsdJ/IenQsyJp3SptYBS0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MsB+83JENy4bW9g3bpjuwmP+kbUNdrl+d5CcB2Oh40EK1W71V2APHKE2BSu8QIY3A fF14Q3RAbdy60m9iEJEZUir2FEfkPNZeRNcE5yLyXwiy5IN4/lX49lrYTbG6O2XgXe nVQ30B1isqj0ZK+W3Kjaik7vSrdmWTS08LQ1RxjNDFKsYxSoYhy96m7uByjscoJf6m ouU9CSjVPJ75QDLiEdUjNWHj83qADURumwXwhKe91ZwMAiUskN/bdDRQD1jGJV3B6O gePzK8I/FtpK+6G4EyRCpJsD0HwTiqT6SAvtMAKpy78mazJQ0CrnnsT11c1EoNBRmB UZUITlPwwDH2A== 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 3271EC282EC; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) From: Joel Granados Date: Thu, 06 Mar 2025 12:29:41 +0100 Subject: [PATCH v2 1/6] panic: Move panic ctl tables into panic.c Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250306-jag-mv_ctltables-v2-1-71b243c8d3f8@kernel.org> References: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> In-Reply-To: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Joel Granados 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+kA0DAAoBupfNUreWQU8ByyZiAGfJh2UQmfyhQ+EURZAkXCrvML2DKQGqYGu4r aqjXVDEii6Yi4kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJnyYdlAAoJELqXzVK3 lkFPdYAL/j/eLPROZngY5rs5T5RaG4XQ/S80kGl9A+zpvq7RocnU8PM8Pc7vCZaCUN5AaJs86xy nILcjVhHH4miZlpoNJlyIAxgadB/xyzrwYGGClLFUlH5vk2KfU51blKWPkY1MURehM45fGvKmPI d1vCwcBkbaJoOPOu0h6HFEqxNU/fCalmQQACoIaw32o298YJ9sl1zqxIEcbOgB6S86NZaEz67V8 5UMaJQe7g+5y4bixa6gjKKQZ/stWF5fNu6AlcHqYZBz10aiaXRX0/ucaSrpBY54T+zox+ukxpEO JiPCRQCIR9IGXLX8PcTrTDe21NqX89Z3shcCI2ciUNfP//GduQsnMHiTrjUQstTYUIQTvrLwnwG 8kyvBiZTBR78AFImMgCQ9TpfVYnFGCYMMFIcB1OXH9zub6zyV6kFyX9vAP6uwisccl6nWBIo5RZ WbSO9xaefycxW8NJsDn5VPoZQfm6xb1GQM4P61CkaYmcLVVv/SMLGmRvhy0C2CKo75meAIiAFp7 H4= 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 6 11:29:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14004305 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 5A4C2210F58; Thu, 6 Mar 2025 11:30:50 +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=1741260651; cv=none; b=kppkVoBSZbEilROks06RuBYkTct37ZbZomhOOesLDAa+G+1MOuTvwzGX9j3nH6ElcZ7uy6xNebIannW6ns1gql9kzAHJ87iZw4SI/6EqgSWdY4UjupGYPaZuCfKIeTQBSZLILLcRGxPgWna0j7m/ddSO45ujjldhNtVCTy6+M7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741260651; c=relaxed/simple; bh=fhQlgeM7080CJWOaBZsIZyVJ5TKnwevZMcoSC2ybdZQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u9KFsWTvkGPf5+nRSSPNjQK0K/6wC3ayBoGEu7qgh2aLiwcN9IlHsEB/rZK6VRZ6aTBlhPDH3x7Nlgov8TrhIl9VQ9BI6BfTKbznU263vi2VoKrOq7xf98yLOHH1b3k03vrPAznkDEb7eEsf7cJDZucIHJkd2sGO/uyknv6AdSI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RSWvHOKk; 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="RSWvHOKk" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9CF3CC19421; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741260650; bh=fhQlgeM7080CJWOaBZsIZyVJ5TKnwevZMcoSC2ybdZQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RSWvHOKkqbyq+edYsV7k2bVxXSHxzsUYkV91kPnuucULito4vazQHLKKwxWhq+Z8i vRsSdohj6f8tEgGR6PgBI1mr5vcZqpuzHATgtaCTLzja6B4yNQc+jCrAcPdtx/3G1s pyQx0hXRugt2/x9T6XF0ukiGs9PCE3Ng/unfsHjhCd6aiHbL5fVFLciqJQvVGA3Ntb i2KclE3tpBK/JGiltn5ZES3CWmHxnmXluJPG4p4NIHghy3DR9USYk798XJfTRJWHAR vYoYzX8YoLHVRQpO5IQEgR/XwPNOfnsCZ2ynFrXqo3G4k3dH64zcu3WWtAgQyMsHhl 0sSU16wbRZd+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 47066C28B23; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) From: Joel Granados Date: Thu, 06 Mar 2025 12:29:42 +0100 Subject: [PATCH v2 2/6] signal: Move signal ctl tables into signal.c Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250306-jag-mv_ctltables-v2-2-71b243c8d3f8@kernel.org> References: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> In-Reply-To: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Joel Granados 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+kA0DAAoBupfNUreWQU8ByyZiAGfJh2UTXEzu0WgygPeZiXETdqZYBW4AhI+L2 wex0xcjKUNMuIkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJnyYdlAAoJELqXzVK3 lkFPhP0L/0CjZzf6n8ONSUqEp98+SyqFfv+Rse0jy35dqF9Kk6l1XXbkVnLlCBZJAaM5tbbtAkU h0NjWh+3SUDMDpUYx2Vmmh/ORpl1HKfpyqCyTCfIouOSFccDQUzaUuccHWwEpV3wEtCFpOLBaQS ccuRo7oGzM5b2pqxxz/sk2WlUSavAv7N+YVmF7OKol3J0QyXmeFSAI/lrxCjHHph8NHPGYPeVuC drEzm9bJ6tgCuqQZc1Or/KfQoVGdWvmNmxFddMeYcmRhzk4i6R++UZfEHQ0EIUCuzdepJhaSoqa xvWc2xhhLAUm7U42cSHHTlHSQzI7MGrBZJZMiDpc+jsKvILWsLkQPAiQkWF0/G1cFJpgV32SAkg a741Q8IABMDSRXB03nLZfk6dJ5G1tk3bXgdQHU8Ue2ALJupaqHBNVGCGHBalGT3Noed75KJXQjp GB3dtJaX8LPD7XkDrJ/JfR+lYTIOEU9eruRs8C632wFVnrpMTPZtGtboF/oKDkPmAfkV6AhXiY4 W4= 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 6 11:29:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14004306 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 8F20A21146F; Thu, 6 Mar 2025 11:30:51 +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=1741260651; cv=none; b=Gkg6US2bJVG6su2Ppc9+LrpVKNt2xNYtMDyMuhJ+ptSyRn3vapPKIOx4OyXr11TZktQ37p8LT/Cq4Q3Pq5Q/BjAT98oPjX2B3Bz/92vlV38EjbJhVFjCujxu+LvG7oqIVTM8SdBwutt6B5Bix55YLbvOh0SR4E0z0wyT1EZXAtE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741260651; c=relaxed/simple; bh=ZGImg/UYYezAR5D62UZVHcZrdul61TJJRGPzQEXHI0c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NtSslA7T/ukPd4ob7VkjnFS+sncxiajObc5VPg6MnBPF/XECrE8hKZ4gbrq59fzQJ1fPzrZgVIaz+P9W7YzQ4OHcR04qzjqkK0mk6R+5Q/5R62n7KWPNfDmZOgRGXITCu/HMuG0w8vtfcaW5txhv6iH9NZypQFHdTmg8VVkQiA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=od1hFtev; 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="od1hFtev" Received: by smtp.kernel.org (Postfix) with ESMTPS id A1BAEC4CEF3; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741260650; bh=ZGImg/UYYezAR5D62UZVHcZrdul61TJJRGPzQEXHI0c=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=od1hFtev8vOHDyt+xVc76OXjnrQ+Z7WoOcYWsOOvYWq+fDgJLpUOUAhDaiYqmaSfb cGvNmfoJU95GYGMjkf8ht1MaEDdwGb8oeP3qyJzDSY67b4cwFaEmWQXGeGlxYqc3F2 YPPJu6sCVlxP6UuyTRl6InyUhK+UdajwcsfKbWXYBrNV1n0LHdK8/sZLtOa2evAWB0 0z+M2NZcxRybOgFSyPrUUFModZovM9dFlpf+bH4caKGel+MRX3w/Y42I/sti+UjuqJ Mewg75Fvcg3x1jjgRkd4BoV1SwfyAmnPZ5brcEgKMGM8y7BlaQtaHb+jFdm2PZAH05 64YRIcOCn2peg== 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 5DA04C28B25; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) From: Joel Granados Date: Thu, 06 Mar 2025 12:29:43 +0100 Subject: [PATCH v2 3/6] tracing: Move trace sysctls into trace.c Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250306-jag-mv_ctltables-v2-3-71b243c8d3f8@kernel.org> References: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> In-Reply-To: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Joel Granados 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+kA0DAAoBupfNUreWQU8ByyZiAGfJh2ZMHgvJA1hAZ2oP8UKZpf9ClnId1YpxB uRWaDd9vXmbQokBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJnyYdmAAoJELqXzVK3 lkFPjb4L/2shEqvyQIAHD1M1hHWpj/FmBZw4hdK1zqHCqNR0mh8w3gRieLGnd3MiDmygGsrDxGg m2j/mc9NhwXXkgdx+ii3ad4LxpkR52F+9BBAjdCpCbj+3XiJbdbgRZYHr1qIJ/5Lt4A6zFoiLWF NZ6dgC+Z9EMpVTqRrmE5Tabk/3aNiEaGWM5soUpk9ScFl6iGDG1wQuuyb1edyAk5LHS1IwUj4yG CpOziO/gNCgCaUwN/3AEIaxlnxke0FtU/AFXGhxPrKruW+pC/mayysA1twVpOEPYBh44U7tbbzz HtZhbnfQLm/e31B8+F6E/hmFyRgPo+mQcShDo8BBFh/3cA5s4Q/IItTFOS/zR/N76jFHRV/SnrV RKpY9+yVFoRWZ/teybEInZ8S+vQIBoHyamQa8fFDwSN4h3NyXYTLrqNIgQqKF8vkhXjsS8eiTXH QWnKgGlN8fhlLt27nB+tRDf+w2mT+hWMq4tSlCnlq5ivEUBOnKmArrYVW6f9Kh93FtMiS8Srbq6 d4= 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 6 11:29:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14004308 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 A788F21147D; Thu, 6 Mar 2025 11:30:51 +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=1741260651; cv=none; b=fuvBp/TZilrh7HUVbvXvyGJE0X+DFGWoGX5KDbhWas548yKJ2PKk77fNL8Yctee2aC9nb9Pb3Qx+uMTqfpYwRuLGMMU4M0Wniu0lzCXbvCV+tiNggU7zCjshPMCC7LdeK2JHo5YSuTCP2LfI56ZSeMjE7VvzmP7+MqvVuFocnlo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741260651; c=relaxed/simple; bh=pNjcBvmaJVdCgzpg/FmoYLnX8KqZ21YzHmxlpf6uAsM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SHtxM9j5IPi3vY4qK1Y68n+RjIsvOFqMCYuhUhk5i+89Yf2fQ7W30ULIqqtHMQ9ZvzAJHQz0tDEF+mHRwAQbNIoEenDejkAG2mbS8iNpwhCK8rJdp3l308EDS9HhFIJplt/7+DTzM6IpAtpo92Ks93fW1vKhBX+nb85W49OJ0B8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GZBW89u6; 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="GZBW89u6" Received: by smtp.kernel.org (Postfix) with ESMTPS id CDC53C4CEE2; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741260651; bh=pNjcBvmaJVdCgzpg/FmoYLnX8KqZ21YzHmxlpf6uAsM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GZBW89u6dY6ZDKGI8jm2kcYJdvMfYktmE5U5Hg/X0+d4hcwwsCGd5tgcTNZWolk0E l37fHZxWuakNu2wev2/6BLCwQr7+z2w5LMo4k4YHeAe1nBgcLr9yEw4IMrxTcoicrH FV7/MpQi5Iy+BPS4x3QdZznEW5yt+NFcBUtG5qgopt0BnxG3sBwsKm1Nz3YOgqSntd ZDqObPnSP7vSqYr/PHSr26G0PM6n3E6Oe+lCJIxEEB+9SsheI5g549AQFu8SKmiFq+ WFwVjp92SrTgSnpard/r8XWStztl8J3GfKOYVf1kXJD2yZcIAzMXTeT2RPVpLtukMR LFjBxlEFQvT+Q== 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 6C8F5C28B27; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) From: Joel Granados Date: Thu, 06 Mar 2025 12:29:44 +0100 Subject: [PATCH v2 4/6] stack_tracer: move sysctl registration to kernel/trace/trace_stack.c Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250306-jag-mv_ctltables-v2-4-71b243c8d3f8@kernel.org> References: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> In-Reply-To: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1944; i=joel.granados@kernel.org; h=from:subject:message-id; bh=pNjcBvmaJVdCgzpg/FmoYLnX8KqZ21YzHmxlpf6uAsM=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGfJh2alAR7cgQ9qnoQ1dS1TtnuKGA+eVEsFK VJ3ED1gF8zG84kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJnyYdmAAoJELqXzVK3 lkFPccsL/R6gdkbabbHbYIySeuZWAhaEq69GXChzsk4MkziXKdS1nqhAQRyagOvwm3v4TLsQ5wn EeSA8nqBfgCSzv3Zc4J8jPsoIB1r/WAYBivWOm9s4+nlfGKX853EnYVMzFQoQda+uxN4nXvqdD5 jYnjRDFXtobyLtlB3wEXvxHsLU2BwzRKeSk0U6ymKOaFutC5iLl3Ts/i2pgTqhUVtGR9xDE/AUl FvZKvdvnGnTcWq0kPwYcFDeADGJqtJwOZBFXF6B+du5+Qfc/mFesuMLMN1gNg/4pX4XMoSHS+GR phhE6S6SwL/M/XUCsM2Hq0JGz6fJBzfrbEC+thYwoxiGtDKAA2ZcrY/au+3bqtzQ06U674AeYRH saCxNzr960/eGSe4Hn6RkOY02dvH3Uy0e1MDCwE8qe00EGCWf6iUe8lTPHetI0nUOqcujw+td2r 9uMmTB1rt7y7AC+VnEahIQQxPWfR4PP2ojmk2bwBptsB3O58TTI9c2RPCsqZaDAR0/SBlU6HEi5 eI= 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 --- kernel/sysctl.c | 10 ---------- kernel/trace/trace_stack.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) 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..b7ffbc1da8357f9c252cb8936c8f789daa97eb9a 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -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 6 11:29:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14004304 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 5A531210F5B; Thu, 6 Mar 2025 11:30:51 +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=1741260651; cv=none; b=Qko91uAMUg7tDl1xILdULH2QbDBAgbtMxOHiCk5U6QpbwlEIqu1OWmf+fP81XXm5+Ltu2O0B3KxovlzexYiW2P+VJDSun7RwdLdhgcaUqU9ojcY73mbs5rvBww1ZM3qDAI4SUv0DtLNXuumusJzivIiQdVqifeM+T6dylMR/kek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741260651; c=relaxed/simple; bh=hkSbq8mw9Uv98PWKXr8NFUOiogiYljqa0LH7OwMpcTY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LursgZUi2SMKQz6PmoUjgJEYufHa3mpwAPu3DTzEl+mdnb8KmzQAkhc8OTZ6sxhKTtOhglW2sUfmGRxJgpYv2q98IdAtcrRH0MIPHaG22PAJztYZRhNBdzcNHrwVkt+3Vh9hry+klCMYcxiDJkInYS0ESQF4vpywuLVuIDH152c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=myq4Htet; 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="myq4Htet" Received: by smtp.kernel.org (Postfix) with ESMTPS id CDDBCC4CEF1; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741260650; bh=hkSbq8mw9Uv98PWKXr8NFUOiogiYljqa0LH7OwMpcTY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=myq4HtetG1EbrMJ87O4rWmeBcu5kUIx4XylZ/xmWrGGZ1fPGQF/+BwtcH8P3Mp286 jQQAV5IrRIASQCC8BEsCXrhRMIjEyEj4fnBYfuGeUMMCXRZc6lyt52r7u5T3f+c6WR gAneFxdHRlZUYwk2D9ynBo3m3VoQjOUo+AP5Voh/AzaCBZVm7V93ZgX9QXB0gOnZK6 g2OuCefvljFU1iL1TvZvC98va7FZlqmLMYdqZ04xpHXzyPHV2K1iWoZBU16Z2qnM1P avA/tRmsQkv/La/9nYsjYOCOOeFhqobWQxNAGyk4vqBD4PLqr94wOMXNzHPXwjT1qr dseMkulbHQ8YQ== 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 7FBFCC28B28; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) From: Joel Granados Date: Thu, 06 Mar 2025 12:29:45 +0100 Subject: [PATCH v2 5/6] sparc: mv sparc sysctls into their own file under arch/sparc/kernel Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250306-jag-mv_ctltables-v2-5-71b243c8d3f8@kernel.org> References: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> In-Reply-To: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Joel Granados 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+kA0DAAoBupfNUreWQU8ByyZiAGfJh2eO5lVLjXgiAsNO3sdOE+S7/E9nKWo7e cYViU1dn+HE/YkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJnyYdnAAoJELqXzVK3 lkFPIuUL/10CdnnBV2W5FxoLqEWelLIC1A1/yV64PD3YPmjJFsd9eAM5+J+87QWxopqYtrtshB+ E3Y+u2y6+visLWI7nDh4tUI62vSt8g/jsuA7othOvYgtVrYDnYEzKVOiZObE3emwUs3D2jezcma kv1FqagAWhOwh7XGDXY6CkrNow7Zaj1dNC18hb2WCSoDrXKsqtJCvkDyH1reS9KvHYdJkCl/cGt ka792gzt6+ZHOiO6YUpOAMHCIRjeCDHOlin+jvbW0hd1TQqbrVbOsMPaZVfmHZysEx1dV+6YFVo bWPLjzmBPErrIzyCvDJYbLrusG4a9Y3S9C/oFsBMBB52nDiRTjTbDUUkz85AheJrJZTi7+XlmCc OBMUXhjBopF9pDN1dq4+3du2oJNlXZhCuQRZDAo+zNeJtakVPGhRMssFI+xCCtfGX0IiM8ptoWV 4LNaP0sFNc5lBTRjsLo8ZIdq6e86sTHoFlDn+Lddp2l6sWUWr2RLhm9v93mOVMRoIGLlw+++g75 8g= 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", From patchwork Thu Mar 6 11:29:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 14004307 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 C6D68211497; Thu, 6 Mar 2025 11:30:51 +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=1741260651; cv=none; b=XOr9H12UPUZrWg9NCyl/rtuXJEnFfdjTN7hXvl2PJUTyLtZbYJUbR31/cVklFcwB5eoqYbHI15Vb5sAiUn3eA40Ovd6lrEK/Dhw7FH1r5YRRzLjJKg/3AjC4MDguWVlw6g4wBr3XES3TyaNgQYeS4FwSwkgW25rPxjWGEdNueHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741260651; c=relaxed/simple; bh=r81yvisX8P4UQm9F7N7hhZ732PaheqwD7Ks9SFpA+WU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WGZ/YGQe5rWNkInhN+Y5sTGVtrenmmk5yA6Nhk0uFtWnKce9uIp4qFQ6xw8QshZAqVoaCApkefPNVKcRYA7XlcXcqGbIJ33m+BbL2wwElrFi6c8qt1sOhVv3kmpOsGpLUZW/XGilVEViY4lBosn4SidnZkxwfUOOc6DQpw4Uk9A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ler7t8+S; 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="ler7t8+S" Received: by smtp.kernel.org (Postfix) with ESMTPS id 04DD3C4AF0C; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741260651; bh=r81yvisX8P4UQm9F7N7hhZ732PaheqwD7Ks9SFpA+WU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ler7t8+SANzyxeocUaVFF0itfXjdU/AePkZgfwecSb9/3uHn9EJLYdOl7yEWWt26X gfbgXEaTJbubb6zSFxiE3MJRKjpQXwfLp+1G9BSGiWCqMOTvaKavbo8xZt0/BrR1yQ xn/1Ptu59MizrbpA03exoCIx/1pM/xhK+vQSaXF1DemvPMQ4BB+ko4e3aWSoWZmJSo h+loNjGifVudVHzlXFeQCHsKVqs/vwkDcO70Zfm/Qg1PgQ/lR7aNYQu7I7CYExK744 r8T5gba64BoDYPfa2j0BfACWYY/s14KBueIuTPUCOSNxF9bxT0pNglBNMAlCWu/Ipr eqkJb6AowxlqA== 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 968BAC282D1; Thu, 6 Mar 2025 11:30:50 +0000 (UTC) From: joel granados Date: Thu, 06 Mar 2025 12:29:46 +0100 Subject: [PATCH v2 6/6] s390: mv s390 sysctls into their own file under arch/s390 dir Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250306-jag-mv_ctltables-v2-6-71b243c8d3f8@kernel.org> References: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> In-Reply-To: <20250306-jag-mv_ctltables-v2-0-71b243c8d3f8@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3591; i=joel.granados@kernel.org; h=from:subject:message-id; bh=r81yvisX8P4UQm9F7N7hhZ732PaheqwD7Ks9SFpA+WU=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGfJh2hk9Sl4d4/rt7M4Iv2CUUdgG9l340yBQ 6BGtdUWhlaPu4kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJnyYdoAAoJELqXzVK3 lkFPr9cL/joKGCY8wwMfNbIM/wGecy7g3xyX2KarUDFaSjpCcTGPnu4HHo8U403Jd27W/skMAG9 oVpxYveO27v7tBMjjMuxmOZ2oslc37sV8r1ghd2AHHxFE5PgLHtp7EfmYoySst59SKwIxWndwjd pVILJ97rkV8dNy4VuIkf7vRkIY8TpezV37Bg3nOiStdEeBer8CwF8/YNWojUb6oF0liBQjLvBRm /n81HLHBv64bVKMcW/82pwTrAvtP4Skk4na6AF25lC0iSWmP3k6iPhLrV4XCy+EbJnQx4XYhmOd 8/AZE8B8v7esZrpw0FYYg3004UQ6mS9KpGFBjcNCE/pxhBPfeC+MRj24JINqy1oT/bZpXK3fr8H AMu//ZLi/gEZ7QS6vGYkolT5M0Bvq6tqF3sOhc9tEp5zdaTOCasIU05PpbNWFzq0JbHpFvox1Lh 3bc6S5+/kikkHL42qGx9Ze7F2QAn/4jFnKdY7QjIHiCbAv/SWJhKXtDQLxZ6maCcIhK1UKBDPI7 W4= 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 s390 sysctls (spin_retry and userprocess_debug) into their own files under arch/s390. We create two new sysctl tables (2390_{fault,spin}_sysctl_table) which will be initialized with arch_initcall placing them after their 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 kernel/sysctl.c. Signed-off-by: joel granados Acked-by: Heiko Carstens --- arch/s390/lib/spinlock.c | 18 ++++++++++++++++++ arch/s390/mm/fault.c | 17 +++++++++++++++++ kernel/sysctl.c | 18 ------------------ 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c index a81a01c449272ebad77cb031992078ac8e255eb8..6870b9e03456c34a1dc5c0c706f8e8bf1c4140e8 100644 --- a/arch/s390/lib/spinlock.c +++ b/arch/s390/lib/spinlock.c @@ -16,6 +16,7 @@ #include #include #include +#include int spin_retry = -1; @@ -37,6 +38,23 @@ static int __init spin_retry_setup(char *str) } __setup("spin_retry=", spin_retry_setup); +static const struct ctl_table s390_spin_sysctl_table[] = { + { + .procname = "spin_retry", + .data = &spin_retry, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +}; + +static int __init init_s390_spin_sysctls(void) +{ + register_sysctl_init("kernel", s390_spin_sysctl_table); + return 0; +} +arch_initcall(init_s390_spin_sysctls); + struct spin_wait { struct spin_wait *next, *prev; int node_id; diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 9b681f74dccc1f525bafe150acf91e666a60d2bd..507da355bf68271c30115a797368f950707a2d8e 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -175,6 +175,23 @@ static void dump_fault_info(struct pt_regs *regs) int show_unhandled_signals = 1; +static const struct ctl_table s390_fault_sysctl_table[] = { + { + .procname = "userprocess_debug", + .data = &show_unhandled_signals, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +}; + +static int __init init_s390_fault_sysctls(void) +{ + register_sysctl_init("kernel", s390_fault_sysctl_table); + return 0; +} +arch_initcall(init_s390_fault_sysctls); + void report_user_fault(struct pt_regs *regs, long signr, int is_mm_fault) { static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 0dc41eea1dbd34396c323118cfd0e3133c6993a1..34c525ad0e0e0fe3b64c2ec730e443a75b55f3a3 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1709,15 +1709,6 @@ static const struct ctl_table kern_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_MAXOLDUID, }, -#ifdef CONFIG_S390 - { - .procname = "userprocess_debug", - .data = &show_unhandled_signals, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif { .procname = "ngroups_max", .data = (void *)&ngroups_max, @@ -1798,15 +1789,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#if defined(CONFIG_S390) && defined(CONFIG_SMP) - { - .procname = "spin_retry", - .data = &spin_retry, - .maxlen = sizeof (int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86) { .procname = "acpi_video_flags",