From patchwork Fri May 9 12:54:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889838 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 3FF7D290DBE; Fri, 9 May 2025 12:55:05 +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=1746795306; cv=none; b=YhailvoZIkhfP/KLess+Y/hQMf5qvH7/iZT1f+PpBus5NQvxthUt8l5ipixPYCLJgh6rM1lf0z41WJHkA+TDTZVfnLcI7K1axsJLer4Mn7ez7AIaKqq+3jOpwqzLb09hGhm3kLlXFj+gzlb9cvdAzVzoB3Ybj/3adqnJ8BTtrMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795306; c=relaxed/simple; bh=BpmzDMZbudMRxYnWKdn7By3e4oIcbEz4h214VtRxk9I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Vz0NZFhwsLqlg5f5jCRh8hvSwNUfJ7l2wCN3I5mvAmgA9VxY6xgbQcGtobN8C4GTkpiay0HrwMQvfyp/RaSb5F7i+2I4F5Cuf8fqWWMx28006V3/qAjXxnC6b5GgsBwWy0+PMaBEsPRKfD1WXyZOAEpwflH58O6jnnMUk9M0Qy4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oOk/J+va; 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="oOk/J+va" Received: by smtp.kernel.org (Postfix) with ESMTPS id BD55CC4CEEF; Fri, 9 May 2025 12:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795305; bh=BpmzDMZbudMRxYnWKdn7By3e4oIcbEz4h214VtRxk9I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oOk/J+vaXcCK+KIoAHGzkTE6SF1jxzmX9CvUYcBR+nY+HuSCBjmFriMTsBAAz/W4b 07h7jWzhlKlcjHwLg0p26MQ23p0yUS+5xgty/9MCfu9V7oFN3MXsA39qQyWvh7W3fl Iq5AgI9VOLFne6dwxGr0dDSl7S1GdCliiuUxzK479K1e6qQtwWgtDX1QtGAEv+mq4c Hs7ShgRff+NXpp8P6VAJW4xlkiZC5jtQC+MnmliVVuImATzNBgwr08H8s6jJUL4YyT GOVC4ltAY08YmmX8Y+wSal1CAuiN87dLWgau8HpMQl2CXOPvWV/HeuVnZIhNPL9XGH gv3BZhiSiwGZg== 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 AAD60C3ABC3; Fri, 9 May 2025 12:55:05 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:05 +0200 Subject: [PATCH 01/12] module: Move modprobe_path and modules_disabled ctl_tables into the module subsys Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-1-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3577; i=joel.granados@kernel.org; h=from:subject:message-id; bh=BpmzDMZbudMRxYnWKdn7By3e4oIcbEz4h214VtRxk9I=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yERlHWpCzKql69kqBrlIddBBHXw3ii2o uiBdL8PsdBJNokBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfshAAoJELqXzVK3 lkFPiYAL/jcKTOT3jHcbWnBmzVITRoAGWzzbqeMhLRmW02xJEovcpCPY557YgiP0MDw733croZF E0B+rCl82lMougLjMo2ERjTkG5jEIC1YMnEdSHENOsBYDKsGjQc78C+gjzKuRex2SijKeNi9iQ1 uyVHT+J023ir1ZOBlut49P1x2aMYq/ijeE0GaEf0fKwCon+h4r4tDZl28rRqr3i54D2Ceg0jR/U DdK3iItzrHNAohjw6kT8VcgV38sk6Vqn1GIBtGRXmwT2Hzt8UpXR8Z2UTrHoYw1UoUsT1tjt75K knCtPI1vnOkhFgERft4V4NEq2+JM4D7Q4mnWCQWPXogsEFVdIss6C6E/JXzfQqTXfeMbXuSw/aB FtYyvMGEbh1FldKAR3MrNrWwkFnOFNfVxGhHR7YLyRfsXpeuVWIzTAwTHK3FG2vEvcogCTywjTA QH0H+x43FnFzxiYTQ2JKcV2Nn8mPVyUwTV/FYApI7fa8tKnApPVwY3R+ZcCXgtJy3gd0HxiIcE2 os= 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 module sysctl (modprobe_path and modules_disabled) out of sysctl.c and into the modules subsystem. Make the modprobe_path variable static as it no longer needs to be exported. Remove module.h from the includes in sysctl as it no longer uses any module exported variables. 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 Reviewed-by: Petr Pavlu --- include/linux/kmod.h | 1 - kernel/module/kmod.c | 32 +++++++++++++++++++++++++++++++- kernel/sysctl.c | 20 -------------------- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 68f69362d427caaaefc2565127a7a4158433e5f5..cc32e56dae44896f74a9faf0e97f432f133869b9 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -17,7 +17,6 @@ #define KMOD_PATH_LEN 256 #ifdef CONFIG_MODULES -extern char modprobe_path[]; /* for sysctl */ /* modprobe exit status on success, -ve on error. Return value * usually useless though. */ extern __printf(2, 3) diff --git a/kernel/module/kmod.c b/kernel/module/kmod.c index 25f25381251281a390b273cd8a734c92b960113a..5701629adc27b4bb5080db75f0e69f9f55e9d2ad 100644 --- a/kernel/module/kmod.c +++ b/kernel/module/kmod.c @@ -60,7 +60,7 @@ static DEFINE_SEMAPHORE(kmod_concurrent_max, MAX_KMOD_CONCURRENT); /* modprobe_path is set via /proc/sys. */ -char modprobe_path[KMOD_PATH_LEN] = CONFIG_MODPROBE_PATH; +static char modprobe_path[KMOD_PATH_LEN] = CONFIG_MODPROBE_PATH; static void free_modprobe_argv(struct subprocess_info *info) { @@ -177,3 +177,33 @@ int __request_module(bool wait, const char *fmt, ...) return ret; } EXPORT_SYMBOL(__request_module); + +#ifdef CONFIG_MODULES +static const struct ctl_table kmod_sysctl_table[] = { + { + .procname = "modprobe", + .data = &modprobe_path, + .maxlen = KMOD_PATH_LEN, + .mode = 0644, + .proc_handler = proc_dostring, + }, + { + .procname = "modules_disabled", + .data = &modules_disabled, + .maxlen = sizeof(int), + .mode = 0644, + /* only handle a transition from default "0" to "1" */ + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ONE, + .extra2 = SYSCTL_ONE, + }, +}; + +static int __init init_kmod_sysctl(void) +{ + register_sysctl_init("kernel", kmod_sysctl_table); + return 0; +} + +subsys_initcall(init_kmod_sysctl); +#endif diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 9b4f0cff76eaddc823065ea587760156576a8686..473133d9651eac4ef44b8b63a44b77189818ac08 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -19,7 +19,6 @@ * Removed it and replaced it with older style, 03/23/00, Bill Wendling */ -#include #include #include #include @@ -1616,25 +1615,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#ifdef CONFIG_MODULES - { - .procname = "modprobe", - .data = &modprobe_path, - .maxlen = KMOD_PATH_LEN, - .mode = 0644, - .proc_handler = proc_dostring, - }, - { - .procname = "modules_disabled", - .data = &modules_disabled, - .maxlen = sizeof(int), - .mode = 0644, - /* only handle a transition from default "0" to "1" */ - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ONE, - .extra2 = SYSCTL_ONE, - }, -#endif #ifdef CONFIG_UEVENT_HELPER { .procname = "hotplug", From patchwork Fri May 9 12:54:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889019 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 3FF17290DBC; Fri, 9 May 2025 12:55:06 +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=1746795306; cv=none; b=YPYxktc7F7OL6XuC4CYKIOR9FDFuT+5eswtgwqLQodk2M7nQ/ImXN9qRe49s6VRAOE925E0bH8NpgQyZlU1vnhJpyRXClAwT6PMDBwompqI3eheWhkVWU/AmIh3VyvjzUuEydYLxf6XQrzq2LMcXwHAlKA9z/Mgtml+2GaQNHXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795306; c=relaxed/simple; bh=m38oSF1bsk4q8XGkb05UXXsxgbOmuEMD50QR+Uz7CYc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ufj5Hkwj6AlXGv1BZ1A14zJciJWjJU4a+tZcVJcfAp6h8twduv/0s0BKY0U7iZ8rh+C51CiNggwFiLzOJiBG1cX1GI5lx+Q2T1jqo0TXcpXBHKqPPS9iwUi9zfJ8pl78Qz/EXW796CV3ZMdrhNO93zot3e/MttEimw5Kfw9N7/4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SGIOsJx4; 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="SGIOsJx4" Received: by smtp.kernel.org (Postfix) with ESMTPS id CB96AC4CEEE; Fri, 9 May 2025 12:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795305; bh=m38oSF1bsk4q8XGkb05UXXsxgbOmuEMD50QR+Uz7CYc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SGIOsJx42H5Nlud04v6QJtwpQIa+btBJZzPy80+nof8he1otM7798Z6eTanP4WZ7Q LWcETjTxdplEq8jJxptGlHEFWPvdJkQDCuvaureBHpQCNKS5n7QO3ZhIXXdgE4PHc8 4ivdYewXH6PQp2yWb93BpIP+pjIujmbmzfv5Y8SlfIDvBsS8CHARjXru6ArwJhbnCz r3fWm3JPMgS5q8i/anreJqrdDlUpObRh/y6h8RksQ3Y2TzzGM7x8/xLlw36OSWQNxx eM1v7PyTPZzDigqrp/wVeBzl/q+36ELB8i1G+M6XyaF5brdQX0+5+0luolIEyY7M7I oguGDP7Mld/+A== 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 BA4DFC3ABCC; Fri, 9 May 2025 12:55:05 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:06 +0200 Subject: [PATCH 02/12] locking/rtmutex: Move max_lock_depth into rtmutex.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-2-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3350; i=joel.granados@kernel.org; h=from:subject:message-id; bh=m38oSF1bsk4q8XGkb05UXXsxgbOmuEMD50QR+Uz7CYc=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yFGAm/Om5FxfE5IBLkbOWnP5gjnTcP/E wE2pCdoia9aUIkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfshAAoJELqXzVK3 lkFPej4L/3tUO7WMqQqglIlWRHXlqTWnxNRYnKJZsiWhYbMrGWU4eNprXYMvMDxp4JszWCrc+s/ dHmZpjlZm84mz3wparfKY41aEWSr7T1OyrvxIHx+unxR9zyRa+ILYevo9846AmVIaP24Eh0rn/3 5Cie9W07x5dm/HcvUcOwFgQ1dv9o41QFMKP2kyAnbmhmXtQeF3w54Sjg1Z0KB8PO4YvSJNUReGL WzaCrJEvSmK2XEzGGrjEeb3FlYKd0OfHShmxh3fnX7xb9CzwgsS+6NNqsuRLVIv0gTZShloGJr7 8uDDxU2WngQ49c6Jb5IDh+QtPUfDul3yqLOkx0XpwzoEmrzVkgrPk6iZV960PvH51ShMRX15ca5 ZHZ3neelFOecKdIjeq52ldmUvrYdxZYiv/YeW2hnSDdQQ78uPma7JuRm7RrJ/tGA96vqd00i43Y IE4RlTg9xRQXIFnwXFOWjnTph14ioLpEP8BCgrqaTOB8/JrM47yU5/1EECWiK/lMDwB3lSgRJH6 JM= 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 max_lock_depth sysctl table element and variable into rtmutex.c. Make the variable static as it no longer needs to be exported. Removed the rtmutex.h include 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 kernel/sysctl.c. Signed-off-by: Joel Granados Acked-by: Waiman Long Reviewed-by: Kees Cook --- include/linux/rtmutex.h | 2 -- kernel/locking/rtmutex.c | 23 +++++++++++++++++++++++ kernel/locking/rtmutex_api.c | 5 ----- kernel/sysctl.c | 12 ------------ 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h index 7d049883a08ace049384d70b4c97e3f4fb0e46f8..dc9a51cda97cdb6ac8e12be5209071744101b703 100644 --- a/include/linux/rtmutex.h +++ b/include/linux/rtmutex.h @@ -18,8 +18,6 @@ #include #include -extern int max_lock_depth; /* for sysctl */ - struct rt_mutex_base { raw_spinlock_t wait_lock; struct rb_root_cached waiters; diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index c80902eacd797c669dedcf10966a8cff38524b50..705a0e0fd72ab8da051e4227a5b89cb3d1539524 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -29,6 +29,29 @@ #include "rtmutex_common.h" #include "lock_events.h" +/* + * Max number of times we'll walk the boosting chain: + */ +static int max_lock_depth = 1024; + +static const struct ctl_table rtmutex_sysctl_table[] = { + { + .procname = "max_lock_depth", + .data = &max_lock_depth, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +}; + +static int __init init_rtmutex_sysctl(void) +{ + register_sysctl_init("kernel", rtmutex_sysctl_table); + return 0; +} + +subsys_initcall(init_rtmutex_sysctl); + #ifndef WW_RT # define build_ww_mutex() (false) # define ww_container_of(rtm) NULL diff --git a/kernel/locking/rtmutex_api.c b/kernel/locking/rtmutex_api.c index 191e4720e546627aed0d7ec715673b1b8753b130..2b5da8af206da6ee72df1234a4db94f5c4f6f882 100644 --- a/kernel/locking/rtmutex_api.c +++ b/kernel/locking/rtmutex_api.c @@ -8,11 +8,6 @@ #define RT_MUTEX_BUILD_MUTEX #include "rtmutex.c" -/* - * Max number of times we'll walk the boosting chain: - */ -int max_lock_depth = 1024; - /* * Debug aware fast / slowpath lock,trylock,unlock * diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 473133d9651eac4ef44b8b63a44b77189818ac08..a22f35013da0d838ef421fc5d192f00d1e70fb0f 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -59,9 +59,6 @@ #include #include #endif -#ifdef CONFIG_RT_MUTEXES -#include -#endif /* shared constants to be used in various sysctls */ const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 }; @@ -1709,15 +1706,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#ifdef CONFIG_RT_MUTEXES - { - .procname = "max_lock_depth", - .data = &max_lock_depth, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #ifdef CONFIG_TREE_RCU { .procname = "panic_on_rcu_stall", From patchwork Fri May 9 12:54:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889020 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 3FEB4290DA4; Fri, 9 May 2025 12:55:06 +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=1746795306; cv=none; b=qr9Qsy5dzoXoG6B6kyybgdsXpB4E0yuJYM2z3VCO7O/TbVKiz0j6Fh63Iq4uFylsoiAoe5/CYU/1e6yZbnX3jh28V12BgrfixM9pO8Nx4suaf96bNCzvY82HpFHczb4EumlAZtf8HzE5rYqZp3Y5L0kzqFs1LlwvjHQ+wwS9bjk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795306; c=relaxed/simple; bh=GOjBhs9Ib0MUGQiJvmUAWG/9445JnpsIsFkQfqoyx1M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Rqj+VZ9aO57Bc+AT8uW/vfhhJ9NZ9vDDZdaQ8cmfI09qxJyA6u0wCK0jq8KDbRXAQ/YASe0bB3Gkq0REWoDdDVpWPXoLQEgbop/730wfUBkr41nJUme/f0YKewYq1h6ek4WXti3maS7FqCLJl/Rqi7NghKmaIoSv9R17sqYNZ9w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HC4gZAQS; 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="HC4gZAQS" Received: by smtp.kernel.org (Postfix) with ESMTPS id D37EAC4AF0C; Fri, 9 May 2025 12:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795305; bh=GOjBhs9Ib0MUGQiJvmUAWG/9445JnpsIsFkQfqoyx1M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HC4gZAQShIHAHu307mqxvEK8mAnN8Vv63k3tMZ2cwycpJwIEFpTfyFyxcAPGJE2HK 8yiVGp0cZGkA8bOWargqzwe5t+erz/ixFfzTsS9x9pVuOktbwPNI2mXAd8jAOGZYFe i5Mr0WEkKhjhW7/Ae29ajrcx25uEjm5KqtTkaKbbjViPF6QLmYmlq2PRNKobbpASeb xDPkN1D33Ab04nDMvSh649jyInBCBFdD9DFE7h7UnBrM5BCF0TE5tGwu0bOVuty8UQ QR3E/52JdkeVxJhg/9Q0qpWgQasvN13SwZr1vn0m08XD8hjsPRb3vffWdm3xZngpoy 3MucbEhkc/crA== 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 C8AFCC3ABCD; Fri, 9 May 2025 12:55:05 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:07 +0200 Subject: [PATCH 03/12] rcu: Move rcu_stall related sysctls into rcu/tree_stall.h Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-3-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3493; i=joel.granados@kernel.org; h=from:subject:message-id; bh=GOjBhs9Ib0MUGQiJvmUAWG/9445JnpsIsFkQfqoyx1M=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yIcQI+tvF5Nf2VvFXZdiynCbCQ6sUxEe 0XfrKJsz2Y0mokBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfsiAAoJELqXzVK3 lkFP8AML/RLD37zpvtcqTs+AdQPaL/oilhjcYTEBWeV8O06muca2S+v/BCsYCHrWuQ6fuJwa6/L kNbBLnGE+/FLg4WqWCSxa9qYc1k6W31LyVk59M9YYpqwr65nWtTVxh+/rW3vNW4mIkmUmVMI85r JlmwBQps6LBgQvg9L2r1wpbIDmLQIBSaAu4Y4eLl4hIm7PFgSEY1LTbb3augTLNmTa0Tf6ZdfxO ViMZAvqBzzfRBdv9SwhA88E33eptU37Nx8MnxQNMm5NXfA2iJGb/NsQLx5DPDVQtjKl3WO+Jygx p64kuZlSl/FL0HLbSl4x1jvWNjeU5tZLuQMc3qgTZSVVYN9M8o3OtF9Vlm/rO38Gw+WwnSUQGrC mf0gFT1fa+Ba/CF5rJR9SBN3yRcg0+q6xbHDu0igMPFC1UZDN2bAu4XfPlagJH2dZKiiCl8z4np oWou1P5hkekOj6omNQ3SYmiTLPHkF9KQFZwP6rJU9a64iDjk2AU0ibgezMgzA9eystZgCvVX+C4 HE= 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 sysctl_panic_on_rcu_stall and sysctl_max_rcu_stall_to_panic into the kernel/rcu subdirectory. Make these static in tree_stall.h and removed them as extern from panic.h as their scope is now confined into one file. 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 Reviewed-by: Kees Cook --- include/linux/panic.h | 2 -- kernel/rcu/tree_stall.h | 33 +++++++++++++++++++++++++++++++-- kernel/sysctl.c | 20 -------------------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/include/linux/panic.h b/include/linux/panic.h index 2494d51707ef422dfe191e484c0676e428a2de09..33ecead16b7c1af46aac07fb10b88beed5074b18 100644 --- a/include/linux/panic.h +++ b/include/linux/panic.h @@ -27,8 +27,6 @@ extern int panic_on_warn; extern unsigned long panic_on_taint; extern bool panic_on_taint_nousertaint; -extern int sysctl_panic_on_rcu_stall; -extern int sysctl_max_rcu_stall_to_panic; extern int sysctl_panic_on_stackoverflow; extern bool crash_kexec_post_notifiers; diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h index 925fcdad5dea22cfc8b0648546b78870cee485a6..5a0009b7e30b5a057856a3544f841712625699ce 100644 --- a/kernel/rcu/tree_stall.h +++ b/kernel/rcu/tree_stall.h @@ -17,8 +17,37 @@ // Controlling CPU stall warnings, including delay calculation. /* panic() on RCU Stall sysctl. */ -int sysctl_panic_on_rcu_stall __read_mostly; -int sysctl_max_rcu_stall_to_panic __read_mostly; +static int sysctl_panic_on_rcu_stall __read_mostly; +static int sysctl_max_rcu_stall_to_panic __read_mostly; + +static const struct ctl_table rcu_stall_sysctl_table[] = { + { + .procname = "panic_on_rcu_stall", + .data = &sysctl_panic_on_rcu_stall, + .maxlen = sizeof(sysctl_panic_on_rcu_stall), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, + { + .procname = "max_rcu_stall_to_panic", + .data = &sysctl_max_rcu_stall_to_panic, + .maxlen = sizeof(sysctl_max_rcu_stall_to_panic), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ONE, + .extra2 = SYSCTL_INT_MAX, + }, +}; + +static int __init init_rcu_stall_sysctl(void) +{ + register_sysctl_init("kernel", rcu_stall_sysctl_table); + return 0; +} + +subsys_initcall(init_rcu_stall_sysctl); #ifdef CONFIG_PROVE_RCU #define RCU_STALL_DELAY_DELTA (5 * HZ) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index a22f35013da0d838ef421fc5d192f00d1e70fb0f..fd76f0e1d490940a67d72403d72d204ff13d888a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1706,26 +1706,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#ifdef CONFIG_TREE_RCU - { - .procname = "panic_on_rcu_stall", - .data = &sysctl_panic_on_rcu_stall, - .maxlen = sizeof(sysctl_panic_on_rcu_stall), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, - { - .procname = "max_rcu_stall_to_panic", - .data = &sysctl_max_rcu_stall_to_panic, - .maxlen = sizeof(sysctl_max_rcu_stall_to_panic), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ONE, - .extra2 = SYSCTL_INT_MAX, - }, -#endif }; int __init sysctl_init_bases(void) From patchwork Fri May 9 12:54:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889837 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 717D829117E; Fri, 9 May 2025 12:55:06 +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=1746795306; cv=none; b=ZVB/5nN4yHXQhHC/sPtWIX6NARQvlQWRuMnQLnGw/w2uL0OsAJYBaITWz7ea9w7Q2pg0MGYzW4fum+encysA/z0cT4avculgS29wWQyTakDUFxLvSCC3XoBnI3fXSWFvBH3y5eYuh6zM6BsmTzK09psdyYOdL65hzHf7eAzB8CI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795306; c=relaxed/simple; bh=lbD12Kxx59vQ4CfWoFvcmBEI0Z7ENmEnOq1lhFaAf3U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YBvCo1Hx9XEAZjeE9ltI0bSTHQHlBovzbxTRbqM+xKm0dEIBiYx25v3AvmSiFANKBhjwNyBRcVf4zt/QobOnJqkcGc/9sC0weyjkxcVjpCXIqmPR9tw1QRgnL2qXSCp4kPACpZ4EmlkSn22xcYNznDzSPyypAkyzpSyBUi+EdZ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dkidCP66; 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="dkidCP66" Received: by smtp.kernel.org (Postfix) with ESMTPS id E4760C4AF10; Fri, 9 May 2025 12:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=lbD12Kxx59vQ4CfWoFvcmBEI0Z7ENmEnOq1lhFaAf3U=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=dkidCP6618EWoSqom292OP1GIU75cyTnccRpQuU2HkXtUq6U9TysuXyUCi7yrBr+b UxElOiOO536gK4hJH/mrskApg9YK20HGvUxmRQQWhJBYRQ4RAsYOkSq9EFRaVJw+gC k+3KbUHnzPJcEr83n2V+BBeFLuzRx4pt2tDSDf/AXjpsjRrFOKHq2A52DjB+t6y94D AMPpxswVwEHHr7tGQSoxWvuB3EczqYn3dOrJPYfY9DWgTVNnZCSFMF4J6i3v0tJYOB 2NOPDVku7AReQZJ60Ayi+Yih/wd6Nzy90YLmgWFQbf8eHdK5mXGrbouCExm6xlLKH3 Szn23Bp7vWP/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 D7E93C3ABCA; Fri, 9 May 2025 12:55:05 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:08 +0200 Subject: [PATCH 04/12] mm: move randomize_va_space into memory.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-4-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1890; i=joel.granados@kernel.org; h=from:subject:message-id; bh=lbD12Kxx59vQ4CfWoFvcmBEI0Z7ENmEnOq1lhFaAf3U=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yL6XG7IKZNJemnuB1rPOszHmqOCUZ3Zs jVgj6kQvsj0HokBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfsiAAoJELqXzVK3 lkFP7zwL+wbFmnyUHyRQDfHaFCGu9MKJ/23nAFqv2PKDDVuL6RnqGSj+Oz9aVfBXXFbgiwfQSdS M8Di+bFDTA1BDI23Pc+gkOLFpi/dAxm/ZTV3e8QUzQTCObyrlB/J2n94yJMrOx0txlaxxyZ83i/ k/Fy7MBTnx3gm4/a78AQCIu98FDMVQNCa5D2Fugr1q5sxsV9OS6qmNMcJDFotIhsmXYTyAvtYzg JdnrfOrevEVIcp5CWPDX09gX77gMYx50kH1ZOZ4H/rb7F/JxDqeKvXLgkQJ5Em9k3+zgtunwxH9 BSxhe5p0LiO9sdZxARP7ufpuEuj2m6gv3quOYh5dxVHr1Hcf9CIiiXK7+AbN2XFEAYg3Ql70HIw 3u5rhO/KHqWOiSPryFYUXfdE8ScFh/Spr1VxLTqH8p2FAJx3cZN5IraAIDYeR5xEpmN2k9yo0bA yGEsnc69Ev3O3LWMJLiF7aZm2CGi2nZIx/7nmrfhvakk6VVLE5L4vjfu35geou9mZQKPOmnLf78 Kg= 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 randomize_va_space variable together with all its sysctl table elements into memory.c. Register it to the "kernel" directory by adding it to the subsys initialization calls 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 --- kernel/sysctl.c | 9 --------- mm/memory.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index fd76f0e1d490940a67d72403d72d204ff13d888a..adc2d3ea127841d87b7073ed81d6121c9a60e59a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1688,15 +1688,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dointvec, }, #endif -#if defined(CONFIG_MMU) - { - .procname = "randomize_va_space", - .data = &randomize_va_space, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN { .procname = "ignore-unaligned-usertrap", diff --git a/mm/memory.c b/mm/memory.c index ba3ea0a82f7f770b6cacba4526ba9c8c4929ddad..0a9e325fe3d7631e619ab58d79785cc92fd60c29 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -125,6 +125,24 @@ int randomize_va_space __read_mostly = 2; #endif +static const struct ctl_table mmu_sysctl_table[] = { + { + .procname = "randomize_va_space", + .data = &randomize_va_space, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +}; + +static int __init init_mm_sysctl(void) +{ + register_sysctl_init("kernel", mmu_sysctl_table); + return 0; +} + +subsys_initcall(init_mm_sysctl); + #ifndef arch_wants_old_prefaulted_pte static inline bool arch_wants_old_prefaulted_pte(void) { From patchwork Fri May 9 12:54:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889833 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 32C1D29209E; Fri, 9 May 2025 12:55:07 +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=1746795307; cv=none; b=Xx4wu4edqfYegjNNt9QPk1+fUKZBNyp72mf14zTPQ6aMRWgPQcxJ3pOKlD7CrXU99y8vAqFX8jFqi7dkIKSDlNYmdqQq7FbuDy5XwP8fkLJjw980/CrixYY2yJLeYX94zS2Jy6PXbupaS7OqoKGsa3or/mutKvTtOOOxklVBKnw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795307; c=relaxed/simple; bh=rapDihnXNpERecGhvKjpm1dlmjRPjcehXnhZxS8O2Xw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M1zu0U0Tqp6qcxdCml1uoKLuyNnJmum508vYG9jhZwUQCfRnNTN5uBGfTwo5dkUUoMMyVJHqhugto+kuRCA3tnh+6V27S80AUKnf1bfCjNh4szMRk4y8iVPN1UAUa6pRQb32dnwIHRw4MEINIyvN88mmPU3bUUKsNsbBiyj7sRg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jbEENuG+; 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="jbEENuG+" Received: by smtp.kernel.org (Postfix) with ESMTPS id 03C27C4AF0D; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795307; bh=rapDihnXNpERecGhvKjpm1dlmjRPjcehXnhZxS8O2Xw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jbEENuG+3tRAzgzvib7NK1u8He3UFwjseJ2zGfY5OJXb14oKKhGTqT+Tm+inity0J gHb7W5nOy5wmuKx1fmSTgtyhPbh2li11pX386h7283i5RaTpnzhRa4R0jGdGGevM1o RbonCeAJ3py5cY1zYtP6SRMdtX3KY5MPJMkTZi/+BJCa7TXr7KylFPMy+k/HR200YN f/ReEtZo/Ns37bbMV1FQ5kJaiPUoc1+Rm1frjUREmDn0uwu3K7p24OYLLNApWN33kC WJSNQ8lHD5cwna7ih+lMlu5TnnmhZj5EVyfzm3hbnoiCde5HEBRUXNr9N5gLNyY+DJ NrmvCMFaEDT5w== 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 E7F1EC3ABC3; Fri, 9 May 2025 12:55:05 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:09 +0200 Subject: [PATCH 05/12] parisc/power: Move soft-power into power.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-5-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2508; i=joel.granados@kernel.org; h=from:subject:message-id; bh=rapDihnXNpERecGhvKjpm1dlmjRPjcehXnhZxS8O2Xw=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yOtnQB/bJFt/7J5h4oiYG8sIaqpsH1ED v9nLDttnyWwn4kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfsjAAoJELqXzVK3 lkFPFaAL/Ar0qxWKRezFimngFzcnCsml3mGCyVaueqDYkhIcXd9TAx4Vy2cbd8a6EyROmFFeF0r rVCXwDYsGMaqo2dGI1CisaSk43tUbGRUrAjy1d0hnUNKg2akUhqGpv0z5/KHp0bNdVtIEykxQwp RR4bF+33DGLOfOKwBq3XsCheE9gvVSvQStge4+MR/jNHTMy0ZW7CGAhCucj9EH8bpVa3GzHdYNV uS/c89PQ5kSKvJBi3Y252xpjBbYCDbEkn0tojDZJ7Ep0hIsQT9Mlph3bYXGt0hhgH9byKOQo/1j 8ooJpt5ydx76RfZ17U3pO1p/4eFA6wHWm6zYrMt6VbprDCuSg7BxIUfq7cWUA36mc06me/305ZO X73egkYLEiSbevWt4UoUxMOv/VavPwPfdrOBmByYPaB90vqcFqCUZUiY7O4kN0gV4yRARoL00K4 NT03pMxoTZZpPF7Fh6dp0xpLzvZ2r5JvfKtIJnOR1h8SEFSXHPnid/uoqmvqLCUI42yfnmgd/76 jc= 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 soft-power ctl table into parisc/power.c. As a consequence the pwrsw_enabled var is made static. 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 --- drivers/parisc/power.c | 20 +++++++++++++++++++- include/linux/sysctl.h | 1 - kernel/sysctl.c | 9 --------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c index 7a6a3e7f2825be5191e024e6c7af1cd688219b75..9d6c7bf72e2958348e263a7e82025038694ebfbc 100644 --- a/drivers/parisc/power.c +++ b/drivers/parisc/power.c @@ -83,7 +83,25 @@ static struct task_struct *power_task; #define SYSCTL_FILENAME "sys/kernel/power" /* soft power switch enabled/disabled */ -int pwrsw_enabled __read_mostly = 1; +static int pwrsw_enabled __read_mostly = 1; + +static const struct ctl_table power_sysctl_table[] = { + { + .procname = "soft-power", + .data = &pwrsw_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +}; + +static int __init init_power_sysctl(void) +{ + register_sysctl_init("kernel", power_sysctl_table); + return 0; +} + +arch_initcall(init_power_sysctl); /* main kernel thread worker. It polls the button state */ static int kpowerswd(void *param) diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 40a6ac6c9713f3504c4dfcb4fcc77dff7dce8ca6..ae762eabb7c9715e973356cadafbaaea3f20c7e9 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -242,7 +242,6 @@ int do_proc_douintvec(const struct ctl_table *table, int write, int write, void *data), void *data); -extern int pwrsw_enabled; extern int unaligned_enabled; extern int unaligned_dump_stack; extern int no_unaligned_warning; diff --git a/kernel/sysctl.c b/kernel/sysctl.c index adc2d3ea127841d87b7073ed81d6121c9a60e59a..718140251972b797f5aa5a056de40e8856805eed 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1594,15 +1594,6 @@ static const struct ctl_table kern_table[] = { .extra2 = SYSCTL_ONE, }, #endif -#ifdef CONFIG_PARISC - { - .procname = "soft-power", - .data = &pwrsw_enabled, - .maxlen = sizeof (int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_ALLOW { .procname = "unaligned-trap", From patchwork Fri May 9 12:54:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889836 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 C2D862918CD; Fri, 9 May 2025 12:55:06 +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=1746795306; cv=none; b=j3HXn1cSYExo8tchWQWcOCWuVdEsBtd4OSHyL2JFssgRxE+GxFVw6j5lYV4lw11DXt2CZVIOoZbRwmdq+ud6Am2QXWTz5DC1Vg3Vi0Lslid6Az6+qWvLrX3Ar3deEUUh5ZbqzptmSWGvpoiqQ0Mup4gdiW6U8RnEXO+AUf6Ot54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795306; c=relaxed/simple; bh=g7LsXDd+j505V+MKQpG5RDYoahnYOKgJjZC/QSb5FNw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uedX5XRsgk8EwMTgYNpkYceUrE8QZ14lgn7uq4l2VT/oIV2ptRhXyudu1zadDDkBzLLGWf+cViSOeyAr9W6O9l1WvOi0Y4AJ82JM10dXAC4VHg7fbD/782+lkqcAilXjjZPZLoRivBADscGAcD5VPhOeRXYhF9ojA2LvKDiaGs8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AZos1YGS; 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="AZos1YGS" Received: by smtp.kernel.org (Postfix) with ESMTPS id 0B7ABC116C6; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=g7LsXDd+j505V+MKQpG5RDYoahnYOKgJjZC/QSb5FNw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=AZos1YGSXt9UXSVIeC+gyN74Etce15A3NaBIuLDesNCwSOo8s0bEHwUU7oROdtf0n 9HNQ7vhkC/1gkzBpfxg5tdCsy+6Z0fe9pgo5KGojPunL/cCbQ3ZcQ1EV9IsrZq0xBf SlePsaI7NgcgmhNKzIKwKXu7QrWh9AdvBxtte1MF3wn7WUBxFU8La9kaKH60ytbnuN R42jbaUt8pZVtpywz35pSPIf815RgDJ162w7DwLKl0+kvM2ZXGTLhV0uRRCXEJsajO +OcahojoTwqT7CXL4rpDUKZBhR1lxB/BJSbelppvDVoglsfj1mBey7V0UdaDqXQ1T0 AHDQ5F/dS7JKA== 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 01925C3ABCC; Fri, 9 May 2025 12:55:06 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:10 +0200 Subject: [PATCH 06/12] fork: mv threads-max into kernel/fork.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-6-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2440; i=joel.granados@kernel.org; h=from:subject:message-id; bh=g7LsXDd+j505V+MKQpG5RDYoahnYOKgJjZC/QSb5FNw=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yQ/uWK/HG1C61w82jo0nQJAkZrwNaRTQ Kzdwz6TUJcOyIkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfskAAoJELqXzVK3 lkFP5gcMAIFO2d6rVgT6EKcTmTnIIh5UBVX/xKxmcuUTXSbrkCQUFpfo23HIWCeg8lL9+/SmVc/ wMQuryABzQbKLqJgYFC1QWq55hJcvP+tU2PTyZkeJC/OVtzsTZQ/ekzJOYDMD5OXR7RA7MNpiHw DWGtslYalBKnX4v/OZwXHpjwxW7ypE8DnYYz6VIp/aCFYqJydkFGyJZfbvlzKl+mHZoVO2Mrs4i SmNFu7CS2gpbq2cBPi1pnre4gHOjRveT+FIx/NZOc1ttqqym6PVJsSQpnUGcTJwXZbwHWsFGhbj 4u9+eNLUJC4qoDTTYLnroNX83r/N6o5QnbPCBWjuV3fKNVL21qaJnCrONdHewkNLIcIBCc/7Ojb k12NIcmQoGPLGzmePG67PgJZq04KQsxm0xdPTiQAyBfhB5up3+XiLPdyLFmALcDrr286yquKuuc Rbpu1HJEE6D/X+MWIPZsfT0K9KaTNq1tWG/NTJIcpSunVpPbn0ioZqiTeHwnwZDJdA4QNjcWEC7 d8= 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 make sysctl_max_threads static as it no longer needs to be exported into sysctl.c. 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 --- include/linux/sysctl.h | 3 --- kernel/fork.c | 20 +++++++++++++++++++- kernel/sysctl.c | 7 ------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index ae762eabb7c9715e973356cadafbaaea3f20c7e9..30bcbc59d12d2f4cec7545e7ee3f5ea5f0eefbd7 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -284,7 +284,4 @@ static inline bool sysctl_is_alias(char *param) } #endif /* CONFIG_SYSCTL */ -int sysctl_max_threads(const struct ctl_table *table, int write, void *buffer, - size_t *lenp, loff_t *ppos); - #endif /* _LINUX_SYSCTL_H */ diff --git a/kernel/fork.c b/kernel/fork.c index c4b26cd8998b8e7b2b516e0bb0b1d4676ff644dc..ed39064b86c25849c4b21cf99ac68dded05038b3 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -3470,7 +3470,7 @@ int unshare_files(void) return 0; } -int sysctl_max_threads(const struct ctl_table *table, int write, +static int sysctl_max_threads(const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) { struct ctl_table t; @@ -3492,3 +3492,21 @@ int sysctl_max_threads(const struct ctl_table *table, int write, return 0; } + +static const struct ctl_table fork_sysctl_table[] = { + { + .procname = "threads-max", + .data = NULL, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = sysctl_max_threads, + }, +}; + +static int __init init_fork_sysctl(void) +{ + register_sysctl_init("kernel", fork_sysctl_table); + return 0; +} + +subsys_initcall(init_fork_sysctl); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 718140251972b797f5aa5a056de40e8856805eed..febf328054aa5a7b2462a256598f86f5ded87c90 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1630,13 +1630,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_do_cad_pid, }, #endif - { - .procname = "threads-max", - .data = NULL, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = sysctl_max_threads, - }, { .procname = "overflowuid", .data = &overflowuid, From patchwork Fri May 9 12:54:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889017 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 C2E422918CE; Fri, 9 May 2025 12:55:06 +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=1746795306; cv=none; b=DiT4ETivU8j4n8HyxS12+vfhNZsXo8ipepxyt1SkNkreX+Zxx5QljT9Z+LIJzKh2N6Abclg58QCn1gaTkjRz3MbDBmT/zaUaDrPJVvLGfK3BGucbBm2P9gw2i5vkurF6DISeBzzib8E9sX4f0Ms5a/YvJWNnm1cYhQr6N9uHEdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795306; c=relaxed/simple; bh=P7vQ+Tbjp/K5t8P7w4RO0B3Yk38DBPiFR2QdU7/KqCY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dGHV4s7KWZsC5l45/o49blBIZTYg8PorZRx1hkOavzZX9P5uX0f49uwVB+1eeBqs6XQ9sfLDd7hzVISBBWwI543WiJ5Igi3cc7PU8BDg3NzF67lP/Mx05AnhBPjNjdw7G9Kix3hA/0RyVNPZo1Mq2K6TwFo8/xMzjxEXYr/D8dw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TRKl3dU8; 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="TRKl3dU8" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1A7DBC16AAE; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=P7vQ+Tbjp/K5t8P7w4RO0B3Yk38DBPiFR2QdU7/KqCY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TRKl3dU8E4j3qi3UUIM0MKpI/5kJ/jlA1ev2GjKCGCfQHqLwLyqQDTdgCPB3aFh7l hC/JjbWPSu5+MMz/1wxZai5N5qzRr25eTv9ZCWiEaO5ocpFBmzqq19W/cPxGgEm3KK +KNVkbVfR1Dhv6gyuWhb4jJTBgA8huIrDRQTWj0QPZ35UchczKQC52ur+FngEMdxm/ wV/dhFBVzl3lQ/L5essicf116ufeSBmnM9I8oFcZzGZjvm9lqsXxSK8HdHFabu+6ya A8hqgTjqqoElObHwJVrQKTqJ1hBbiweZzK+fwdx3fbxasbvgGpAVX/Y2H0OH4OutWQ IPugJiowoiQLg== 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 118BCC3ABCD; Fri, 9 May 2025 12:55:06 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:11 +0200 Subject: [PATCH 07/12] Input: sysrq: mv sysrq into drivers/tty/sysrq.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-7-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3323; i=joel.granados@kernel.org; h=from:subject:message-id; bh=P7vQ+Tbjp/K5t8P7w4RO0B3Yk38DBPiFR2QdU7/KqCY=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+ySeocfEnB6M/redE7f06E8yJNij/bs4P Rn9SWPKQMpjjIkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfskAAoJELqXzVK3 lkFP+aoL/0WNslAOaswPGE5r9au3d1aOofO6PbnFn0JoryOXftHrBATNDqzcfPhWQTSSk3KcENt l2U9RK8OuosgPWWDQQQLsj6dS2MAwN05l65/fMWikpZqyo/v1X4hnCATduh0RNJ/wEUMIiJcXaQ kiDpwosoj1mz1uSqSNnnl3d2VyVXLpYlcdAGVd2aX2PFeY9f0Iwe9eiCOy9gZ3iBoPfrabixgAM PZMJB0WSDMI39Xqi8sPvisswxkpUcNnU+L7wWOPXB8F0ebq2UlR5vneGEZVbuRhkkxWpbxOubSJ OnUhCPMT6TWkOlPwQqPYhkNK/+rEHHj4hlkuPC3LeEDDO4gf3mFROpz7TeQgx1V+7LqDISlevnU 5k6X+ntypxbBCYvuz9BTBL+Xj/tionGXzm6FNmHQ88PwsZTHPePdH+euWB38xxpR+J/7Ckda28a Mh/Zjusu6Dy6uenAJDr51bG9S/UkB6VEUeHTpw7luFEHmw3EmabRyGgoj2lko9Dk2tG3/7IjHp7 m8= 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 both sysrq ctl_table and supported sysrq_sysctl_handler helper function into drivers/tty/sysrq.c. Replaced the __do_proc_dointvec in helper function with do_proc_dointvec as the former is local to kernel/sysctl.c. 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: Greg Kroah-Hartman --- drivers/tty/sysrq.c | 38 ++++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 30 ------------------------------ 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 6853c4660e7c2586487fea83c12f0b7780db1ee1..8a304189749f3e33af48141a1aba5e456616c7de 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -1119,6 +1119,44 @@ int sysrq_toggle_support(int enable_mask) } EXPORT_SYMBOL_GPL(sysrq_toggle_support); +static int sysrq_sysctl_handler(const struct ctl_table *table, int write, + void *buffer, size_t *lenp, loff_t *ppos) +{ + int tmp, ret; + struct ctl_table t = *table; + + tmp = sysrq_mask(); + t.data = &tmp; + + ret = proc_dointvec_minmax(&t, write, buffer, lenp, ppos); + + if (ret || !write) + return ret; + + if (write) + sysrq_toggle_support(tmp); + + return 0; +} + +static const struct ctl_table sysrq_sysctl_table[] = { + { + .procname = "sysrq", + .data = NULL, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = sysrq_sysctl_handler, + }, +}; + +static int __init init_sysrq_sysctl(void) +{ + register_sysctl_init("kernel", sysrq_sysctl_table); + return 0; +} + +subsys_initcall(init_sysrq_sysctl); + static int __sysrq_swap_key_ops(u8 key, const struct sysrq_key_op *insert_op_p, const struct sysrq_key_op *remove_op_p) { diff --git a/kernel/sysctl.c b/kernel/sysctl.c index febf328054aa5a7b2462a256598f86f5ded87c90..ebcc7d75acd9fecbf3c10f31480c3cb6960cb53e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -964,26 +963,6 @@ int proc_dou8vec_minmax(const struct ctl_table *table, int write, } EXPORT_SYMBOL_GPL(proc_dou8vec_minmax); -#ifdef CONFIG_MAGIC_SYSRQ -static int sysrq_sysctl_handler(const struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos) -{ - int tmp, ret; - - tmp = sysrq_mask(); - - ret = __do_proc_dointvec(&tmp, table, write, buffer, - lenp, ppos, NULL, NULL); - if (ret || !write) - return ret; - - if (write) - sysrq_toggle_support(tmp); - - return 0; -} -#endif - static int __do_proc_doulongvec_minmax(void *data, const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos, @@ -1612,15 +1591,6 @@ static const struct ctl_table kern_table[] = { .proc_handler = proc_dostring, }, #endif -#ifdef CONFIG_MAGIC_SYSRQ - { - .procname = "sysrq", - .data = NULL, - .maxlen = sizeof (int), - .mode = 0644, - .proc_handler = sysrq_sysctl_handler, - }, -#endif #ifdef CONFIG_PROC_SYSCTL { .procname = "cad_pid", From patchwork Fri May 9 12:54:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889018 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 AA3062918C3; Fri, 9 May 2025 12:55:06 +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=1746795306; cv=none; b=KFEydIKGyOvIwen0KdVh7rH27cK+dtpg+NznKVKtW/YO8+aEch9a+CZuHhzWlp6Br0rrx9cEfG6V4J9npNGAoPn3Wf5QvSV/8lL7+h9MWDw50waNCTb28llEZwPWrb2PcDcW6MUtBZR6+7jlHk9FWl/koWAUWjsUX0zQMD+6E3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795306; c=relaxed/simple; bh=gjjnyJtn9rL7qDVpBI4IReueEE8EroNg5ir0HoyLtas=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GEOWKLTDH5OS2rMpcevydtnS8jdGl11FIrGC7b8aOxaNeVqM9qrIYrtrIIAMZjvadvYCQ5yv9LlwPi6NmotwuTe8cEzrmHPz9Qt2iXMabzH1PAnCZBT+xFRPysjODYRtVBNnrwo3jXm9nwIkR3ESXarrwqvXwd48a6C/PPikDvk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mn0hOIMP; 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="mn0hOIMP" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2C186C4CEF4; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=gjjnyJtn9rL7qDVpBI4IReueEE8EroNg5ir0HoyLtas=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mn0hOIMPYfURLIE/WU5fIJIHiX4VolQjVMoKxIu+HQh+eRbJ0wO6xyFasVQBiGp3V r+G/1tGi48JdnzT7P0hyZ9iRrBHzJNYBIWfFe/GWR8/uyv7jOBFwT3Tx8o1Fjb+4G6 OXJ37leqMjgXp2DuhHPwXw/W3aObh5xytEzvoLxqueL0PG5RcOT0QQRa0xA2uc5V4Y pKyCjqYW4O12XCx3YTcRIF9k5/gbftNa8Qfy7PWNxAqdSj1gtr4mXmwwek1oq5Q9im 7pcqPpfp4FfwrRpOOzYDG6McKp9VnCOXChrR8TypofBvL1es9qBz3zmo4hvlXqsL6o /xP69WDnQiHvg== 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 2129FC3ABCE; Fri, 9 May 2025 12:55:06 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:12 +0200 Subject: [PATCH 08/12] sysctl: Move tainted ctl_table into kernel/panic.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-8-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4205; i=joel.granados@kernel.org; h=from:subject:message-id; bh=gjjnyJtn9rL7qDVpBI4IReueEE8EroNg5ir0HoyLtas=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yV+rDKiq8+9lr4zAKfpivTW+aC7pXl3I dS7Tq9JQnWA5IkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfslAAoJELqXzVK3 lkFPrtML/3uwnHJ/JqfBMu/TvpbR4B0zarBGmD92mSCnMHyEC7u8Ky4liTEmME4Yom6MK0K76zM F5bzJ+uVqLmQV+HJgQcmNDmvMjkm5m6fWZAN5ggfV8CmJjF0ZKVN0dst/maCll9WOoj16rl4a2k 4IL6xjU9G+kxlwp6wT71cIKOgYEb9MizsBzW0ahDvcAS27PYeac8t6yFlHlXTAt8escrw26mY4A JNaiTbS0nnLhMIlBeIyuSChKqYpQdkapyKXTANQ5V8G+BgSDDrpuc1hDwdxKcDcQHafaaf7xiCN Syou4Df4mEoRHJ1Ex7TxMo7oTLSG0pK2uG9WpKOsi+was5ZsZeM266Vt+yB1DoKCIV706gib4v/ cHV/muDGo03g44TLEzvCXRyc86It1dvhL8lLagWQnKf2EDlW4FlsuDOIGdL83Lgqqm0VU6QFVBj krHSMOvq/fVRVFS4Xwic4GTsb7c6SmKfeTSza9mr4IkOlHnPjfw/Iv1SKJ8hqMZ67YsPmK2Y4F6 Mw= 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 ctl_table with the "tainted" proc_name into kernel/panic.c. With it moves the proc_tainted helper function. 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 Reviewed-by: Luis Chamberlain Reviewed-by: Kees Cook --- kernel/panic.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 49 ------------------------------------------------- 2 files changed, 50 insertions(+), 49 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index 047ea3215312c439950c6ec4674a91572146234d..213c6c9d6a750ff3d17f3cf530b37c619cd816f4 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -84,6 +84,50 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list); EXPORT_SYMBOL(panic_notifier_list); #ifdef CONFIG_SYSCTL + +/* + * Taint values can only be increased + * This means we can safely use a temporary. + */ +static int proc_taint(const struct ctl_table *table, int write, + void *buffer, size_t *lenp, loff_t *ppos) +{ + struct ctl_table t; + unsigned long tmptaint = get_taint(); + int err; + + if (write && !capable(CAP_SYS_ADMIN)) + return -EPERM; + + t = *table; + t.data = &tmptaint; + err = proc_doulongvec_minmax(&t, write, buffer, lenp, ppos); + if (err < 0) + return err; + + if (write) { + int i; + + /* + * If we are relying on panic_on_taint not producing + * false positives due to userspace input, bail out + * before setting the requested taint flags. + */ + if (panic_on_taint_nousertaint && (tmptaint & panic_on_taint)) + return -EINVAL; + + /* + * Poor man's atomic or. Not worth adding a primitive + * to everyone's atomic.h for this + */ + for (i = 0; i < TAINT_FLAGS_COUNT; i++) + if ((1UL << i) & tmptaint) + add_taint(i, LOCKDEP_STILL_OK); + } + + return err; +} + static const struct ctl_table kern_panic_table[] = { #ifdef CONFIG_SMP { @@ -96,6 +140,12 @@ static const struct ctl_table kern_panic_table[] = { .extra2 = SYSCTL_ONE, }, #endif + { + .procname = "tainted", + .maxlen = sizeof(long), + .mode = 0644, + .proc_handler = proc_taint, + }, { .procname = "panic", .data = &panic_timeout, diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ebcc7d75acd9fecbf3c10f31480c3cb6960cb53e..9d8db9cef11122993d850ab5c753e3da1cbfb5cc 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -731,49 +731,6 @@ int proc_douintvec(const struct ctl_table *table, int write, void *buffer, do_proc_douintvec_conv, NULL); } -/* - * Taint values can only be increased - * This means we can safely use a temporary. - */ -static int proc_taint(const struct ctl_table *table, int write, - void *buffer, size_t *lenp, loff_t *ppos) -{ - struct ctl_table t; - unsigned long tmptaint = get_taint(); - int err; - - if (write && !capable(CAP_SYS_ADMIN)) - return -EPERM; - - t = *table; - t.data = &tmptaint; - err = proc_doulongvec_minmax(&t, write, buffer, lenp, ppos); - if (err < 0) - return err; - - if (write) { - int i; - - /* - * If we are relying on panic_on_taint not producing - * false positives due to userspace input, bail out - * before setting the requested taint flags. - */ - if (panic_on_taint_nousertaint && (tmptaint & panic_on_taint)) - return -EINVAL; - - /* - * Poor man's atomic or. Not worth adding a primitive - * to everyone's atomic.h for this - */ - for (i = 0; i < TAINT_FLAGS_COUNT; i++) - if ((1UL << i) & tmptaint) - add_taint(i, LOCKDEP_STILL_OK); - } - - return err; -} - /** * struct do_proc_dointvec_minmax_conv_param - proc_dointvec_minmax() range checking structure * @min: pointer to minimum allowable value @@ -1557,12 +1514,6 @@ int proc_do_static_key(const struct ctl_table *table, int write, static const struct ctl_table kern_table[] = { #ifdef CONFIG_PROC_SYSCTL - { - .procname = "tainted", - .maxlen = sizeof(long), - .mode = 0644, - .proc_handler = proc_taint, - }, { .procname = "sysctl_writes_strict", .data = &sysctl_writes_strict, From patchwork Fri May 9 12:54:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889835 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 DFC7D2918EA; Fri, 9 May 2025 12:55:06 +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=1746795307; cv=none; b=HqezKgZF4ixUOXZakrIa5nE9Is0u7eViwvLfWF9kOD5NRRPHHpjId85nzriUaeJxaVRJD7LVBrHAraCqINRnzrnVXVv33NK822KTLEI+38tsy7qzJYuJfqE8Z6dI74OLjQt+raw17ufdstXWLqD1RHIfrpVzhN1XixWj1o4ahQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795307; c=relaxed/simple; bh=bpddqMKPTBhFpPzB7Q4vEETp0NRXruc3g0KF10Cik6o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=azA/puNYAtt1/jjmNLOZhjbHTp1dbhOtFrIc5FP1CE7GTwP99C+n58A4UEWVXgcaWKS5JHuxPQ1KITyNyXWG4DmHd7G4epRHKsyyhfn7Flh2Cigq+J+l75UY24wtttNPUvYnf98av3exoTuGye3CWkKWElLkLE6N0TpN+XP1sfM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ajj8qhEm; 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="ajj8qhEm" Received: by smtp.kernel.org (Postfix) with ESMTPS id 3C3A3C4CEFA; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=bpddqMKPTBhFpPzB7Q4vEETp0NRXruc3g0KF10Cik6o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ajj8qhEmlMpoR5/avhBe2jrdSrQXeAB9ii7yTmnNAi2HxvhyZ/ddvZx9v/zgsm+qR x/6NmcSSABKOl86PhMa8dZ7MPzb+Qdj5TA3vsfP0hP9gUE+dC+7SPpBXk8dcbyoo6S ciTGpSy4aI2riNpJ0MDYkxFuJGzUYzX9ocl3d2gwBVXRrPFHsi3voOtHwRoc/dwKdv tMVpmqe0xhDSDqT6SbQp/FI57/y2lFXJi9mYl+FKHZyLbsnwFH3PlxLETlopG/ZO1A GZWYqIMH1f/XRgfmYgcK1S2z+YD56bm8iy4aPVhoR6pb7uUykVNAqOk0s2iYNjkter 0fqjdrv3JFPcQ== 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 31513C3ABCC; Fri, 9 May 2025 12:55:06 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:13 +0200 Subject: [PATCH 09/12] sysctl: move cad_pid into kernel/pid.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-9-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3106; i=joel.granados@kernel.org; h=from:subject:message-id; bh=bpddqMKPTBhFpPzB7Q4vEETp0NRXruc3g0KF10Cik6o=; b=kA0DAAoBupfNUreWQU8ByyZiAGgd+yWiielUUZACujyl8jOrulsz1fYpBCHwtYK+YtZFw5/za 4kBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfslAAoJELqXzVK3lkFPcdoL/3K0 M/MaJWC4QAeabx7/KfG9il1+qnbzwuXO3ZCy8VPeYq7BERSFODTJupA9U4Z73cuYJIgvWD3BqdB gZyPD5wrmFGrb5goKkjtmXJPSgMbNxzbmCZpHvchlkgWMiaj6qBnR2uAAN04BoIq1k85sKnfJnu z3jzXB4uMIL4DI/G5vOMvAgHYJWk5sTwmcgQtlBeWJiBqLkCy2N4sbbykzpmo6yuRFnbSpAqM/b cktCdto61a4CS97jv7kPB74xmO1gwruMUVHP99OfSZhmD+E7SzLcs5MhkitLftMov3hnHn8rRI6 Q7tLo4fW5pWjdSFMN8TsJVyzBzLDNZ5TlfzZnhu+6sfP7Y4+HttHcwwUjU9xQ1n4eUu8m/d/mQP K+86JrrX2uB9A42mQ35aFapsPmvU+M1ygWLhiKmFw19vTgXGgXLIXCIu7BUufcxh8yarQ2A21BL sECoALsl2QU5r2tYvYZeNJzCvFYFnbHoB0fihlJgx4hPhpaTJgKzEb+IysjQ== 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 cad_pid as well as supporting function proc_do_cad_pid into kernel/pic.c. Replaced call to __do_proc_dointvec with proc_dointvec inside proc_do_cad_pid which requires the copy of the ctl_table to handle the temp value. 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 --- kernel/pid.c | 32 ++++++++++++++++++++++++++++++++ kernel/sysctl.c | 31 ------------------------------- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/kernel/pid.c b/kernel/pid.c index 4ac2ce46817fdefff8888681bb5ca3f2676e8add..bc87ba08ae8b7c67f3457b31309b56b5d90f8c52 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -717,6 +717,29 @@ static struct ctl_table_root pid_table_root = { .set_ownership = pid_table_root_set_ownership, }; +static int proc_do_cad_pid(const struct ctl_table *table, int write, void *buffer, + size_t *lenp, loff_t *ppos) +{ + struct pid *new_pid; + pid_t tmp_pid; + int r; + struct ctl_table tmp_table = *table; + + tmp_pid = pid_vnr(cad_pid); + tmp_table.data = &tmp_pid; + + r = proc_dointvec(&tmp_table, write, buffer, lenp, ppos); + if (r || !write) + return r; + + new_pid = find_get_pid(tmp_pid); + if (!new_pid) + return -ESRCH; + + put_pid(xchg(&cad_pid, new_pid)); + return 0; +} + static const struct ctl_table pid_table[] = { { .procname = "pid_max", @@ -727,6 +750,15 @@ static const struct ctl_table pid_table[] = { .extra1 = &pid_max_min, .extra2 = &pid_max_max, }, +#ifdef CONFIG_PROC_SYSCTL + { + .procname = "cad_pid", + .data = NULL, + .maxlen = sizeof(int), + .mode = 0600, + .proc_handler = proc_do_cad_pid, + }, +#endif }; #endif diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 9d8db9cef11122993d850ab5c753e3da1cbfb5cc..d5bebdd02cd4f1def7d9dd2b85454a9022b600b7 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1224,28 +1224,6 @@ int proc_dointvec_ms_jiffies(const struct ctl_table *table, int write, void *buf do_proc_dointvec_ms_jiffies_conv, NULL); } -static int proc_do_cad_pid(const struct ctl_table *table, int write, void *buffer, - size_t *lenp, loff_t *ppos) -{ - struct pid *new_pid; - pid_t tmp; - int r; - - tmp = pid_vnr(cad_pid); - - r = __do_proc_dointvec(&tmp, table, write, buffer, - lenp, ppos, NULL, NULL); - if (r || !write) - return r; - - new_pid = find_get_pid(tmp); - if (!new_pid) - return -ESRCH; - - put_pid(xchg(&cad_pid, new_pid)); - return 0; -} - /** * proc_do_large_bitmap - read/write from/to a large bitmap * @table: the sysctl table @@ -1541,15 +1519,6 @@ static const struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dostring, }, -#endif -#ifdef CONFIG_PROC_SYSCTL - { - .procname = "cad_pid", - .data = NULL, - .maxlen = sizeof (int), - .mode = 0600, - .proc_handler = proc_do_cad_pid, - }, #endif { .procname = "overflowuid", From patchwork Fri May 9 12:54:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889016 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 DFD272918EB; Fri, 9 May 2025 12:55:06 +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=1746795307; cv=none; b=agIZ0l+stdk3Ys5U5BnQ9aE+aN5RK9wtM3ly5CCZiL+ob7Hwz89usC8+GdE3i6lAsai05UzhiD4hDuv+fc+KIsBQtagLZxLuEt8GCMlQH0iaRTYnLINR8ZcTMm0ovhfArmqC/yP8erAxZRPzawWvd9bs/vmnGCVEueLxORLIWKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795307; c=relaxed/simple; bh=iBWZYDpQ2juAjhx5pX1DbD1nKbOZE742NSDAPf/9QSo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NQdYKpKRSHtpoQqWgIoL3wXLcAtvsYLyttDauuvw7ndXY7PmOTenuIsDBeGKwoA21MqYccs5Hk2iTlghK5QJUNJKsnEL2fQPz4hDapU2Cpwkmy+ZtlDaspl/qE3zgKngBS0YnEwH5BpJZhUzROw2KSDCkpE7wGXMvkPhNhtEOIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YzQzGNG2; 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="YzQzGNG2" Received: by smtp.kernel.org (Postfix) with ESMTPS id 49234C2BC9E; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=iBWZYDpQ2juAjhx5pX1DbD1nKbOZE742NSDAPf/9QSo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YzQzGNG2i+QOu0+1G3VOs39FT4R/N1C52TFCga1mn4Nz8jHMewzsn8ZHyR/a7pxnN GRc2Mgzjna+zJQG2Hd4OTMU/79ex4ic3GiD8LcKnqxBgYa/ckpSfI8V0J4jreqyEm/ V8qyoGkZneoRaurWLO6AfjOEVZAUZwGTJzvPSp2LvNB6Kf2HESZxzG4bHDwaB30UQG +L8il5x37JywipHbMXUTAFlpyXfxwBUzz8G0xh1EI4Cjz6GYfwde03JCLNG0UwskVz s+0EvsOy9/rOTBmSqrL9ljOXyNXrtOF4Q5qR1xGXMBs2IHh9C9r4e2jLQLnh036ABA kPHtvgDL1WZww== 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 3F82AC3ABBC; Fri, 9 May 2025 12:55:06 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:14 +0200 Subject: [PATCH 10/12] sysctl: Move sysctl_panic_on_stackoverflow to kernel/panic.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-10-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1738; i=joel.granados@kernel.org; h=from:subject:message-id; bh=iBWZYDpQ2juAjhx5pX1DbD1nKbOZE742NSDAPf/9QSo=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yZVZlAJvlSFeIOK7ZUIBFeRAqCzIUtq1 EXP6L0iac8e6okBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfsmAAoJELqXzVK3 lkFPKsUL/34wrM9l0suCAomA6YIWhJCQFnrdoNObwQnmqYlomYI6m+y92V0xy+ltvIjej2DhMm9 Zo7HqxRyRmRFfsvqc5OGeZkQQgCiKriH3QMnOiEt7ZNXZZWWura6lhop2H5YVmONmix6awBu8ok n6UWQ+lQG8Gg3b+l8Rs+ON5FCfDrM5pFk1VyQnpQ+qKQY8Jz17Isp/gJxz1hPUdCLgWEhuW9kD5 MTnu4NTj8f7+ZDkSF/2sfIm5O0umKl+BNzXhJ8APNvw9PW2tuX/jD5tTYDxbGfBr1BOchy5eJZe DOEJAuJ1fUxNfP4HlZ6OD7TpYvLKsUTEA6cF9YrsqW/TThUbv52ajFr/LHzxj2KbUx9+QTnf3u1 HdU2RSmv9uKIcVnQBvI80bJftXsSVI2fUQqQfwongGBHQLG4r51JY4KivxNZrgg7qS2CsWccQF9 73RaPh70zGvXKDXnO7oh+GVcexPplGQ853rGTC8tjEiG6hO9FnaUG2fGqoWkB9/dH2Pn8Cuz8X8 0A= 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 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 Reviewed-by: Kees Cook --- kernel/panic.c | 10 ++++++++++ kernel/sysctl.c | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index 213c6c9d6a750ff3d17f3cf530b37c619cd816f4..401f0997f654797acc3351040bbbda1845ce00c1 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -183,6 +183,16 @@ static const struct ctl_table kern_panic_table[] = { .mode = 0644, .proc_handler = proc_douintvec, }, +#if (defined(CONFIG_X86_32) || defined(CONFIG_PARISC)) && \ + defined(CONFIG_DEBUG_STACKOVERFLOW) + { + .procname = "panic_on_stackoverflow", + .data = &sysctl_panic_on_stackoverflow, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec, + }, +#endif }; static __init int kernel_panic_sysctls_init(void) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index d5bebdd02cd4f1def7d9dd2b85454a9022b600b7..446d77ec44f57a4929389b64fc23d3b180f550b4 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1552,16 +1552,6 @@ static const struct ctl_table kern_table[] = { .mode = 0444, .proc_handler = proc_dointvec, }, -#if (defined(CONFIG_X86_32) || defined(CONFIG_PARISC)) && \ - defined(CONFIG_DEBUG_STACKOVERFLOW) - { - .procname = "panic_on_stackoverflow", - .data = &sysctl_panic_on_stackoverflow, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN { .procname = "ignore-unaligned-usertrap", From patchwork Fri May 9 12:54:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889015 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 29638292094; Fri, 9 May 2025 12:55:06 +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=1746795307; cv=none; b=RMdvOBUHiWjow7eR0Zu/mSgCLiwulwUJSR3m3yeXSpBeT3j/GLypZexNd3jQGuZC/RMQV5UY6gnRUEl7kyD31wWXLkVs1/XeYITBpjTPNg8Iw0dtmj2AtRtzLXX29hri7x39f/ZiYntJdrTFNgc0zxyGiIv2p4NnBMUUq1LcXJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795307; c=relaxed/simple; bh=l7y3Jbe+VuDhW87xA14zc8M32/viN+V++/E2JThvO9k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fiBJqvEt2uCMvFUf6gowKK3EGnQbIvXO6ahLMSVGjJX6MYcJrbQfkTct3uFy9EybUNGlkhUnJRrrIJaTN0AT/fdQlMDfhL0DkDd9jzIz3Qc90ws/26ZhFP/W2JoJdZ82WB3HZbSsm/C+fkauaO6r0tgEmUQwnpEX7sKkCLlUd6Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cvBaQKIl; 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="cvBaQKIl" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5AB1DC4CEF1; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=l7y3Jbe+VuDhW87xA14zc8M32/viN+V++/E2JThvO9k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cvBaQKIl30gjPnU4L5BcielDqFS0aWNfC4wIqVdZ5yfrPbVavQw6m+ntmmq6DK6v9 td8YrcbypMNsm5/cN3KjyASUVwf7G9k2sMuWMPBWIeVO6WpB48JxM8Jy5rl93xxs2O SwsEBCktXBI/oMgbR6sEvWDcs4BuEEDcZn0UqFz7CrzS0bsfrJshGWbHPd1WB0yDEX MEpP60oUErTnvprCfozfhEZ7l+A7awq9qSg+xUr0fiMHLFvZKCc04mt2hgNYuLd1lv LaI0GS0SUhHEa60sgk0RkDdouQozF/XJVho6oJO+vhJVNNCd5Ri28MVbxD09steA+T NijHoEj5e/MRg== 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 4D8D9C3ABCF; Fri, 9 May 2025 12:55:06 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:15 +0200 Subject: [PATCH 11/12] sysctl: Remove (very) old file changelog Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-11-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1555; i=joel.granados@kernel.org; h=from:subject:message-id; bh=l7y3Jbe+VuDhW87xA14zc8M32/viN+V++/E2JThvO9k=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+yYzKzJgtt4ntTpokN6y9XDIsXdhgoqX5 F7WhF8VlYCeSokBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfsmAAoJELqXzVK3 lkFPjG0L/j8GaLr9ywOQsgvVv5Xw8VoMDZucw17xsIkwa74dooJuP9ZQVCakXlhPXB01I+E+zf3 aIMBrvOgTKo6Dznr0CNidgX9rcGPeCqQBm1WNeCzPzuu9OPwSblcK0EQW8d9pyF/wLryQK6Wkbc bo4TxGSyK/8Lwd1hn5SX/2Yd93Z2kSvP0lQluV52q/pRUnSgG0qtOaJYx0qb9HBOfZu/2vTWNsj UfCTtfKFJKGdCFF7oQcdtsjFEiicRoKDPxr+k9x4VqGfZvNaIv696bu4gAxC/LerRqjeZXPjbcA 8qM7Sp7gkRABoxRqT/BSQdTCkGqtagv64NcHDdMunCXa+XrVm7rWspSwzwZQpTcqKyDZT6ndewr 58cU4skHP3FxIGDvB499kFVSiZmYHjvngFgvBYrDepXsWdrZqlpnfwE2LERTqNIT+KB5WMkWudT txlECQUXV5CRvQmWSPFxr1Vc5bvZrHm4hsOvJn3EPCdOCSNEV7maDS/tVypyYKkJE2TQQKIh907 EE= 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 These comments are older than 2003 and therefore do not bare any relevance on the current state of the sysctl.c file. Remove them as they confuse more than clarify. Signed-off-by: Joel Granados Reviewed-by: Luis Chamberlain --- kernel/sysctl.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 446d77ec44f57a4929389b64fc23d3b180f550b4..dee9a818a9bbc8b1ecd17b8ac1ae533ce15c2029 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1,22 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* * sysctl.c: General linux system control interface - * - * Begun 24 March 1995, Stephen Tweedie - * Added /proc support, Dec 1995 - * Added bdflush entry and intvec min/max checking, 2/23/96, Tom Dyas. - * Added hooks for /proc/sys/net (minor, minor patch), 96/4/1, Mike Shaver. - * Added kernel/java-{interpreter,appletviewer}, 96/5/10, Mike Shaver. - * Dynamic registration fixes, Stephen Tweedie. - * Added kswapd-interval, ctrl-alt-del, printk stuff, 1/8/97, Chris Horn. - * Made sysctl support optional via CONFIG_SYSCTL, 1/10/97, Chris - * Horn. - * Added proc_doulongvec_ms_jiffies_minmax, 09/08/99, Carlos H. Bauer. - * Added proc_doulongvec_minmax, 09/08/99, Carlos H. Bauer. - * Changed linked lists to use list.h instead of lists.h, 02/24/00, Bill - * Wendling. - * The list_for_each() macro wasn't appropriate for the sysctl loop. - * Removed it and replaced it with older style, 03/23/00, Bill Wendling */ #include From patchwork Fri May 9 12:54:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Granados X-Patchwork-Id: 889834 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 EABB92918F0; Fri, 9 May 2025 12:55:06 +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=1746795307; cv=none; b=ZQ59KqPOrkSt/NErBdW0z/5pAq47pSy0k/MxLZ/ESrQHvIAyraCfxrM03dAVALSIqIyLUmu6qp+Tw1ufQeWQSkWaxxQT0PoIAgxgbGc8XFwY8e8kcSMgvdV2KY3OJ69gw1W7HXOzHEsnHDX1BZF3jtEEsSVreV5U6MDbf40AJOg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746795307; c=relaxed/simple; bh=9rUI733v52tyD4qD/w5fv4MFvpEqPz2boNwanOapOa0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ED19uSIKHLhn3uZ4kdxo+EB6J49yqrfQRJfdTmx7ZBpqJJJH1uNi3TaZK9f9An2cKwokWIkJeWJHr183ViyI7mk4WBbyFTVfyeWwdO6BxjrLxvppSZyLeiZLxaNyOK3+bAJ7vcmTLcoJpvvvRfMxhL8+yz6dHZ6p3cP5bw6HHjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a2gnI2ZJ; 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="a2gnI2ZJ" Received: by smtp.kernel.org (Postfix) with ESMTPS id 69714C4CEF3; Fri, 9 May 2025 12:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746795306; bh=9rUI733v52tyD4qD/w5fv4MFvpEqPz2boNwanOapOa0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=a2gnI2ZJQZbb9jNAm2UICyM4UeiBulsb1SLjv9+QiXAsZAhPIIOaClx3sCZEs6vyK 7GmfUMqUbqfp9FEbJ1P8skw1q3Kz5V25wbQM4wdMOFkNWXexqzrDjH0ryjP/wjcvfz T1aROfRgK1I/NkbhdhxN9PKUdrEpjCb9t8NAr+DH/C3lKFz5twJsYZso5K2wO6j+w4 DE651QxGkwT8ilBPqmfELA9nJOBGNZbJ7G8HAa5PBIISXDrFExmVT+p5z9EFNhBexA aGnjoRfsTo1fxoRkJAXN01w2ERMQ83cZRDdy3DriWWb580GRTVxYiZW5tPfND/dXRn hBPaHXPG11wGA== 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 5C66CC3ABCE; Fri, 9 May 2025 12:55:06 +0000 (UTC) From: Joel Granados Date: Fri, 09 May 2025 14:54:16 +0200 Subject: [PATCH 12/12] sysctl: Remove superfluous includes from kernel/sysctl.c Precedence: bulk X-Mailing-List: linux-serial@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250509-jag-mv_ctltables_iter2-v1-12-d0ad83f5f4c3@kernel.org> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> To: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , Kees Cook , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long , "Paul E. McKenney" , Frederic Weisbecker , Neeraj Upadhyay , Joel Fernandes , Josh Triplett , Uladzislau Rezki , Steven Rostedt , Mathieu Desnoyers , Lai Jiangshan , Zqiang , Andrew Morton , "James E.J. Bottomley" , Helge Deller , Greg Kroah-Hartman , Jiri Slaby Cc: linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, rcu@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-serial@vger.kernel.org, Joel Granados X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2583; i=joel.granados@kernel.org; h=from:subject:message-id; bh=9rUI733v52tyD4qD/w5fv4MFvpEqPz2boNwanOapOa0=; b=owJ4nAHtARL+kA0DAAoBupfNUreWQU8ByyZiAGgd+ydY223rqSHwB4C1mckkQQi7bRKrIQfLI rtDBZEL1cuGSIkBswQAAQoAHRYhBK5HCVcl5jElzssnkLqXzVK3lkFPBQJoHfsnAAoJELqXzVK3 lkFPmBsL/2553g/JX/UeMa5y5SOfFJmDPzhUtapo/71UW/5OdLFx2JZskrl0SbCOFUfjTwu4mJp c5jTGK5aw/Hb2/PyQveQBCyfhdq5TjMC2c/rpw3Ryp3BEvjdyPp+PvWY0YuLlMjnTkir8oNYX3C Pym1ifCJS+k178tPjpVMvnew9QomUmd8TgWhBcYOsiSyCUY/x93rKSyWwFlrnOCaiXRn6YsDkCk 97/85cO2uaUxkz3Ayi+CHOmlQYwuPT0jl3MgjN98SBFJ4mdks2b3s7bAMGuIU3I75iKBwVLdScp UbjEiSSeFUvKyiro5Bx8RJadVmBgGivzJApqMmJc41WKE9paV61DlIYT/41oniS6v/z+R82BSQH 4AGsd1bvzVsIHiBLKIMfcs+rMhnhCCqzpn8ATz82I+SRZaUGTho21sMU4jBU/wSwW41PjOP4tMB UzYzCRVa4WwLsWhHJiReLrqNzM+hUw93Y1QlQ3MwcIFI78jxVYsb2Va5Hghv4fzkbhaabqEClB7 Us= 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 Remove the following headers from the include list in sysctl.c. * These are removed as the related variables are no longer there. =================== ==================== Include Related Var =================== ==================== linux/kmod.h usermodehelper asm/nmi.h nmi_watchdoc_enabled asm/io.h io_delay_type linux/pid.h pid_max_{,min,max} linux/sched/sysctl.h sysctl_{sched_*,numa_*,timer_*} linux/mount.h sysctl_mount_max linux/reboot.h poweroff_cmd linux/ratelimit.h {,printk_}ratelimit_state linux/printk.h kptr_restrict linux/security.h CONFIG_SECURITY_CAPABILITIES linux/net.h net_table linux/key.h key_sysctls linux/nvs_fs.h acpi_video_flags linux/acpi.h acpi_video_flags linux/fs.h proc_nr_files * These are no longer needed as intermediate includes ============== Include ============== linux/filter.h linux/binfmts.h Signed-off-by: Joel Granados --- kernel/sysctl.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index dee9a818a9bbc8b1ecd17b8ac1ae533ce15c2029..0716c7df7243dc38f0a49c7cae78651c3f75f5a3 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -5,44 +5,24 @@ #include #include -#include #include -#include #include -#include -#include #include #include #include -#include #include #include -#include #include -#include #include #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include #include "../lib/kstrtox.h" #include #include -#ifdef CONFIG_X86 -#include -#include -#endif - /* shared constants to be used in various sysctls */ const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 }; EXPORT_SYMBOL(sysctl_vals);