From patchwork Tue Feb 18 09:56:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 866483 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 4EC78200111; Tue, 18 Feb 2025 09:56:45 +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=1739872606; cv=none; b=Ol9mT9LX8holFdakJKC3JbOzKT92vQolgjytzPhQEhlfVMyDCi9rI/JdK65DTRRgfHEkGIRPD8JJ6PxgO6lcv1uOmrk5QN/kkKPOnRowC8knPsRCbmE6gUL7NlKpYPIbbBfzTCXGnyFWWV4K9w5ncNR+f50cXFgkQkow4SKhwy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739872606; c=relaxed/simple; bh=NyFjle3l0026Gd8PBKMPo4EmMXIGmeeTI/HzQnjZhwo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fOUkPDDWJiz2up0RWG/5MFwf8fDt6K8cVq6UPb4T3IcTp3YQP60dRAEn7dff0oB0pmwMPJh02ZAUXb3JgX5HjqOkScwfUnKlc53R6V0bnkbJxC3ttqQqMO5LjNOc7y8DUV1btb8qvSd/ggMS4rOvuFAr29aGgfH3JorsF9UC12o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=swFHRr0t; 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="swFHRr0t" Received: by smtp.kernel.org (Postfix) with ESMTPS id A93C3C4CEE8; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739872605; bh=NyFjle3l0026Gd8PBKMPo4EmMXIGmeeTI/HzQnjZhwo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=swFHRr0tDDufCCwCcsmIuxhpVCjoWLszRL/1eJdiJg6oXKm87Kv7AJt6wcfTaSmcX fq972tanKzPkgD6kSLevKopQ9pBsqeHV6wiJ9cdhNBMOohMpnF4H2u3OGqzeZudZ0Y E/h0F2SMeYWytLUBLkgeH5zJfBVgJfbTt/i787BdPv6LG5APnTir1sgZ2b607DiM/a TyUhnOFZLMPB2NvNechpgtN9Od7s9FVG8xUhCwr3fnilKTpsGd/dzOlAhXbCWbQfL4 CLNJenH6NTW2iiWgXVEMfxXCrm7I3iBs/n6G9aZpWmZZZKkd7T1P3JiyCKhIQjfUd4 dIrkVYtYBG3Xg== 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 92BCFC021A9; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) From: Joel Granados Date: Tue, 18 Feb 2025 10:56:17 +0100 Subject: [PATCH 1/8] panic: Move panic ctl tables into panic.c Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-jag-mv_ctltables-v1-1-cd3698ab8d29@kernel.org> References: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> In-Reply-To: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linux-acpi@vger.kernel.org, Joel Granados X-Mailer: b4 0.15-dev-64da2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3111; i=joel.granados@kernel.org; h=from:subject:message-id; bh=NyFjle3l0026Gd8PBKMPo4EmMXIGmeeTI/HzQnjZhwo=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGe0WVcAzJMiraNriDVA+Jt05tU4vLaM0b9zm pQ2Aq7OP5eX/YkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJntFlXAAoJELqXzVK3 lkFPLfAL/20rjwkdDzYb51zKDdgXrnBcdHhkgJERVMP5kLuoDZPIpCzZp0dzglrDGrmWlA8rhxN NQU/dO9PP0QZrfy/Hfe2s8RXLT20avONnO7wYWu18KpWrTsp6TWbmJ7Zw3nAzDrGhpM+kO8VE2z IQntkQdUb1PWcV5Vm2G5GzZ01F6vKIVWYRw/z/gNZQF8csmvMOmkOIu+irJCgNCzhygDkPmhzDY efozZo2EblyEvFTgKPaP2s13syORR3hbJc4QjhOP57eR3WBTD+0GSaFFL0rIEGk++DJCX9VXFjM Cud8ZlqEMrbXPiE4LIWZsa5ce4O2Ik2fAPxhBwPWwE27VcFmVwE08vnP+EurCOP7EBMst60ZQPC KFowdYMyOAKk6890XxRSNZ2dYj/lWpNAjY6wgZPxVb9COHxmqfmT22EGGtdlw5rOJM0bMQop0PP vEgf8A6vjycLBM+VlS8tZpT/YLtLex21joa/9v6Wvmj7UWlN+ibSIzK/WRs1HVOWVIhWAVmnBQ6 Qs= 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 d8635d5cecb2..f9bf88f4c262 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 cb57da499ebb..7759b1ed7221 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 Tue Feb 18 09:56:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 866147 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 4ECDD22D7B1; Tue, 18 Feb 2025 09:56:46 +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=1739872606; cv=none; b=frNBt1snvwtD7qCCUyKs58FEpKvaVjg0wYBedHhGNajJYxkF4vXA244IxQmw6meXsg91lzFcSNEVtGpdVHyB9KzJdof4+zd60sU4Srtok93CbAVh9x+PVIUQgePyRPYl7jAjlxvVNOhO3zOV/pnwa+a9oXIQ9WTnFeI/f6FY/ic= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739872606; c=relaxed/simple; bh=bNOhzTe2prG7ApNrzEgxiz1fkHFIuGiO+IoM7HFyf6g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=F1JQvZg5vUGYq8EtPa601mG+2IsAqiVj9qsFJFTbaBvHD5687HKx+zFyczTyNZ8a5ED0roakpivsP/fgJhSKr7yF7f/JoLSf5s4PYxo1EmtmSpJKGJ/iz8nKNDTEmT97/BbV+8elWuHHaLGYwW4W1WlEFJrBdYmHVsu31Vvevcw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Tg0r8JyG; 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="Tg0r8JyG" Received: by smtp.kernel.org (Postfix) with ESMTPS id BDC74C4AF0B; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739872605; bh=bNOhzTe2prG7ApNrzEgxiz1fkHFIuGiO+IoM7HFyf6g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Tg0r8JyGfalSHtuPxOPpDJOJd/eVr2t83fDrx8ZUQS/AcUBxpr+MEZDisVIhSqUA0 BLCJjHTRX13/9Wm+utObTLrcG9wYvanaPzmsHSvdE5kIKaWwYrRcXwPhW5+RRNKsIN zAjbs2OuuiUBfg8NB+olJY6MkxyC6mkrpsw4mDi8pghzg362Sy9QSR7/S0jEU9JwJl Fhct8cHfRFFiMeWxyY28IayLd2FUWpxQK0n/TgBZQ60JR2ixwnd0Bg0XCE5hxg99Kg e4Qy1bRWa6HHn1C91PTFeY4clmfzPchKss9YKmtBZCKxMNBLolfBoLyaMykcKOKfF/ EFZ8TyXOobPrA== 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 AB1F4C021AD; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) From: Joel Granados Date: Tue, 18 Feb 2025 10:56:18 +0100 Subject: [PATCH 2/8] signal: Move signal ctl tables into signal.c Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-jag-mv_ctltables-v1-2-cd3698ab8d29@kernel.org> References: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> In-Reply-To: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linux-acpi@vger.kernel.org, Joel Granados X-Mailer: b4 0.15-dev-64da2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1782; i=joel.granados@kernel.org; h=from:subject:message-id; bh=bNOhzTe2prG7ApNrzEgxiz1fkHFIuGiO+IoM7HFyf6g=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGe0WVePspv5KFWYMyxxLrq5NdT/+kjWQWT00 rb5ohuXmdhRRYkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJntFlXAAoJELqXzVK3 lkFP/xwL/iWUKDAOOAgg2CCZDNJ/yTk7qhzst2m5RCQY9Y9zkZd8qKFneoSuZFOUv47OcPnifVs PRXUs74ZHqQKYph9Cc+Lxv1aQ/ur/PUH9bxmz2ZaXGaLF7WrOymkU8yQJf+YHZLE8RAxjeOL6rt cYouRwqv6R4TQUOt947+voVAO/nYSGPzQ6gce4vukbpBnEou2q05GRROklOEs7HtAuAKQ8LL9sz s9LunTmFGywtFwEXwfxl8tgrWi88kRV6TKTLhCCwwHVh5lW8g0Ee24SvTIDuvQqwYib7KBtXlyI J6XG8Puogwm2gxIEuR+whFOP9c9prA/d6sLn5ItTocmOUzF7oKb1a4HFtpoxjI7nNVNWye1z7LR AzxihVlvEG6A8lpIx7lxKdbaD7DOkbbSTLfARmcA9nl4C2cakCWzx8hI57bcJUrJmDRqMolX+qm LmCj5YMEOQfmswhrtpm6mEpxZElhKQ/QruoIC34NUUc5tQkBqW7VxMxIEX7kTXV63PjbIzceDX8 I8= 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 875e97f6205a..347b74800f92 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 7759b1ed7221..6514c13800a4 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 Tue Feb 18 09:56:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 866148 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 4EC1118E743; Tue, 18 Feb 2025 09:56:46 +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=1739872606; cv=none; b=itoUYTDg+vzLIOuO/CDMQsNSQnW8ly8WXfXtuzpcwUvXWhSffkIWXkqIh+pRrfFd8UaZoB+HbCSIzC8ES1FjufY6eOB0n93C9ZWifa57urMFpK1vcbsD1V2dh5lR8oQqOB9Thu4LPzOP5shopdtlGYBIlxkTmMuW9oc/NAMTXFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739872606; c=relaxed/simple; bh=gKOcrGpQjahVvJdglNWmSaswvExwnbWiiSjSH90VtpI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gwrcND5wrnqPPmcHDA2aeTStrXbmHd+gP0Z6Kqln5oUhq4nvaax2+MItt9hDopb00ufhGZ6wt5GZ2ckwXSCD+xY+s8m90pG0ocdgwTcuI/wJTmQs5rN3Ryr3v4B8+VZLYMbHHJzokICID22SQxAvlYUoETr/P8oogIa3Yy7Ij0Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fsAAAuDU; 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="fsAAAuDU" Received: by smtp.kernel.org (Postfix) with ESMTPS id D6103C4CEF0; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739872605; bh=gKOcrGpQjahVvJdglNWmSaswvExwnbWiiSjSH90VtpI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fsAAAuDUrmTBpjf+pPR7mbS+SCq/vkH2zq/1nUArctmJSEhpXQaGCLTRsO1lEjITT yUREgDThnSIf+e3NvsnzKLR7oojEzmy36xjSo2gJIvdK+xvOqZybKW+Fmkt5wXv+zH 2WEtIe6URfhy3zia00dCQf2k+67D52yFXuMwYH9hudxB7jvfC4xbIfvxnMU/BJSelk t8jnfB5wFK/fX439Xvj+mYoSv+2bTKUeI6shdsp0gUfStGEgYTUuLWbMVfQVzVmZqu ufBRMhwTww2nNjVba9gwRtyS2NMvw3XhyrG1ckv3LMaW2G/q25Nr18zkOfWd1wWB5O 31cDuFMuVUsFQ== 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 BCD80C02198; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) From: Joel Granados Date: Tue, 18 Feb 2025 10:56:19 +0100 Subject: [PATCH 3/8] ftrace: Move trace sysctls into trace.c Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-jag-mv_ctltables-v1-3-cd3698ab8d29@kernel.org> References: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> In-Reply-To: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linux-acpi@vger.kernel.org, Joel Granados X-Mailer: b4 0.15-dev-64da2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4133; i=joel.granados@kernel.org; h=from:subject:message-id; bh=gKOcrGpQjahVvJdglNWmSaswvExwnbWiiSjSH90VtpI=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGe0WViZ+1Utx9MJcRoUlK2QW6VYygMERf4Hj Ahbcaguu2zpRYkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJntFlYAAoJELqXzVK3 lkFPUJQL/jbOqbjXit8Gy+oxvkYPcsV3ssL8il7SReg2PhRCFIkA8a31a0iIhDGRtpwXwz0dq/L CTmsWNMTMapxBbmyinvlCTFCMcpOx/B3JWFdM6uyNCy10Xs8H5VU9U3TTQz6rtqj6z8Jmn5Xcv8 N1iJ+rsM0qDsa/wx8gf/A/HeVwZTKfj+VIHAgVfT5TDGFEzx22C2VSNzhPSIrqz7EdPifNzrche xdbRsDR4QYqveSKRYOetQqkaond55zNApIJDcYyAwlm0C4uCz0YkP5M2g8x2T1Wty6sF4bNIJEV MNHmOB0GLYo799ehS0P5B7D5Bp9JYw+HO90bKQ972uCB5tkrT/rKCvvCvpVIvLNuMnQOfnv9Gf/ KeqL8S5Bxe/pNyeTSdwDzuMwaQg0jNgs1IT5V66G+5GNJH8k4P7ifO11fAXVH2uCAMx33e+lFHn GomuRYKFW6gRomNXfz3vj++4G17yWSAJ7co6mnb6DNf0+cg1LAjG9QhSrMvJl0tqlx2P+Hk8HX5 o0= 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 --- 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 fbabc3d848b3..59774513ae45 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 6514c13800a4..baa250e223a2 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 0e6d517e74e0..abfc0e56173b 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 Tue Feb 18 09:56:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 866482 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 71C4A23236C; Tue, 18 Feb 2025 09:56:46 +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=1739872606; cv=none; b=dxNhqyVPp47OLezlKkmTjLOeCeG+RR/jC5mVojum2yCuWELc6VttC4ZIX2TPgVpfDv2ONLIQtyVfzBs3r8IJxuBPiFlNznSJUyxH+JOEZQ0bzj2lh/w9bGXzrciBG/MiqnLPdaLRPd5I8iVuHkRHV4Mkbd5zsr/BYDBQTr9qWiY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739872606; c=relaxed/simple; bh=/zlS+ERKpHQA2aoOnRoLZTEBI+gUJf2tLAkgKfYYCdU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PS13FPmdMjYKhyh+zA334dFh80jKEfy4u13O1o5+m32mDNdPxysyqwpczKmL4e2Jn7R/s8BYUJjnthuPOpekSh7ZsaFHAQlx2VV1h6bx/2kCn/Qc5nNJk0X6DYyhczndRt0/WhTJgXq9SsHFSENCeIN2yKfnDQeccmPJ4pOG4bc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DjhuPBGJ; 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="DjhuPBGJ" Received: by smtp.kernel.org (Postfix) with ESMTPS id E5518C4CEF4; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739872606; bh=/zlS+ERKpHQA2aoOnRoLZTEBI+gUJf2tLAkgKfYYCdU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DjhuPBGJxNIYqaSDxD0vmLIFjXsBaypNsQ2fs4F9xvtVB+3QmPkXkwwgOWa+L2QFH gu987r3eZifQRDv6y2S1D3CFJx517YX2B/eiZhjmc1BGm4io6DD9BksFr5Zb8vUNbl bQj3reOJ75do/9cX5Io0fGNyY0T0EJnnTRg5Xd7QKdfRl7FQr9v2gIl4wllvax3nSu BwK2C6/5va4x5VZNZgOhbC+kufBaZYhKE+9thHC6i3wGA7il8hUCwcSREh3fGd+iiL v5beL8Gi1TGU1GHn+As49+1wdDKCcngOe0RQsccWxqbsSPQHJd5dEFuHAM1Wi+MToO PnooGR1T2OcZA== 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 CDA7FC021AE; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) From: Joel Granados Date: Tue, 18 Feb 2025 10:56:20 +0100 Subject: [PATCH 4/8] stack_tracer: move sysctl registration to kernel/trace/trace.c Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-jag-mv_ctltables-v1-4-cd3698ab8d29@kernel.org> References: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> In-Reply-To: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linux-acpi@vger.kernel.org, Joel Granados X-Mailer: b4 0.15-dev-64da2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1714; i=joel.granados@kernel.org; h=from:subject:message-id; bh=/zlS+ERKpHQA2aoOnRoLZTEBI+gUJf2tLAkgKfYYCdU=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGe0WVgdnOsE2LBo8sB/PcaBKZaaLibVcy9tY 2cjMrYv0U+1SokBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJntFlYAAoJELqXzVK3 lkFPbOML/0BkZif9lQxXAdndl9X7PkO/IgNY0ckRwVnf7HmurT96PjRSjAl0K33it31UMHgqcww TMbcoOexxyIjtASGitj1+XNcHLZQ3Sv+/hr4mMkM7aON5Bk0oorTMMuLax3QcBlwb1vWB/z2oDE DMMF+n2jmRDwJzUBj3HXxfvdEZ0YaY+SQcsjUacWIi0e8cVVYrDOCZdEnRvuyRvyQ9qsVzh0Goz 9rm9S0sPxFmy+KffZNDwhtu7QRiqAsdwMf01NQ5g66X8b411lmdcL3vmkpgTGIihRRvhenvvmEI ZKuF75x54ZN4vZBQXSmrSfPlf70tzJfEUBP/JPVZzmxVOMSR4dxYdnk/U1oyUt2ReG5f1tLsWJa 6Sf61IHCPYcer+yZHZ6xXIZAIMsWOBPWTTlfhhcB2QxSudCyzr87kIOROJFjn+pbmC/KAwu/zLl Mx/JbvEHQC6B3qjQaQyxUxyx/gdDc+Rqt92K0r4bXnKeVj4TXZ7bPZld7So6BQBDOCV0Bfjv8C6 z8= 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 Squash with ftrace: Move stac_tracer_enabled into trace_sysctl_table while keeping the CONFIG_STACK_TRACER ifdef. 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.c | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index baa250e223a2..dc3747cc72d4 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.c b/kernel/trace/trace.c index abfc0e56173b..17b449f9e330 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -166,6 +166,15 @@ static const struct ctl_table trace_sysctl_table[] = { .mode = 0644, .proc_handler = tracepoint_printk_sysctl, }, +#ifdef CONFIG_STACK_TRACER + { + .procname = "stack_tracer_enabled", + .data = &stack_tracer_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = stack_trace_sysctl, + }, +#endif }; static int __init init_trace_sysctls(void) From patchwork Tue Feb 18 09:56:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 866480 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 93376233155; Tue, 18 Feb 2025 09:56:46 +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=1739872606; cv=none; b=JYPOFLlLfiNUrfb3GQWfqN1iB1tA0U5RMAeViR/dDOuklld6mN03gmzn+lyqK7sHF08LE0Cf1fxp1HQ0+rAX47DSX9fqJs/2hUG43oS92OdUIUUPRHK8phfYqJTLLsq1eGOLfERWsk9dQpb+uH0YXWCLkQxcHn/2z8XCGQFkvrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739872606; c=relaxed/simple; bh=ec+FA3bJhRbXcy44mL0olZwg4DCvtazy/yRT+8kvChY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ylxz5PwX4C39Z/zYoaY8xTIQU/PlL5CDitVGYXp8ngQMU1KS45Hp7fFhUaap6zZQTjVaoaBADKKJb4RPvf/R+5tdgBHW21NnFinlvGR1iZX7FarpWxkNLGtQHUuqPTOXNBOtwQqWkhl/hbtGC17ksuG/6QCUTReGvDtqYI3Xxgc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mq4wG/wX; 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="mq4wG/wX" Received: by smtp.kernel.org (Postfix) with ESMTPS id F0275C4CEF5; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739872606; bh=ec+FA3bJhRbXcy44mL0olZwg4DCvtazy/yRT+8kvChY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mq4wG/wX0fCB0VL5nhi+lFBk/iJXk0oNlnvWSvD2yVB7MdbNX44SUp4Kqlk4apwvD S9Od0pQJIlk32D0wQs+tiQnHKc37Ay1Pfr0q1Q8N+BQv28A2x+NsvTBy9PfVNAp/1y TBmlFaKEBPs8sWyKz3dUs130DmI/fEmRck4esvLGjmDfRgq+TAOX3RyudbXWKEMhGc ZsclT/zcw6BcBpr6PR6OdfUcNUoPcQDq/ay7X/KoCPsKjLqeQgBOQVz43IU3NE2roV 1Yg0htV8iUny+PxDDIKIlSUwB9DhGCB/8f+TghMK/RkJJmov6/p6QYkzRwEX+YxzKY OU5bEdZETAcoQ== 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 DCFCCC021AF; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) From: Joel Granados Date: Tue, 18 Feb 2025 10:56:21 +0100 Subject: [PATCH 5/8] events: Move perf_event sysctls into kernel/events Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-jag-mv_ctltables-v1-5-cd3698ab8d29@kernel.org> References: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> In-Reply-To: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linux-acpi@vger.kernel.org, Joel Granados X-Mailer: b4 0.15-dev-64da2 X-Developer-Signature: v=1; a=openpgp-sha256; l=10332; i=joel.granados@kernel.org; h=from:subject:message-id; bh=ec+FA3bJhRbXcy44mL0olZwg4DCvtazy/yRT+8kvChY=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGe0WVl4I3BgQWKHSlxKcgbAbttCoqSWTuqv6 E2K55ipFuPqeokBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJntFlZAAoJELqXzVK3 lkFPov4L/RxARj9V/wFZMdAdHvvAdNNNOGecvUbb5RcX9LmCIH1ffYRA+vpEsrxQr81qFqysDjN Vedrg2sG3GXwbK+AvI7bbh5a/qrrtSURVs1JSqWyVHc3olvazvg6RwBFXprR/Iwqqv7MVKDWlMu N7duPFpbjZqFRP/g3KxlBKUc80Sy2A42bP3H1Qmx1g4lDI2AJqf0Ozkrpw3D77p+eFUs7Mrp8hI 5n6DCzWKHSIVWF2qmMR7T35tdEftGxSw+uFU8DPZCBv9AQxpSjz4OnUmTXoNdBMEjPZ8gJc+vyf 77WXvsBXxN3/GQwY1dI1pa8rxTTrUgO7MhvvxN8xd/1oJKecjUtMbdehbgdCpV7xdF1NGvwWdGx hsS5Be3VxuZ+cHM+xUgMV7WHSZOLlU7KFyzi7guNab1Ncr8xS7+eDIshIyfJIbNTj91LNiVbOBS AEpcfTffEUYJOxygd7R5/GqX7eSLArk2LJVCHd8SusvHNbUJGQX6cPCrqv4WoEHKFIW27QGmmX8 mg= 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 ctl tables to two files: * perf_event_{paranoid,mlock_kb,max_sample_rate} and perf_cpu_time_max_percent into kernel/events/core.c * perf_event_max_{stack,context_per_stack} into kernel/events/callchain.c Make static variables and functions that are fully contained in core.c and callchain.cand remove them from include/linux/perf_event.h. Additionally six_hundred_forty_kb is moved to callchain.c. Two new sysctl tables are added ({callchain,events_core}_sysctl_table) with their respective sysctl registration functions. 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/perf_event.h | 9 ------- kernel/events/callchain.c | 38 ++++++++++++++++++++++----- kernel/events/core.c | 57 ++++++++++++++++++++++++++++++++++++----- kernel/sysctl.c | 64 ---------------------------------------------- 4 files changed, 83 insertions(+), 85 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 8333f132f4a9..a92ade5d62be 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1646,19 +1646,10 @@ static inline int perf_callchain_store(struct perf_callchain_entry_ctx *ctx, u64 } extern int sysctl_perf_event_paranoid; -extern int sysctl_perf_event_mlock; extern int sysctl_perf_event_sample_rate; -extern int sysctl_perf_cpu_time_max_percent; extern void perf_sample_event_took(u64 sample_len_ns); -int perf_event_max_sample_rate_handler(const struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos); -int perf_cpu_time_max_percent_handler(const struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos); -int perf_event_max_stack_handler(const struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos); - /* Access to perf_event_open(2) syscall. */ #define PERF_SECURITY_OPEN 0 diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index 8a47e52a454f..6c83ad674d01 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -22,6 +22,7 @@ struct callchain_cpus_entries { int sysctl_perf_event_max_stack __read_mostly = PERF_MAX_STACK_DEPTH; int sysctl_perf_event_max_contexts_per_stack __read_mostly = PERF_MAX_CONTEXTS_PER_STACK; +static const int six_hundred_forty_kb = 640 * 1024; static inline size_t perf_callchain_entry__sizeof(void) { @@ -266,12 +267,8 @@ get_perf_callchain(struct pt_regs *regs, u32 init_nr, bool kernel, bool user, return entry; } -/* - * Used for sysctl_perf_event_max_stack and - * sysctl_perf_event_max_contexts_per_stack. - */ -int perf_event_max_stack_handler(const struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos) +static int perf_event_max_stack_handler(const struct ctl_table *table, int write, + void *buffer, size_t *lenp, loff_t *ppos) { int *value = table->data; int new_value = *value, ret; @@ -292,3 +289,32 @@ int perf_event_max_stack_handler(const struct ctl_table *table, int write, return ret; } + +static const struct ctl_table callchain_sysctl_table[] = { + { + .procname = "perf_event_max_stack", + .data = &sysctl_perf_event_max_stack, + .maxlen = sizeof(sysctl_perf_event_max_stack), + .mode = 0644, + .proc_handler = perf_event_max_stack_handler, + .extra1 = SYSCTL_ZERO, + .extra2 = (void *)&six_hundred_forty_kb, + }, + { + .procname = "perf_event_max_contexts_per_stack", + .data = &sysctl_perf_event_max_contexts_per_stack, + .maxlen = sizeof(sysctl_perf_event_max_contexts_per_stack), + .mode = 0644, + .proc_handler = perf_event_max_stack_handler, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE_THOUSAND, + }, +}; + +static int __init init_callchain_sysctls(void) +{ + register_sysctl_init("kernel", callchain_sysctl_table); + return 0; +} +core_initcall(init_callchain_sysctls); + diff --git a/kernel/events/core.c b/kernel/events/core.c index bcb09e011e9e..3c3d95312c28 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -452,8 +452,8 @@ static struct kmem_cache *perf_event_cache; */ int sysctl_perf_event_paranoid __read_mostly = 2; -/* Minimum for 512 kiB + 1 user control page */ -int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */ +/* Minimum for 512 kiB + 1 user control page. 'free' kiB per user. */ +static int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* * max perf event sample rate @@ -463,6 +463,7 @@ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' #define DEFAULT_CPU_TIME_MAX_PERCENT 25 int sysctl_perf_event_sample_rate __read_mostly = DEFAULT_MAX_SAMPLE_RATE; +static int sysctl_perf_cpu_time_max_percent __read_mostly = DEFAULT_CPU_TIME_MAX_PERCENT; static int max_samples_per_tick __read_mostly = DIV_ROUND_UP(DEFAULT_MAX_SAMPLE_RATE, HZ); static int perf_sample_period_ns __read_mostly = DEFAULT_SAMPLE_PERIOD_NS; @@ -484,7 +485,7 @@ static void update_perf_cpu_limits(void) static bool perf_rotate_context(struct perf_cpu_pmu_context *cpc); -int perf_event_max_sample_rate_handler(const struct ctl_table *table, int write, +static int perf_event_max_sample_rate_handler(const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) { int ret; @@ -506,9 +507,7 @@ int perf_event_max_sample_rate_handler(const struct ctl_table *table, int write, return 0; } -int sysctl_perf_cpu_time_max_percent __read_mostly = DEFAULT_CPU_TIME_MAX_PERCENT; - -int perf_cpu_time_max_percent_handler(const struct ctl_table *table, int write, +static int perf_cpu_time_max_percent_handler(const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) { int ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); @@ -528,6 +527,52 @@ int perf_cpu_time_max_percent_handler(const struct ctl_table *table, int write, return 0; } +static const struct ctl_table events_core_sysctl_table[] = { + /* + * User-space relies on this file as a feature check for + * perf_events being enabled. It's an ABI, do not remove! + */ + { + .procname = "perf_event_paranoid", + .data = &sysctl_perf_event_paranoid, + .maxlen = sizeof(sysctl_perf_event_paranoid), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "perf_event_mlock_kb", + .data = &sysctl_perf_event_mlock, + .maxlen = sizeof(sysctl_perf_event_mlock), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "perf_event_max_sample_rate", + .data = &sysctl_perf_event_sample_rate, + .maxlen = sizeof(sysctl_perf_event_sample_rate), + .mode = 0644, + .proc_handler = perf_event_max_sample_rate_handler, + .extra1 = SYSCTL_ONE, + }, + { + .procname = "perf_cpu_time_max_percent", + .data = &sysctl_perf_cpu_time_max_percent, + .maxlen = sizeof(sysctl_perf_cpu_time_max_percent), + .mode = 0644, + .proc_handler = perf_cpu_time_max_percent_handler, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE_HUNDRED, + }, +}; + +static int __init init_events_core_sysctls(void) +{ + register_sysctl_init("kernel", events_core_sysctl_table); + return 0; +} +core_initcall(init_events_core_sysctls); + + /* * perf samples are done in some very critical code paths (NMIs). * If they take too much CPU time, the system can lock up and not diff --git a/kernel/sysctl.c b/kernel/sysctl.c index dc3747cc72d4..fdc92d80e841 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -87,12 +86,6 @@ EXPORT_SYMBOL_GPL(sysctl_long_vals); #if defined(CONFIG_SYSCTL) /* Constants used for minimum and maximum */ - -#ifdef CONFIG_PERF_EVENTS -static const int six_hundred_forty_kb = 640 * 1024; -#endif - - static const int ngroups_max = NGROUPS_MAX; static const int cap_last_cap = CAP_LAST_CAP; @@ -1869,63 +1862,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#ifdef CONFIG_PERF_EVENTS - /* - * User-space scripts rely on the existence of this file - * as a feature check for perf_events being enabled. - * - * So it's an ABI, do not remove! - */ - { - .procname = "perf_event_paranoid", - .data = &sysctl_perf_event_paranoid, - .maxlen = sizeof(sysctl_perf_event_paranoid), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "perf_event_mlock_kb", - .data = &sysctl_perf_event_mlock, - .maxlen = sizeof(sysctl_perf_event_mlock), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "perf_event_max_sample_rate", - .data = &sysctl_perf_event_sample_rate, - .maxlen = sizeof(sysctl_perf_event_sample_rate), - .mode = 0644, - .proc_handler = perf_event_max_sample_rate_handler, - .extra1 = SYSCTL_ONE, - }, - { - .procname = "perf_cpu_time_max_percent", - .data = &sysctl_perf_cpu_time_max_percent, - .maxlen = sizeof(sysctl_perf_cpu_time_max_percent), - .mode = 0644, - .proc_handler = perf_cpu_time_max_percent_handler, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE_HUNDRED, - }, - { - .procname = "perf_event_max_stack", - .data = &sysctl_perf_event_max_stack, - .maxlen = sizeof(sysctl_perf_event_max_stack), - .mode = 0644, - .proc_handler = perf_event_max_stack_handler, - .extra1 = SYSCTL_ZERO, - .extra2 = (void *)&six_hundred_forty_kb, - }, - { - .procname = "perf_event_max_contexts_per_stack", - .data = &sysctl_perf_event_max_contexts_per_stack, - .maxlen = sizeof(sysctl_perf_event_max_contexts_per_stack), - .mode = 0644, - .proc_handler = perf_event_max_stack_handler, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE_THOUSAND, - }, -#endif #ifdef CONFIG_TREE_RCU { .procname = "panic_on_rcu_stall", From patchwork Tue Feb 18 09:56:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 866481 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 9122B233136; Tue, 18 Feb 2025 09:56:46 +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=1739872606; cv=none; b=TcKh4qaSqu5hJolY0UAuWy2pLssDlqG1iSk3kURYa9h5zaj4fdZIXfEL/EowTAHNLWiH35d+Ym7/S1i5E8ZCpVvzOXrH77oA5zXavbFW/1XbpykNYIw8pRbAuqkbIFlYqrr+sCEA2vtGokh1jqvnTKxH/llHm9OEDm5pHEToRkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739872606; c=relaxed/simple; bh=W9D1x5RI31lDx3p+LX5++XnrPbNPs0OdXkbg0azO5zg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=G9QnlaFSYb/aaqmYbddboZY5ujszvX7qQbdxUOdlSkXgdHah5DFThkDtr+6kJYYZUBADsYDEspZ3L6MWgiCvwHnYjvLTlCXIkShj/45ChtZocma7gqBAlI2p2fIi1i1Vw47SvstRa4l0gNhGSz37CgjYbS04/PUN2RfE4NBSddk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Dv3mnkDq; 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="Dv3mnkDq" Received: by smtp.kernel.org (Postfix) with ESMTPS id 08387C4CEFB; Tue, 18 Feb 2025 09:56:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739872606; bh=W9D1x5RI31lDx3p+LX5++XnrPbNPs0OdXkbg0azO5zg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Dv3mnkDquQqjl201BGORQ7zSF97LR8HJU1ZXrHU1IDXzkrNK6d+IEyy51pii6Fw/d Vb2shTGXVHzLzJ5JOifx6i2oCfPM5N+aGl6XCw9pUKiug38P9MWkErzsLzOFwpO11l 95t4lYewdCYoDWxs/4EwlUrEaewkH6G1YUpcMQT0hq7chnwjhHTbC3PRF7eY/K+Gky I0oWWqyWEUPleO3MY8Sp6cmNBpS4b4y1IzSf7B4PjAOxvaRyt+dyc/Uidu4zK14aQP Qysg9tWYxuRvzxvcSB0Cx5/VgVROs0cIeHYlpSZB/haLbjyrzua3Z44o2uPp0t5T6g WKbMTKttivfLg== 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 F0E1AC021AA; Tue, 18 Feb 2025 09:56:45 +0000 (UTC) From: Joel Granados Date: Tue, 18 Feb 2025 10:56:22 +0100 Subject: [PATCH 6/8] sparc: mv sparc sysctls into their own file under arch/sparc/kernel Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-jag-mv_ctltables-v1-6-cd3698ab8d29@kernel.org> References: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> In-Reply-To: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linux-acpi@vger.kernel.org, Joel Granados X-Mailer: b4 0.15-dev-64da2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3680; i=joel.granados@kernel.org; h=from:subject:message-id; bh=W9D1x5RI31lDx3p+LX5++XnrPbNPs0OdXkbg0azO5zg=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGe0WVqTdU3OmlPVNS3l8Ja/Z2IQKVamKk9d7 nVMVgnpwno2SIkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJntFlaAAoJELqXzVK3 lkFPkB8MAJTy8l0YojZMRVO2pk2av6uMJ/lqppw/sG19vlr94QoANJIAlDvZ6a02ouwtBS5yiDQ OJd2LuJATMT9/074vJzWN1EMSBLWQM/BDxT4up6IKKCFN1XwF7URrZ2O5+DEesNEYl+S2qXcKs3 OWhJS6mm8rzxYo8Faw/o94dZPdkz7hCu8dVzgFks20DvZh734/Zphu6+PrnkKenOmMyg+opVgNq GpmmnVwdjLsE/BEDgrNl1SpzYjpiQ7KhPmrirfehqlnR7LOmgsyfYedZXj2IzQhLRYi7vDcLoio r9TnixsuLQgS6BO2BkKeijFrrHAXKpqyHZmZCDvl3MZyCcHFhqUljbxmp1glUS1od+PXW2tJv3y tsHB5TXeOuAxna9jcjiXOZaMf4zySQM00GhDKP1cdd+gJpxVCLBv6LBYxZJqQ/ff5UyH9MC0UZB UXbAmV6tL4VN84xj5VgTM3Ep+XWOVx9cuwz+bN9I3rPAr807EJ8xvzArYjktRwb8RizLGzvx7W5 Mo= 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 58ea4ef9b622..3453f330e363 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 000000000000..4975867d9001 --- /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 fdc92d80e841..b63d53e592d8 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -69,9 +69,6 @@ #include #include #endif -#ifdef CONFIG_SPARC -#include -#endif #ifdef CONFIG_RT_MUTEXES #include #endif @@ -1616,38 +1613,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 Tue Feb 18 09:56: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: 866146 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 87A3F233128; Tue, 18 Feb 2025 09:56:46 +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=1739872606; cv=none; b=hIxwNtkpkudDRbQyhYIFQSaNTrfN45RPy6Rnkt0Mu/KieNJB9O8vEuUkzfRxaj8ilLEzN3Em3V9Ruj/c/MhG17Dq3U6OoEEZE9KT5WEmIn7Ocpl6k5m3Z0t6KqkSLAL/mbSHhWSTnqs8kTnDK7y0DdCvdGcnmpr/rExlFtni7ro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739872606; c=relaxed/simple; bh=N7FQbtF5ltXkGtvDBPbDBnYnA6Jue7K/KSgw9wenOFM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eNluq0Tn3xHzlWat78lZ2WMDHH9swkN3X8spkiLkDSv3UbFR9AO6ECt9PAtrVWH90qSgjx0pwH6fH2WHeP65A8u1UPqRLO4znIqJBN6G23SBS+qRDhfj7JqXFmAD2+GpSTWkllWz4HEsHRM8Z1HrvG3CbzQhvXqGJKT9Xrdpmv8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PiLJJgU0; 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="PiLJJgU0" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1B00CC116B1; Tue, 18 Feb 2025 09:56:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739872606; bh=N7FQbtF5ltXkGtvDBPbDBnYnA6Jue7K/KSgw9wenOFM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PiLJJgU09VgdMcmCHRHUjALxcJXfrbvT47Lfk8/1IQHkViiDlPVIoxnpFfrSQUI/1 mpoZ/zZr+9EiZREmqHSr9ZJNwdJN/SjoR3Iu7o7l3ticBq+qYXsihacBzGXVwSa1lF 2w4UOrxBU8qxaFVW6uyk42Ud5JEIHuVP4qBDUCTezhviBeJT52YzcdodGKnJqWI6TN OUNm88jB7lANyq870kMpFZCO+xcwxyVYrESgVQQMuxXw2PLMyPdVrZIYsrKxr6pzzE tVq6qrwO+JduFv7LRaUyC2vUwmCM/lFUm9tnDUTibgVRYQXEnSnt0J60nGPtDOViqR 8+eWf7T2pKllw== 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 0E67DC02198; Tue, 18 Feb 2025 09:56:46 +0000 (UTC) From: joel granados Date: Tue, 18 Feb 2025 10:56:23 +0100 Subject: [PATCH 7/8] s390: mv s390 sysctls into their own file under arch/s390 dir Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-jag-mv_ctltables-v1-7-cd3698ab8d29@kernel.org> References: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> In-Reply-To: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linux-acpi@vger.kernel.org, Joel Granados X-Mailer: b4 0.15-dev-64da2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3521; i=joel.granados@kernel.org; h=from:subject:message-id; bh=N7FQbtF5ltXkGtvDBPbDBnYnA6Jue7K/KSgw9wenOFM=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGe0WVrYqtwc7VEBWPUryeCr6UzTsodifa1V4 CuoLFfpqs2PiokBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJntFlaAAoJELqXzVK3 lkFPBUsL/ilaJN/M2x5LmYQCnoB9tWZ3Y9gdJo92ZebGWWbZVzMlVOy16V+EWORPHSxFTyNq0jJ 2DFlqm0+J41KgFUgCXXkWhavZqVV5QpGkCZQ1eUDsrSEISgNu+kpYhqllYTAcEQyLah33jm1Yld 7z1SSWbm/mAPk/tRV39wZn6V8y4IVW+jczx6nUO/ekNqLAGg7dwYQAIepv7UixCMB2EgYqpqw0N hBxmxHbhhdZstJGF+K5o8WZP6faE9ntyK1g42n8WZ/ENwjae2FiPTU5pI/D2f/HRybg4MrdvwY2 rcHQNzklx6KvCw1s/KFJyPvxdgpcVLqeMEtqoUwc0n6svbJZtgyUy/dwFePwTBQ+TXiuOjZYC/A 07u47HcjEy2ajf3BNZNfGYdvpJkUCnMn1lzU1R8BGGDgvPgwYWFKBIaCzQv78MkEe56Qo8y2qsq F0BnjOlkTFv1ecsfXZp3j6g8LlwO0jFg1b0L1gLh2AI/mIY99tSmoFdAvUomc+StqFRyZypCkM5 lE= 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 kerenel/sysctl.c. Signed-off-by: joel granados --- arch/s390/lib/spinlock.c | 23 +++++++++++++++++++++++ arch/s390/mm/fault.c | 17 +++++++++++++++++ kernel/sysctl.c | 18 ------------------ 3 files changed, 40 insertions(+), 18 deletions(-) diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c index a81a01c44927..4483fdc9d472 100644 --- a/arch/s390/lib/spinlock.c +++ b/arch/s390/lib/spinlock.c @@ -17,6 +17,10 @@ #include #include +#if defined(CONFIG_SMP) +#include +#endif + int spin_retry = -1; static int __init spin_retry_init(void) @@ -37,6 +41,25 @@ static int __init spin_retry_setup(char *str) } __setup("spin_retry=", spin_retry_setup); +#if defined(CONFIG_SMP) +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); +#endif + 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 9b681f74dccc..507da355bf68 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 b63d53e592d8..7f505f9ace87 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1702,15 +1702,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, @@ -1791,15 +1782,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", From patchwork Tue Feb 18 09:56: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: 866145 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 A4C48233D89; Tue, 18 Feb 2025 09:56:46 +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=1739872606; cv=none; b=pLKfARksbFjwyC5REsk7oCcHwQbt37rRhs+il/vF8SmSPXaWMJcSvLThxe/QR/XrLG0n7lC8mVWr8L/Oo/trd87mIYI/CeC53NYveD6f7Tjy+2CBy1DErXUAD+uSEKqNPiuvTqU0nwVzoAPXAMYTPi3oKxaERbaiwd5sLe5mF5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739872606; c=relaxed/simple; bh=25VrcofxjXYiWPL+NpeDoZmrthXGZql9I+TZr94WN1U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pde5P+kYfohFQH6MFmjEQcD358p2v7hyGzVj+amk9/QRolL7Eyrw6OAD8KpMlhn3Ot+UZz8zd3pMlX0b4aa7NhmhLeC0eUhiG7NsKw9ZM8jKc3CCwFviWZEEGYetwqJ7vvXVrI39linE0PQhRY5S5nF1prShHZOiD5wBmniAEcM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t1O7vfVv; 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="t1O7vfVv" Received: by smtp.kernel.org (Postfix) with ESMTPS id 35171C4AF51; Tue, 18 Feb 2025 09:56:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739872606; bh=25VrcofxjXYiWPL+NpeDoZmrthXGZql9I+TZr94WN1U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=t1O7vfVvEjL21CvHAqne4UhEdRzvJaXiNYil7mgmm9x44BZBd1W6Y1uCfPBOnqhwL 1RFaRWdenTWu8GUoprIpS7nV8zMJ3DM+2u7Tdt/5e90/ohrHQkg5bq/i1L8K3IKsHs ZuPWSJQi/BU8DGF6WZhFTIqiaMBGORw9tCHtc+U8tgifRHAPvJV7EVvm/nydcmmS01 4ecEs5J6pYRVkakXmLzie9sopp5t0ShkVU65fznUq7weu8CX36AXhHBOLkX+Qoc6fO j1xT1AGV+Jdl789v3OoweOkkLbWovTxvUu+GmWuzgkmyltkm31lg2OSCPBGJ9p/b3R 6BL9WgBr2+VHw== 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 240A9C021AD; Tue, 18 Feb 2025 09:56:46 +0000 (UTC) From: Joel Granados Date: Tue, 18 Feb 2025 10:56:24 +0100 Subject: [PATCH 8/8] x86: Move sysctls into arch/x86 Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250218-jag-mv_ctltables-v1-8-cd3698ab8d29@kernel.org> References: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> In-Reply-To: <20250218-jag-mv_ctltables-v1-0-cd3698ab8d29@kernel.org> To: Kees Cook , Steven Rostedt , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , "David S. Miller" , Andreas Larsson , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , Thomas Gleixner , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , "Rafael J. Wysocki" , Len Brown Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, linux-acpi@vger.kernel.org, Joel Granados X-Mailer: b4 0.15-dev-64da2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6910; i=joel.granados@kernel.org; h=from:subject:message-id; bh=25VrcofxjXYiWPL+NpeDoZmrthXGZql9I+TZr94WN1U=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGe0WVumUM7VC3nkKjqPjxD72KDdRR6LD1mMS aDvYqAAB3iMY4kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJntFlbAAoJELqXzVK3 lkFPVIIL/izMcYoC1vEgjhYCHqFpAP7CLDIpIwXauJG2W7wUCFoIwUCBuPHBZj6KYSXDyNu8X7T G07ju4giBhkZofL8eCOhuasU8ZN+at3aFEXf5fICqFDRS3TvXik4Z6yK43mTYZXs9MVRThtZRxf PaKruze8Nn89HxOdekRSpFl6UYsufRMHOA+nJ0EaATUd/X62cOvDvsysHXG+HFVz/gU1359eNU7 Cpj/W39YNxVDAJPM0xOYuoQmFd0U6iBBrxwxq6aN3VAZLJzLpYzuL+4ZUrmw6aaZZPm8MnCY9dl bq8q1h6VKx/CzaUT0KoCAc63XIjmywKIdO/UOm723JUAdqttspUYzcemKmhLYblQWbDCA+TIRc3 XIp586nZ2T+iHo5+Dr63JwJFPd3FjJEP4e9nQhyv6xnKUUCyMDwM/Rm4rqblg8A+ixRIIh0GzOC 0/m2pTkTNc06RWRYqOj5WGwYe5koNsO/aCDJQqN+3HSkJahp8yLHPFCUeAsegkvcgTqKbKzlco7 XA= 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 the following sysctl tables into arch/x86/kernel/setup.c: panic_on_{unrecoverable_nmi,io_nmi}, bootloader_{type,version}, io_delay_type, unknown_nmi_panic, acpi_realmode_flags. Variables moved from include/linux to arch/x86/include/asm because there is no longer need for them outside arch/x86/kernel: acpi_realmode_flags, panic_on_{unrecoverable_nmi,io_nmi}. Include asm/nmi.h in arch/s86/kernel/setup.h in order to bring in panic_on_{io_nmi,unrecovered_nmi} Remove the asm/{nmi.h,io.h} includes from sysctl.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 --- arch/x86/include/asm/setup.h | 1 + arch/x86/include/asm/traps.h | 2 -- arch/x86/kernel/setup.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 1 - kernel/sysctl.c | 60 ---------------------------------------- 5 files changed, 67 insertions(+), 63 deletions(-) diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 85f4fde3515c..a8d676bba5de 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -46,6 +46,7 @@ void setup_bios_corruption_check(void); void early_platform_quirks(void); extern unsigned long saved_video_mode; +extern unsigned long acpi_realmode_flags; extern void reserve_standard_io_resources(void); extern void i386_reserve_resources(void); diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h index 1f1deaecd364..869b88061801 100644 --- a/arch/x86/include/asm/traps.h +++ b/arch/x86/include/asm/traps.h @@ -35,8 +35,6 @@ static inline int get_si_code(unsigned long condition) return TRAP_BRKPT; } -extern int panic_on_unrecovered_nmi; - void math_emulate(struct math_emu_info *); bool fault_in_kernel_space(unsigned long address); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index cebee310e200..9f8ff3aad4f4 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -56,6 +56,9 @@ #include #include #include +#if defined(CONFIG_X86_LOCAL_APIC) +#include +#endif /* * max_low_pfn_mapped: highest directly mapped pfn < 4 GB @@ -146,6 +149,69 @@ static size_t ima_kexec_buffer_size; /* Boot loader ID and version as integers, for the benefit of proc_dointvec */ int bootloader_type, bootloader_version; +static const struct ctl_table x86_sysctl_table[] = { + { + .procname = "panic_on_unrecovered_nmi", + .data = &panic_on_unrecovered_nmi, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "panic_on_io_nmi", + .data = &panic_on_io_nmi, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "bootloader_type", + .data = &bootloader_type, + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = proc_dointvec, + }, + { + .procname = "bootloader_version", + .data = &bootloader_version, + .maxlen = sizeof(int), + .mode = 0444, + .proc_handler = proc_dointvec, + }, + { + .procname = "io_delay_type", + .data = &io_delay_type, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +#if defined(CONFIG_X86_LOCAL_APIC) + { + .procname = "unknown_nmi_panic", + .data = &unknown_nmi_panic, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +#endif +#if defined(CONFIG_ACPI_SLEEP) + { + .procname = "acpi_video_flags", + .data = &acpi_realmode_flags, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, + }, +#endif +}; + +static int __init init_x86_sysctl(void) +{ + register_sysctl_init("kernel", x86_sysctl_table); + return 0; +} +arch_initcall(init_x86_sysctl); + /* * Setup options */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4e495b29c640..a70e62d69dc7 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -330,7 +330,6 @@ static inline bool acpi_sci_irq_valid(void) } extern int sbf_port; -extern unsigned long acpi_realmode_flags; int acpi_register_gsi (struct device *dev, u32 gsi, int triggering, int polarity); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 7f505f9ace87..bf098028ba68 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -65,10 +65,6 @@ #include #include -#ifdef CONFIG_X86 -#include -#include -#endif #ifdef CONFIG_RT_MUTEXES #include #endif @@ -1716,16 +1712,6 @@ static const struct ctl_table kern_table[] = { .mode = 0444, .proc_handler = proc_dointvec, }, -#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) - { - .procname = "unknown_nmi_panic", - .data = &unknown_nmi_panic, - .maxlen = sizeof (int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif - #if (defined(CONFIG_X86_32) || defined(CONFIG_PARISC)) && \ defined(CONFIG_DEBUG_STACKOVERFLOW) { @@ -1736,43 +1722,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#if defined(CONFIG_X86) - { - .procname = "panic_on_unrecovered_nmi", - .data = &panic_on_unrecovered_nmi, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "panic_on_io_nmi", - .data = &panic_on_io_nmi, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "bootloader_type", - .data = &bootloader_type, - .maxlen = sizeof (int), - .mode = 0444, - .proc_handler = proc_dointvec, - }, - { - .procname = "bootloader_version", - .data = &bootloader_version, - .maxlen = sizeof (int), - .mode = 0444, - .proc_handler = proc_dointvec, - }, - { - .procname = "io_delay_type", - .data = &io_delay_type, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #if defined(CONFIG_MMU) { .procname = "randomize_va_space", @@ -1782,15 +1731,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#if defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86) - { - .procname = "acpi_video_flags", - .data = &acpi_realmode_flags, - .maxlen = sizeof (unsigned long), - .mode = 0644, - .proc_handler = proc_doulongvec_minmax, - }, -#endif #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN { .procname = "ignore-unaligned-usertrap",