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 AAE6CC3ABC3 for ; Fri, 9 May 2025 12:55:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 71831280025; Fri, 9 May 2025 08:55:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 67AD0280026; Fri, 9 May 2025 08:55:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 51BF5280025; Fri, 9 May 2025 08:55:08 -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 355E3280018 for ; Fri, 9 May 2025 08:55:08 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4DEB656064 for ; Fri, 9 May 2025 12:55:09 +0000 (UTC) X-FDA: 83423364738.09.190CB07 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf04.hostedemail.com (Postfix) with ESMTP id 5CED840003 for ; Fri, 9 May 2025 12:55:07 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SGIOsJx4; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of joel.granados@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=joel.granados@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746795307; a=rsa-sha256; cv=none; b=Qe3n4uBuKJUc9dVMXUtjuL5z9OE7de2PwyGjxl+Gp9TJdsNCFrxAMBzNt2H9A+J9zAxyAj 2zdw4y1WSdg+LWd+sV2N2W5vdERgrFWqRn48SE1rgELaEpeffZrvfg5SKfDs+fbu8cAQRH BGLk8/vgHYm+rSzDXpg7WKf1HwluV5I= 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=HF3dVEzP51tStdTu7P7itk+xsjZjBpfaOraLqOIJBWc=; b=ySZaxPOB3aGi3coftj2PRAGvI9V/HhJwv4Cf3bs8/IrouyqVWTdxVVIz/bMWAu8bRMVbtL ahtMDSugWDW3v3ADyqcwPkVSg7nKgDLnYg5RwFZopuSYncnj2ceFHrGhKKtpQyb3G1hqYF YgzrQJQ//DWbkojLBGxVos7dDFnO900= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SGIOsJx4; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of joel.granados@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=joel.granados@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 3B4FB4A7C8; Fri, 9 May 2025 12:55:06 +0000 (UTC) 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5CED840003 X-Stat-Signature: t3mp9swbppeq71h48et9xnjcfo1hon4y X-Rspam-User: X-HE-Tag: 1746795307-989888 X-HE-Meta: U2FsdGVkX1/+zJ5qDQ8HMl5DYjqSrknBQLq1Oo7iLEnUsgdyUFSes0X8p9L4D6j+D5Pg3VZyWwfEcnyyM/iVFqwNK0BbdzwVanTpYYaMPn6sDiL2QaAR1W+2xUuJ9dsTubRSV3T5YBm40lxSfpesd2ScTe9FfhmjesajkT6lPNYilEzbzaIsZlxyrxBK15qfAkhMO2xJNME5iZSpSJ8EqmeDKNLlrvGMhvPfkmcYHLIa7cx7Mf0G7sOK3RadNUEFsfTtLZhtTM+UBiOMKmh3+uQBc5+ho8pEBdKWNM6BSV+lHVkzn3wQS0eiUKsjeH8GRAiehUOZMtnV0s1ew4kEBGRXpsf/bukDqM56pY5oGzzpfWG6xMoeE/7AJfqRMnM6IE6HdF+x0mTbs+v47CY9tLQesoVvHMcSfWOJV2WgIpkvsOaZ6QWXly9w3D7FWuwFbM7mS8cDR4UeoM+mUFwdEg6dfMLEYQmzHZcKuL0EcgfENbpLErmY4QzvOiMrE/xvxG9F/3+Thm6H2ejolmNPZZrRGXHSctA2qTztbfJxAtE/R+7HWzz3eU/ZrsrYayKQigXGAaLWd3Ej2Sedsg/aa1UxBLrZWEZIzFYjiR26Qh9QpWh2oOucZAEAdaYbEdfBh4G1APUVcg5A1fKSpfBy96eY9KzWUFBttQrPTP0F+o0oz9fVsXs1sJLV0YCCM535c3zNjs3qs8PneyMz/CgvZhpesZazkXdsfRKY/HL3zm4ALgZRYrgXcPZXbmiCeQzPGFERWSSPiiSigVqdm3Clz2W2CeCnPHZCNbbVu63y2ymrhhbOVjmY8WC97qyZLtMKd/i79sR3wpidr5Q3DTbOYiYIm2RnPdQMZBSxcVv1GTxMR13Sr+q5yCqHOvGMi/U+bQ/LqAVGAWKFv+kqyc18bog4UJbNwMvtNCAP+ZMSE9uxdntrilFe3bt5WdkD1Wd6psHYNGzx4lVBc1OTE5N GcOBCG/K dCaxF5jqW1GLyWYOMpoyXNUm56ZKmcAFRinhRxfQMaZYWxIpWemvXgBfJb48Dza/Du7XtEaG1usbGBoX7mJ+YdOQ5H/sAdlz+INJE+9p+qcG3PfJwMEjkEJXOXi1HtAoeqQrEZZuRMJdA7ZoUPLnDrCTwlZ6jePx4TRI24UT2y24yFRQziXQwpQm09cSDcH8vHM28Dx7Twb/uhbGcgSrJQTXxo53M9BSPAqz8Yjmmzqk5vb1RgpnJYGgNasLs1nbIUiaYQNvy5PGSTHcbmzeyFBUcCzeA7X0T1Bm1Q0XL/riNAFMAcNriMhw7mvzHiLf+IWHM4Q52ojA6htpJDFuU3TfF3QnPagkSD27WvNiLczPo4OQ= 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 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 --- 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