From patchwork Tue Sep 3 03:30:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yukaixiong X-Patchwork-Id: 13787959 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 EF358CD3429 for ; Tue, 3 Sep 2024 03:31:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 499DF8D0130; Mon, 2 Sep 2024 23:31:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 335658D0119; Mon, 2 Sep 2024 23:31:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 160F38D0130; Mon, 2 Sep 2024 23:31:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E28B38D0119 for ; Mon, 2 Sep 2024 23:31:31 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AD9311C4E32 for ; Tue, 3 Sep 2024 03:31:31 +0000 (UTC) X-FDA: 82522001982.03.5CF1C07 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf16.hostedemail.com (Postfix) with ESMTP id 3C1C318000B for ; Tue, 3 Sep 2024 03:31:28 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725334266; a=rsa-sha256; cv=none; b=W0gI8qzTA1/3STAWQcVpZNgO5vQDffpkcll4pngxT1Q9KMuT7u3NBkiumqnlZWRRDad0s4 N+GHENcBbmuc5fgYXsuCAxvAVK7VK4WUGcJiCQ8OEm/wNyxdzrFMGdjaVtzW/rtJsyXd0K antgqdiSF8gN5JGhjEFQJyGvni4pfFM= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725334266; 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; bh=7iGQDt0hhjblbE/jy5UXK9JJi1RMkoXsxikX3jxX3us=; b=BLDqLt+vWA1EJq6DpfKydJ+UvMFdlvq8cVLbZo8Y6MSYE5JgFrijSqJbGUtkcxYR5lsNN9 +ojhHkIWYr8INmrW0pBJPb0EWUfui7Btq3fnC8BzNtFhSaVURsK9Fl4UfOymiblpi4GBOI a2ML/+/3oeo1h6Q8D3DakzdiijJaUo0= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4WyWHn6dS2z69V1; Tue, 3 Sep 2024 11:26:29 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id F2EBE180087; Tue, 3 Sep 2024 11:31:25 +0800 (CST) Received: from huawei.com (10.175.113.32) by kwepemh100016.china.huawei.com (7.202.181.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 3 Sep 2024 11:31:23 +0800 From: Kaixiong Yu To: , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v2 -next 10/15] fs: drop_caches: move sysctl to its own file Date: Tue, 3 Sep 2024 11:30:06 +0800 Message-ID: <20240903033011.2870608-11-yukaixiong@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240903033011.2870608-1-yukaixiong@huawei.com> References: <20240903033011.2870608-1-yukaixiong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemh100016.china.huawei.com (7.202.181.102) X-Rspam-User: X-Rspamd-Queue-Id: 3C1C318000B X-Rspamd-Server: rspam01 X-Stat-Signature: z71hk6n6ee81ijr91ngpza8y8nc1ke4s X-HE-Tag: 1725334288-223541 X-HE-Meta: U2FsdGVkX1/ADZoEsijDdGvQGPupwUciTiVAxzha039lyS1Ed8Vbi+Y2RYOiEAkaP/xAiNaw53PMgf1n1AW0P3dRWEkrzdett4Ich0NNDyUPJ8io0QAWDikdsqLZWneFAFYz+YLdRSAi5C/SzTB9KBlD9aUK/MwOUULo6M1D4qAG3BFzCfUl6Ne4235JQtah1t+Rs9Eh2rQ04rjPkJiOVC5zwSaqvJGdt2rbwo92+vIJxJXX3HWMM3SzdhytyBIL23lS/d7kIAB3hCXq7l8ZnRXDPEFc6vgXeYIuDXQL6G0tuC61xjLiYevsxCT78d5vNUx2zlSiyYI3eIc8fwF/HM8KeepwoWjozKMvSfCDNSdv3ceYDoKT6d2W/JjZErrbnHDrqBUMS3REgHOTzn+C6SJG5kQcSYkmdG5ne50dxUc2yI11nFmjKe63II6AhCQYGh2a1s1tqBWf/kI6PhD7WRPnVQDaNfd2lbCoNPQDnDHJ54JI9Sur46E/jnlP1Y7YfZ5gQCayaPt5iPoGrpd4iRY7H07pGrcXyx0e3wtlHXhnXFYMk0rzfGjiY9DeUyH0gpsKm8fjRiPJrQhc/TnpJ9JjswXmh4uzIxQnskhwBEyO1CJsRqdxQ+WoJWSBzw/nJoK3MA1+2ABlZpBGMnJ4S/NK/suLLVP6xEeFKO5yAIjDxK3IvHR5LKH5LlsSc90n5rlgRPUibj0tONgeeK1Rzdu6ewDFj2ARviZEQKI5jaR+BL1VvcJiRLGp+qJEYWgE6+d9M1n4Y277QqDOwlGUB+ObrHSAsIj0enLRtqNzmVOm3LKuRi3ZCml/HarQBdvSpkaQyi718gaGRB0vo8wW/J+WMjE7K3MvDYUgaxPsmLCIZKTUVbZ54Piho/YMgAr7apYwedsQC8bPLmmgLMvlwOIkdRS5YI1TSuImdyDbAJNpabRv/pE2kK02W66/04jhyX26PlEzPj8Mjcjj8wt iM5E/tzf nRC+Csyzsb3keFlQKLdehbzSl/QTCSEeOgop8SZni6OpB7QippwMFMw3rZ5HGBmsdOUmduBGAjoaRP/hvwBZvg/vUEq0lmHYtMrluxqc0l8ma2ojNxAbyhtTkGGvmbEbL3hBEUvQeQGHmQKj7ezMy+dK7+nHgRtnCMMZV0KSZw6HEvtQzZkSi+ssD0nWBTrz3PwbqrwBNnPx+pSFtaTgiPOMU0A== 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: The sysctl_drop_caches to fs/drop_caches.c, move it into its own file from /kernel/sysctl.c. And remove the useless extern variable declaration from include/linux/mm.h Signed-off-by: Kaixiong Yu Reviewed-by: Kees Cook --- fs/drop_caches.c | 23 +++++++++++++++++++++-- include/linux/mm.h | 6 ------ kernel/sysctl.c | 9 --------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/fs/drop_caches.c b/fs/drop_caches.c index d45ef541d848..f2551ace800f 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -14,7 +14,7 @@ #include "internal.h" /* A global variable is a bit ugly, but it keeps the code simple */ -int sysctl_drop_caches; +static int sysctl_drop_caches; static void drop_pagecache_sb(struct super_block *sb, void *unused) { @@ -48,7 +48,7 @@ static void drop_pagecache_sb(struct super_block *sb, void *unused) iput(toput_inode); } -int drop_caches_sysctl_handler(const struct ctl_table *table, int write, +static int drop_caches_sysctl_handler(const struct ctl_table *table, int write, void *buffer, size_t *length, loff_t *ppos) { int ret; @@ -77,3 +77,22 @@ int drop_caches_sysctl_handler(const struct ctl_table *table, int write, } return 0; } + +static struct ctl_table drop_caches_table[] = { + { + .procname = "drop_caches", + .data = &sysctl_drop_caches, + .maxlen = sizeof(int), + .mode = 0200, + .proc_handler = drop_caches_sysctl_handler, + .extra1 = SYSCTL_ONE, + .extra2 = SYSCTL_FOUR, + }, +}; + +static int __init init_vm_drop_caches_sysctls(void) +{ + register_sysctl_init("vm", drop_caches_table); + return 0; +} +fs_initcall(init_vm_drop_caches_sysctls); diff --git a/include/linux/mm.h b/include/linux/mm.h index b7f12988237a..d48933b47076 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3765,12 +3765,6 @@ static inline int in_gate_area(struct mm_struct *mm, unsigned long addr) extern bool process_shares_mm(struct task_struct *p, struct mm_struct *mm); -#ifdef CONFIG_SYSCTL -extern int sysctl_drop_caches; -int drop_caches_sysctl_handler(const struct ctl_table *, int, void *, size_t *, - loff_t *); -#endif - void drop_slab(void); #ifndef CONFIG_MMU diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 373e018b950c..d638a1bac9af 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2024,15 +2024,6 @@ static struct ctl_table kern_table[] = { }; static struct ctl_table vm_table[] = { - { - .procname = "drop_caches", - .data = &sysctl_drop_caches, - .maxlen = sizeof(int), - .mode = 0200, - .proc_handler = drop_caches_sysctl_handler, - .extra1 = SYSCTL_ONE, - .extra2 = SYSCTL_FOUR, - }, { .procname = "vfs_cache_pressure", .data = &sysctl_vfs_cache_pressure,