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) {