From patchwork Thu Oct 10 15:22:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yukaixiong X-Patchwork-Id: 13830192 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 11997CF11F8 for ; Thu, 10 Oct 2024 14:11:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B35726B0083; Thu, 10 Oct 2024 10:11:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE5646B0085; Thu, 10 Oct 2024 10:11:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 95E396B0088; Thu, 10 Oct 2024 10:11:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 794A36B0083 for ; Thu, 10 Oct 2024 10:11:41 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 788EAC0601 for ; Thu, 10 Oct 2024 14:11:37 +0000 (UTC) X-FDA: 82657880802.22.AA0A31A Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) by imf22.hostedemail.com (Postfix) with ESMTP id 5BB25C0005 for ; Thu, 10 Oct 2024 14:11:36 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728569398; a=rsa-sha256; cv=none; b=Cwke6QpkcIJfrzO68VKl1tcA6dDGmlNgoP60WMFO74Swzw1qwm5Jb8rEXbGtrE4D+YvL5L 6wvnGN4+bj0InMAU+ggphvaMKltNmE8LYcFlRizVXQPAGVeiyG8xQFjdfDcWIdwJIoxFEB 8pQ4BNwNZx52sMaoZE6sPBCCi7k80pY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.35 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=1728569398; 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=UWSPkCwxF9UmlURoYddi8wAGqtTYIkzJtcpFUjpOoK4=; b=xaGPTd6J52d2WjNTxl5L77+whmsg/KNSPHpRGFdgmwj7KM/yXPD/euv4ddjrVSJVpnirbL P5AYl9f9dRxO36zPv1JFfLsOp3WzTyFhcOQZsWXO6f36ZpDfOk7Ioh+uTXZNPFJMrZuoV3 N+zCHBR6WRYlQb0xC1EK6s+lnE/qewA= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4XPWqk51SGz1SCPQ; Thu, 10 Oct 2024 22:10:26 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id F2A901A0188; Thu, 10 Oct 2024 22:11:33 +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; Thu, 10 Oct 2024 22:11:30 +0800 From: Kaixiong Yu To: , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 -next 01/15] mm: vmstat: move sysctls to mm/vmstat.c Date: Thu, 10 Oct 2024 23:22:01 +0800 Message-ID: <20241010152215.3025842-2-yukaixiong@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241010152215.3025842-1-yukaixiong@huawei.com> References: <20241010152215.3025842-1-yukaixiong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemh100016.china.huawei.com (7.202.181.102) X-Rspamd-Queue-Id: 5BB25C0005 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 5eyhe4qipgdptffpzejci84r8tn349q8 X-HE-Tag: 1728569496-288144 X-HE-Meta: U2FsdGVkX18cOFCgGqNtV9MAesRXBaetZzDFchnCAZ0Grd4Nivm9Q65rj7IH8PoK+mXRrIjmr0o2nLsqYD8Vuy51R45TdIErxZ2eOGurqav4Hv2387bI4tuMoQPFH9o29i/k3J3GhUZfdaxHY7z2GG+jleNteRwIsOAF71SWfK0Zws0cfrdQ6xbrrTwUJIQTqica7QnpSwUUNJCzyRi6vRGysjUQbCUgCaTT/VatHQPP/gcul/ZN1cARBQPGnlUwUu18XL6eqQpWAr1U6ciw+PIYMWN7EyTPUKDBNxK8EPod5Ae5ofKO9l9AFZkM6y70uYUiLyNm3n1BaQQQxNZriVZiy5eYGAQ0bBPZyb4n2khRf7+CckUoentK4ErHYsNOR0nQScsK+aNIxMVWBRXxLReKXrC2pcGwe2JNPkc6arKByU5fMPKHNDKM2ldVSZEuFYPK306pXJ6BjUD56GeU+1KpLypJ8YQcwgxcVBaFSxgFADQfBX+Y8bGdvRDCiCd3sZcbdwU/W/sXmfthSzXHryk5pse9R+l2FvdyPVcO7QaeF9pjObnpGPKc1EduDED8+aCfprxCVFyUi+xlsKFDzSy2b9V8pLm6sc6Hg2EqHyxk2N6WYReE/TI55dGxn48E7vfPgEr+LC3F46RO8LmWJEdD/YCsZLmAghXnTVhIthBAHH/TIrQqvfwsNV7DTlOVdTK9r9d82gON2VYJhQR29UdJB6vDxs/NCaVmpkeZTgxvnWmfDq28qDOLpgKLpoFCXy8L4yKpXIIJi9wpfe9mqo9jdYJdui8nofdsv3I1fBARLfpn0YEa9p90eDWEUvuqPAZml8hvEct4Ldk5WrxQbPbj+fTC5ci06gcSO+K2n7PK39DwHWJl6afSUsD9S9c1FKiM7JvcmleE9gbqjffvsE/e/GhXxghi9gCXnS88aE00QNqnfEDwfLSwX0GMQ0ORy2CS1UkQ/OH1hjPwd7j 9eAYJRzB tykTiHWwDt35hdzB3+gWxe/ylbXE0RfMQqx9EgUF5JivRRZ8cY1JJ4W0pfYGUK8Vcpf6y6qvKCXGl9RajE23F+Vbix4Zpah5A+UfdgIpoaBgiYhCFEZfjd3Gvf5vxMrnc77KbL+6Bv8rFWlbLv8Pl8ZjhvJfUkWvBS4Py 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: This moves all vmstat related sysctls to its own file, removes useless extern variable declarations, and do some related clean-ups. To avoid compiler warnings when CONFIG_PROC_FS is not defined, add the macro definition CONFIG_PROC_FS ahead CONFIG_NUMA in vmstat.c. Signed-off-by: Kaixiong Yu Reviewed-by: Kees Cook --- v3: - change the title - change sysctl_stat_interval to static type --- include/linux/vmstat.h | 11 ----------- kernel/sysctl.c | 28 --------------------------- mm/vmstat.c | 44 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 40 insertions(+), 43 deletions(-) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index d2761bf8ff32..b2ccb6845595 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -10,15 +10,8 @@ #include #include -extern int sysctl_stat_interval; - #ifdef CONFIG_NUMA -#define ENABLE_NUMA_STAT 1 -#define DISABLE_NUMA_STAT 0 -extern int sysctl_vm_numa_stat; DECLARE_STATIC_KEY_TRUE(vm_numa_stat_key); -int sysctl_vm_numa_stat_handler(const struct ctl_table *table, int write, - void *buffer, size_t *length, loff_t *ppos); #endif struct reclaim_stat { @@ -304,10 +297,6 @@ void quiet_vmstat(void); void cpu_vm_stats_fold(int cpu); void refresh_zone_stat_thresholds(void); -struct ctl_table; -int vmstat_refresh(const struct ctl_table *, int write, void *buffer, size_t *lenp, - loff_t *ppos); - void drain_zonestat(struct zone *zone, struct per_cpu_zonestat *); int calculate_pressure_threshold(struct zone *zone); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 79e6cb1d5c48..726b866af57b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include @@ -2081,17 +2080,6 @@ static struct ctl_table vm_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_TWO_HUNDRED, }, -#ifdef CONFIG_NUMA - { - .procname = "numa_stat", - .data = &sysctl_vm_numa_stat, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = sysctl_vm_numa_stat_handler, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, -#endif { .procname = "drop_caches", .data = &sysctl_drop_caches, @@ -2157,22 +2145,6 @@ static struct ctl_table vm_table[] = { .extra1 = SYSCTL_ZERO, }, #endif -#ifdef CONFIG_SMP - { - .procname = "stat_interval", - .data = &sysctl_stat_interval, - .maxlen = sizeof(sysctl_stat_interval), - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, - { - .procname = "stat_refresh", - .data = NULL, - .maxlen = 0, - .mode = 0600, - .proc_handler = vmstat_refresh, - }, -#endif #ifdef CONFIG_MMU { .procname = "mmap_min_addr", diff --git a/mm/vmstat.c b/mm/vmstat.c index bb081ae4d0ae..25cb31545bc0 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -31,8 +31,10 @@ #include "internal.h" +#ifdef CONFIG_PROC_FS #ifdef CONFIG_NUMA -int sysctl_vm_numa_stat = ENABLE_NUMA_STAT; +#define ENABLE_NUMA_STAT 1 +static int sysctl_vm_numa_stat = ENABLE_NUMA_STAT; /* zero numa counters within a zone */ static void zero_zone_numa_counters(struct zone *zone) @@ -74,7 +76,7 @@ static void invalid_numa_statistics(void) static DEFINE_MUTEX(vm_numa_stat_lock); -int sysctl_vm_numa_stat_handler(const struct ctl_table *table, int write, +static int sysctl_vm_numa_stat_handler(const struct ctl_table *table, int write, void *buffer, size_t *length, loff_t *ppos) { int ret, oldval; @@ -102,6 +104,7 @@ int sysctl_vm_numa_stat_handler(const struct ctl_table *table, int write, return ret; } #endif +#endif /* CONFIG_PROC_FS */ #ifdef CONFIG_VM_EVENT_COUNTERS DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}}; @@ -1928,7 +1931,7 @@ static const struct seq_operations vmstat_op = { #ifdef CONFIG_SMP static DEFINE_PER_CPU(struct delayed_work, vmstat_work); -int sysctl_stat_interval __read_mostly = HZ; +static int sysctl_stat_interval __read_mostly = HZ; static int vmstat_late_init_done; #ifdef CONFIG_PROC_FS @@ -1937,7 +1940,7 @@ static void refresh_vm_stats(struct work_struct *work) refresh_cpu_vm_stats(true); } -int vmstat_refresh(const struct ctl_table *table, int write, +static int vmstat_refresh(const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) { long val; @@ -2175,6 +2178,38 @@ static int __init vmstat_late_init(void) late_initcall(vmstat_late_init); #endif +#ifdef CONFIG_PROC_FS +static struct ctl_table vmstat_table[] = { +#ifdef CONFIG_SMP + { + .procname = "stat_interval", + .data = &sysctl_stat_interval, + .maxlen = sizeof(sysctl_stat_interval), + .mode = 0644, + .proc_handler = proc_dointvec_jiffies, + }, + { + .procname = "stat_refresh", + .data = NULL, + .maxlen = 0, + .mode = 0600, + .proc_handler = vmstat_refresh, + }, +#endif +#ifdef CONFIG_NUMA + { + .procname = "numa_stat", + .data = &sysctl_vm_numa_stat, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = sysctl_vm_numa_stat_handler, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, +#endif +}; +#endif + struct workqueue_struct *mm_percpu_wq; void __init init_mm_internals(void) @@ -2206,6 +2241,7 @@ void __init init_mm_internals(void) proc_create_seq("pagetypeinfo", 0400, NULL, &pagetypeinfo_op); proc_create_seq("vmstat", 0444, NULL, &vmstat_op); proc_create_seq("zoneinfo", 0444, NULL, &zoneinfo_op); + register_sysctl_init("vm", vmstat_table); #endif }