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 8CC6BC3ABBC for ; Fri, 9 May 2025 18:56:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A44E8E0003; Fri, 9 May 2025 14:56:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1536B8E0002; Fri, 9 May 2025 14:56:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01CA78E0003; Fri, 9 May 2025 14:56:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DB7108E0002 for ; Fri, 9 May 2025 14:56:43 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 309E6BEF00 for ; Fri, 9 May 2025 18:56:44 +0000 (UTC) X-FDA: 83424275928.03.14CAA6D Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf05.hostedemail.com (Postfix) with ESMTP id 8EA7F100008 for ; Fri, 9 May 2025 18:56:42 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Iv4X1708; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf05.hostedemail.com: domain of kees@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=kees@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746817002; a=rsa-sha256; cv=none; b=pa6DpkaC8esLDyYThOCAn9N2nkOkPbeGXACnQPyd05H8HntcxjacOy0saI/cRxwpnd1mDE WgRsemiCND1IDJtO4vkpya638qkoABn37r4HohpzYzBZseeb/DJ0XxTzacuUztPbp4ezC8 Z7gA7GknwmDK3yvNQ6lQoYLKLEhNKGI= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Iv4X1708; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf05.hostedemail.com: domain of kees@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=kees@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746817002; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ijfKgJ+8ryQ59wwcnQz0mIb4CiuCVf/Jg9Ea4SQerHI=; b=SnMVOolrUTqEUmmfQ/oDbsBSfxB8cuU8pWsnSljpz4duR5Yu4dLvQo8pgRSM5E6DJfQ4lr oBpAeugn3lLCkUFuIbvE11KBwZAT+HYsWfAvRZ3xhstz4ykJ4Hyzpit/qDw97mrIumqkvi Q0vLJRcol961xB18Kx8s3BFEFuIp2Ws= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 9CA4B6111F; Fri, 9 May 2025 18:56:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41F93C4CEE4; Fri, 9 May 2025 18:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746817001; bh=mUxEVjMyxn2ufS687Uv1jEwonkP9xfj+lje4fRPivVs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Iv4X1708547EcVt7OI6Ts64jpx9PJrcWPUVIGGIjsk7Rev/grJeIEIUw4XFc5WZcb cN/lrad7TQKW4xjutOCMy8tLhIjIvRhevgYgsCn+PPUTYk7MA1CXsTjaLyEuYEZj6y JqxV7wm3mFNVnUOMIG2qi8B1ffiPK2MXqIZxzv5t36shv13vJHHZZNYhYgz+fa0ZnI YsarZGpH4IWyerXPuJbcBLcR8Ou+TmsiioroHmf4xeFtBNOvLv4FkMoF1cBQkT2Em7 kElg2k47qUuOkupYEKIG4MT5aU+969LlNHqLn+eQU+LrgHJR0v2OtMOmi9EouaYOOk Vrql2REAKVslw== Date: Fri, 9 May 2025 11:56:38 -0700 From: Kees Cook To: Joel Granados Cc: Luis Chamberlain , Petr Pavlu , Sami Tolvanen , Daniel Gomez , 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 , 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 Subject: Re: [PATCH 02/12] locking/rtmutex: Move max_lock_depth into rtmutex.c Message-ID: <202505091156.8B42E42@keescook> References: <20250509-jag-mv_ctltables_iter2-v1-0-d0ad83f5f4c3@kernel.org> <20250509-jag-mv_ctltables_iter2-v1-2-d0ad83f5f4c3@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250509-jag-mv_ctltables_iter2-v1-2-d0ad83f5f4c3@kernel.org> X-Rspamd-Queue-Id: 8EA7F100008 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: iekbj537goqo41keonjrxhwot61u98gb X-HE-Tag: 1746817002-76015 X-HE-Meta: U2FsdGVkX1/oggSMAbrDrFf1qRLlu0fz2rBwNl51hF86Dfz087os8urLeuACoifpMH17AMrBnrpM3HEB3+o2x7Cxbz9KnVV1ZU9bo7XJXswgI2cP9XA0x1jr9sFw9n9wqcefaYzS9gR7uaY2EHpshSMdd2kvpRSqv1Dg8eS8mi04kwN+Rj+ygY1k2qKJTakyYp0rroLas8QoCQH5pNiqqIx3ZGRTza78Ku3+XcupNmhynnbj7dD1jtwQ6WxIHWf0NP66HVMaUtxZ0uEP2kiB7E+XoNEMYKKmRGBxDwfRB+fwd4OOW5gcfpeeZrxejdmMK+vtOP1Xyql8A42IFI2WguQy/YnVw9OUMGIHHZKgVxvp2uLOzgZiISdAgA2A7zH7YA31yumnQGT9iD/Mi6Dfo3kBwpTcymnPgfP9Ye3HDsqxCw5hMGH0iYfhY8eZwXRkQEqZMharCEtSFwUr+E0pjAMehgQKjlujHVH6HQfNgyyCp7Rlr53uemGYbuTcxUSlGtkTZPWY2xlzZT+Cmq4VHs/zD67eUB2KtECaW9I45+qiUozh2wo//rLe/2g9goX/8szQOFJWW5MvtEHbhWvn7IRhMyWlVzuJn0/3FtmCE6L93FuoFqev9JQpGkOb7q/NzoaFqLVfaw8SgRiiqA9g9AcJYPW/GXQJdgq4rnUXIA2L3I81BoyiL3/zl1jWgTgRPdW8SibRai051AfyvFRbL9IFUw4QLN+zeXzsBNzGG7OMBSjItoN7nS1qcGAsysmDK4a2GmVVnX+38i0c7ZL018xmntfC/EMuXNSvWmwq0eE3dgGKEvUTantw/kEimb9lH7NA30kEPAxKBdaIkTWj8dqr2dsFlrCF4aiSSipYsrIxbHnIL4z9xB8LXVjwftlhPQpvMj6EnH9NZygKiIJdx45C83XeiNME617TkCr09YasBcATgtNGy9OBIzlO90NSgLFTqK3KhcYbY0Lw1uS NEe58oAe yodFC5/DRJ27yyF1pzP2Qemp0gJs9fuslkKRf7jfKStcHnakSTnrlVwF1Dtt6j6PyJz7mdI5ekxGSu3lkgFloaf/UgixYmE8fe9md+oQ77sntBCHTJo6krBoWV6e0h5i0zq65B2Ua0TeAb4kU6zCmS5u/QWtgBCw3EeLw5fhIoiRqMYqyOm4XPyN7cWXvh3FOug6nj4uVm7MdgVsDwMn0EWvd6RZr0NRXl7rN3To6dXUz5tOLfDyijyKCMus353WT/qRhoAzJchsC+M1y1sleGsae2cB24RQFuT5zKI3tKNLUASX/VLVANvcnjDzRGXrQ+16ySdM3dl9Ms3D8hBVgjypY4aWNd0xmMYQpwWOxJhyhmQX11qTio8YwQGdh+OSLoFkNMj/HQZVnp0Mc+9yz8woGqF3okl8qZ7vxNboQoCksjV4= 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: On Fri, May 09, 2025 at 02:54:06PM +0200, Joel Granados wrote: > 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 Yup, all looks good, including the variable relocation. 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", > > -- > 2.47.2 > > -- Kees Cook