From patchwork Mon Dec 23 14:15:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixiong Yu X-Patchwork-Id: 13918969 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 0D8A3E7718B for ; Mon, 23 Dec 2024 14:20:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8ECCE6B00D3; Mon, 23 Dec 2024 09:20:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D98B6B00D4; Mon, 23 Dec 2024 09:20:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 62CF86B00D5; Mon, 23 Dec 2024 09:20:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 39E396B00D3 for ; Mon, 23 Dec 2024 09:20:35 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EB91E1C6A5B for ; Mon, 23 Dec 2024 14:20:34 +0000 (UTC) X-FDA: 82926433212.30.5D8F485 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf27.hostedemail.com (Postfix) with ESMTP id E252740009 for ; Mon, 23 Dec 2024 14:19:50 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734963607; 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=kkeawcA2Ivr3oQxrii7ZBXnTeXsAU4dzmySeTIgTS7E=; b=A1YkACgBKWodtUZBm+ccRehOKpg3SZKup6Os9oxtHBKppW3cZOv5MxqAhGPy+pI4/W9lz3 c+K1g0F8ibFkxtT97JcwfqkUWEEJ791pJw1TSX8XQZdcQQshVQFBTgSUI65FG39sEhkdUK Efbj6zI8yq7GDJccSvmFOa+ikVOJZLY= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734963607; a=rsa-sha256; cv=none; b=HzvSfM6O5e1ViZSCZ7Sp3ukvUl+x36tFVpCd8b1se8CzAPkVHBTztt6PSHya57FkCFjoXd 7nDbyFLMhNSbRjLtQL34lbl1jMPhnRr1q0ASC1827g9gqBUvFtAhCcwF3ldq/SiwvBQq3L UK9Bry9GDNj1a5ZffiQqCnFxdzkQLi4= Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4YH0YX6zCtz20mgG; Mon, 23 Dec 2024 22:20:48 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id 76EBC1402E0; Mon, 23 Dec 2024 22:20:29 +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; Mon, 23 Dec 2024 22:20:25 +0800 From: Kaixiong Yu To: , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 -next 01/15] mm: vmstat: move sysctls to mm/vmstat.c Date: Mon, 23 Dec 2024 22:15:36 +0800 Message-ID: <20241223141550.638616-18-yukaixiong@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241223141550.638616-1-yukaixiong@huawei.com> References: <20241223141550.638616-1-yukaixiong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemh100016.china.huawei.com (7.202.181.102) X-Rspamd-Server: rspam05 X-Stat-Signature: petm33m5z7hy13jnqpsmo4mpoji51b8e X-Rspamd-Queue-Id: E252740009 X-Rspam-User: X-HE-Tag: 1734963590-664208 X-HE-Meta: U2FsdGVkX1+us1co6GeehRPMRWuSbQJYB6NdQ7bnvsB4m8SUndqKDbrqc3GBFDDB4B9p3XiKnReO2fUoyVfulyimPYaQ3XH4y5urOizrINvSzxLjb2xVwS3rzt5u6MBDvzOFJzE6ZZm4PHH+BIMf9k8QVa5X2EqiysTVtCWQINZEDEPZf1ygxd5sDI05gC/o0mWXI0Vsc2+qyAwJv6rwwoD8rv/wyzwwJUAFqzEEN1YTDz9hySmHkVV8GyvnZwUdaGGWWuAm/lVElWV2uQpie/vJmljoI1WAavrQG/Fx4Ajrx3FjiVYu0YQWBHgnd2LzymHHZ57tYcgMnwEN2p4P8WZCDV8Geq5JMpcBvKCKR0d+e3oCw15cSYV9Xi6vD9neZn+aPLrB2pE5NuKSlRaT5DJMjJhKbybaMb+LvMnOkej/sxDB3RvaDEDapmKMqfRX8kaoA0eiEvqJMOS+H5MVmMbaglMI5nY/YfnzrvXwxwOCU/X1mXgLK0nBbqreOdmafX2NAWB0QjL9Ox9nNFF7p1s4d4MTln4ctPrdekEmTKmuhX8FVl7bIX8GwjrKahB7FaU7gy4cb21XmpthLmxOMehnpg6VJi05rgGJBkNPgIzzCPnr0uh+NntYpM67goD1SufvlZzMLMlYLUeoGuZpb904gJvcWJbdsYHydV/z9rtqDqOPSnVoTKfhnbSNFTgGruA4mGxFMtyfNtyi1iqDOTggCwt3WuWilX7I+oP6qKP7RU8KZnMMvHY+H6WWQbcHXMMjIjI3ho7P+V8ZoPVlAZPB2E51X4Gzt4JEYV2UT9rG9UFSrDJAJfn6SqJgXe0R8U7hpB65YzaV4TTcjmfQ8I6TIFXFjSLqMYOSBqtzDuqm7YzjeriSxTqDmaqXGYYMkyz2UZ9e4YfX1dItpVbifyzov960RY90Qm4SNEurXLxXu9ey0Kj6kc5ex6/V4zcYBsEIf6YelxFKCOsjGHK MnMmJVM/ XwjZhb7MZdZemYsxa1YsUuWfMfR2kIC4GoLrtnJq6QCLaEZLmjQLSBYH6wfPdGFEXhpkHXXpf8RPnuJpaR2xkMay0j3IIalLlNJ+NSJMPtia/70X4wR89jVnt7q+x9V1EkFwC1CV/66B4ZOf6rS5fjkG8PFfJSE5p24WsCduZN0UFQ8M= 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 --- v4: - const qualify struct ctl_table vmstat_table 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 9f3a04345b86..4751e3ecc467 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 7ae7a4136855..f1ab251fc2d0 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include @@ -2071,17 +2070,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, @@ -2147,22 +2135,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 4d016314a56c..cb4dcd4c6715 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}}; @@ -1938,7 +1941,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 @@ -1947,7 +1950,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; @@ -2185,6 +2188,38 @@ static int __init vmstat_late_init(void) late_initcall(vmstat_late_init); #endif +#ifdef CONFIG_PROC_FS +static const 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) @@ -2216,6 +2251,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 }