From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 463E3C3ABBC for ; Fri, 9 May 2025 12:55:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 44F39280029; Fri, 9 May 2025 08:55:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39D84280033; Fri, 9 May 2025 08:55:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0702528002C; Fri, 9 May 2025 08:55:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B371628002D for ; Fri, 9 May 2025 08:55:10 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 047091C7B32 for ; Fri, 9 May 2025 12:55:11 +0000 (UTC) X-FDA: 83423364864.23.76545C8 Received: from relay.hostedemail.com (unirelay03 [10.200.18.66]) by imf02.hostedemail.com (Postfix) with ESMTP id CE29280014 for ; Fri, 9 May 2025 12:55:09 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; arc=pass ("hostedemail.com:s=arc-20220608:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746795309; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LgsEhibxVV1RrxIgHZ/WqyrTX927LIL6n83h40/Zlw8=; b=3hJrf8FCZ6Riw0H9xOlosftw6REjH3OvSHyJS+/CI3ZIn9mQHuAtZo684oPYsREmNM0KnB oaGXlmEU9IzJ9Dngd+EWyvB1S7kINyv81Dh5R2MyRrc3eD0jAZEnfehpni2JIN2x7LInW7 R5+K8rU9Qn57A+AWHBTsu9SHu672WSg= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1746795309; a=rsa-sha256; cv=pass; b=AUmmtdgBIUkpZZQrpxx+zTBzI+bmQvUYoNnZYuhXMF5k9P9I64JPDWoxESSUcjDdecB65U A7RG/A8hvLFdKszpXPSNke865wvSajeTQHO+7FlPyx4NKngPR8Qmr/v2xpmZ9GjGMccCPU oHT6wApP9ntLhTBE7OyKpbEOhjBmI5g= ARC-Authentication-Results: i=2; imf02.hostedemail.com; arc=pass ("hostedemail.com:s=arc-20220608:i=1") Received: from relay.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 64F0DB6329 for ; Fri, 9 May 2025 12:55:09 +0000 (UTC) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3877A16010E for ; Fri, 9 May 2025 12:55:09 +0000 (UTC) X-FDA: 83423364738.17.66C9B33 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf25.hostedemail.com (Postfix) with ESMTP id 659E1A0002 for ; Fri, 9 May 2025 12:55:07 +0000 (UTC) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746795307; a=rsa-sha256; cv=none; b=zROq+R5o0GDSfBC80hXMEF9Z1ZaG24S7Z8ijnWFK2fT0RYywtf5IXewCm4sClBZCH3ras+ ZMcKR8wC6ptLyMABn+Lxkj5zwuiZjcRvN3JKCep5M23l8exhkkGaSzH2oGnAY2rQhg+HUS Y1IxaeVc3tRCMKVZCRIGb3v93/L914I= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HC4gZAQS; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of joel.granados@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=joel.granados@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746795307; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LgsEhibxVV1RrxIgHZ/WqyrTX927LIL6n83h40/Zlw8=; b=QCX+v0s8Frg5qdBg8w05QWud56N21uEKrgidx7Eq04rwpCmFGWcGEHzJ0Oo8pzLrcwRrWr /9hgen1WPXTIdxfqc5nPhoV7YlMhaQVSRLZxYGhraa0O2QgpMYCzHn+RfcAa8TtklVtcPr Adyz+hb1t5oKmbclW4jK5mcWz+V4ch4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 8152F629F8; Fri, 9 May 2025 12:55:06 +0000 (UTC) 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 X-HE-Meta: U2FsdGVkX19JcgPQsXkoHChYkaaYjRMiWI8g/Pt4DCf+ZMoafP8X/hgZvcew+QUUo6K2M54LZHGk61NbjUd+l7XiXgHEON1nfe+6bihuuXwdl1KzGeIXJad4X59h+acgM5WKlo7xwd1V9uv5Esgq6DX2k/DBc2yKRm5b+SMRDCyr08C3jhysiJMRuqxo+4zxPyPK5xk6SsfOjNmv0IS13xHY+WUQTNHUF9y66pMxfc0MJAQR4vbCssErGmYBcs9Dk/oCRPHC66Y5sKbDxk1jZ3osUhDf+iRhzcAviASewuF6RD3Jv9+qxtrP2/LHyZMYhYQ1d51CyNygJUGqT9Guz3cKjXmeSptKBvVBvAQ/IRKkEY22puOWO12a9CckcTKeMbLSvI93ZwoUhCSY4iBkGkRijoPLKkJH6YKJX4ZGMo10zgeTvBLnzpLIogjDABU2T3eiFHYydis5iWIerajjTA7uvsqDHO/8kv9QV0ozVk8uIsyie5OIG1AE5PhzGxruRYqj4UgvSO9b8yhCqc+KRR1xTArfkp2UWNe0LlZUjwaP5raPd09dhzADbr0bEDmBJ0obRypfunto6cNhFLhaBZQchh6iJUlxAcsQzWH7l/vcWKCkzHrlEpc2v2LVg+cRBEnDolWQzxBb38Aq7WprlAaWG/+Xix248bx5wfSswEgmZdKTJ/JrjUcJRd3S4Y19nKH0GvQFQrpqSpuYt51YeTCiWsJkPWso1+qAc7ZWN/ZHfh3cPkr06SZIfRo+mmcuTsyAfBVAdNelRzDrycgM/tUI1SlO2cOhee+MovQ1YDyuzCgwifgMqHtVL0r4FjkCGC32GRP9qf+3RghX10hdXz/ZOfryJZ4Bpn6jWpi/bBkajApJxVLOYXBnyIzF90Oefva+1R4qv3Xjyu258pXUiQ/ytDloPY18gMQyybGFUVovawSh88sQRIwz3jR0c7KVkDbigy+ELErqs6pAu1O gRsZHjLW tguaA2BmLgwXC82M+ZcQN3Tr27y5/Igfhq1mYCYwpsogyBn86kevA2SZvwQUKji79Y/0sQJVQofghlp980namfLc/6aOH4fwDLAU/cIbp3U0afL2ItyPoT5pzaAGGC34G5QkpMV/bxn2nDG9mrACpRZ4hSuHh3CW4npmTmOSTGpfUxDAD4SWIywFk1AeYPasaAV1EsSvq/JshmQc07DpC5PL/y09NcELN/OAiKu4nRYwztkbZhJyAXr+3Gnqh9g3ZiJ9vHoe96p57lFfoU2ZyPoVq/N2edWto/EM2nmUSpPJlNXYJ/Ge+K2j+6tjxuF8EtgyZ X-Stat-Signature: 6jhjnm6n366mb914ppmuwtyood9njkwp X-Rspamd-Queue-Id: CE29280014 X-Rspam-User: X-HE-Tag-Orig: 1746795307-99771 X-Rspamd-Server: rspam02 X-HE-Tag: 1746795309-358709 X-HE-Meta: U2FsdGVkX1/E/EENZaXVjWkUaxkcvPPwAHHYv0BV/fBAFIKVbNuDqWvhMY5vaBTkr0PSZ41xX5iID5zdJfocXeLjbm3lfQcywmhKJW4eoSa4CZCjzAdIDGYfFuLsjK/36xENGeNoVuuTz30wzSfJ0bKyq5covr+f+MPq4e+4tMrMf3MwrBoQyZ+o/smSUTa97Fy/i1aaO/RfZ22HxJTPwA+2XF1Hts+McO8zHuYrWjK6R3igtlfYCipb/vN4yeXQ/L/bPJRYiYwn8diNlIT+daqbvkOmeDTUCgTFM5/4IFPzOouJ4mBTLVXQWjMQyZRy1Man+fRbASvVOAN4TynJaofuOXmcJ5sERtzBcTNXBOMD6lVVi9sSGgLdr76GHKplsoQWVxD/wdL3mnlaSTE090sgOiTrRXVpPkzLYgaOtURzbpvxowPWROXJIUeRK7KdutvECJBeqby0tBbIpZSnWWzJnRJB+4/jqlruBOR88bC4OhyIt7ZOxutCqsnwrC7ArY0yqsjw7bpFGJqI3AEYXI9lxMZz+3Rgncjb9+WcrAfgiz7GaThxxrYWgzlYP/JZ8ldQMAgrmL4hh0pV3E8mLflg4aazx5yimmtIZrdhsak2OsnS3eAhX/+JicIO8LpnJO+9YA4EGABkgrRFutf1jidlA36s7utboYm106XZOP0tTdd3Pv+cHzFQTkhABsVIpkclCI81lBUKfOyiEbCgw8u5wtzCzQ/1ntv4wcKNZllxi0khL6aK5w+5hNnEb6BzqivzBqo0vN+62n8YU6Qy3xm/yWtoA0agMtbVGjS/UXT3tRcVxT94iO/5qsPf5pcc13kfBxbgJXMmqg6/eCQpmGFHBIm/h98knhkkakwLLc2wWyBtdeVijELKL555KHnxa0PLstd2jhDaxPGVI25qJTmwHplwheG/qkGF4JQGGbs3L3Xrwl2R+TnGqWl4EdxqjZcf4Vs0/E1Lz2LZiJW Yhq911n/ w73Wr5Grr83b6mAHNK1sXt3IpLf4Fccm8vGZhFWubvMMPrtWVvMAHLu4LWwA1SF270t945LFcJNOsRILX61hABqQqPsMEOAYNDRhHt+6po7iYh5DWHItF2PTItUY8mN6Gf9hNGqJGUQj+pWwMRq/gKd4CfQTKiMS0MNst9W7ur80PBxjQo+bzlC//InzfoJ40JyL8y+530RP5CbQEbfp4NJv8U1beFrmXYROBzaTiKoMMj2+ryCqNY6Yu3y2TJkKluiGf X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 --- 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) -- 2.47.2