From patchwork Mon Dec 23 14:15:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixiong Yu X-Patchwork-Id: 13918954 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 00F2DE7718E for ; Mon, 23 Dec 2024 14:19:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 73F096B00AF; Mon, 23 Dec 2024 09:19:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6EC6E6B00B4; Mon, 23 Dec 2024 09:19:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 567136B00B5; Mon, 23 Dec 2024 09:19:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 331AA6B00AF for ; Mon, 23 Dec 2024 09:19:44 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D7995A1806 for ; Mon, 23 Dec 2024 14:19:43 +0000 (UTC) X-FDA: 82926431532.11.6167873 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf18.hostedemail.com (Postfix) with ESMTP id E2C2F1C000C for ; Mon, 23 Dec 2024 14:19:23 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.191 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=1734963556; 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=yb7PpKQishKOOiU1/EvIQre2DIP/pFbbyWjMDUde7j6NbfAQz3jqR2vpDFCEzgBk/iUY63 ROwGSbTljNd28envmM1npsE/rWoSKojpuyyLp7VWzsEHHjCcG2GpdJc3063dcJDFMv5Ktd XMmDr6gXwREqME2wJNRtCkG9npb1KOU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734963556; a=rsa-sha256; cv=none; b=VIt3M9XYxtpGPJsjgreOIjM8/X89EwC5uwHYa8e1Hy8I/cST6M+QbKzCM78Rqgbhjf0v49 MJSeVhQD0Kx+eEihtQtSScxQT5WsD5JbQSon1yRrbQ4qYkYEZH1H3Cnw+gN3tvk/dDbLHX OJ5+7Hmdg7y17oojRax0JKuji+ismFQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4YH0T43gyMz1kwqV; Mon, 23 Dec 2024 22:16:56 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id 883851402E2; Mon, 23 Dec 2024 22:19:37 +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:19:34 +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:20 +0800 Message-ID: <20241223141550.638616-2-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: rspam02 X-Rspamd-Queue-Id: E2C2F1C000C X-Stat-Signature: petm33m5z7hy13jnqpsmo4mpoji51b8e X-Rspam-User: X-HE-Tag: 1734963563-802916 X-HE-Meta: U2FsdGVkX1/w94xMhDGHgcovfxJzPaC3uEI3gn8wJUedpA7PE7CTRnl5CVXzgzFsp/YKWXOkovDTRYdOIcskzigav74cMl1evU0JTuc15v2qtBmK+1kgTdXAHIZmIbXu5SEHtssJMJ+GRO/FzfT1K0Voh3shHwOl8mXf374Llbnzk0c54zmq3g3G8VrQlSPvVmQm49sA1wc9E87qCJx4L6d3dskMlX1s6ic5Qv6ys0abelfCHlcpDjdQxfCWrkevb7qosPTWElfE6qLThS98QbZrs8sSaemvoxRnh7XiL/phffNN1dlvXG/uXqUXIHOAAyW/+c4Gg2zx+Bu0gzY4jPNTFCoykCawyc+2knetAaLvxHGkujgxWflbvTMmUSI498yjinusSGN6A3zydInt42tK7ULKKI0+Ozn8t7KieSeeJVFGwTEyQNiwX4dNt0c7ZaMRm0m9OM/7/ExZBpzIkc+Q4skJinExCFXYG3ZUh6Og1CnKiYUoHFBurUM7oHgRSzloIcvzDhJo7ktX9mY/TEwvL8X1MvQRSc2mQK1p8LPAktLg1rgRA5jcTULNCC/DwKIyWTq4FF/SPh7hoT1PboHH8ctrKYf3eL22jii+j/cBmemGZ/InZAwF68NPl4+XUvGy+AkvvYsDaRmAN7YwT4GkECCyETA0h8HuwgmS/9OD6yuJopq4SwZD2jTqd80XHl8t7+1mtsnrYKgzKIfCli2WpVChmAlhcrAWubTPX/hXZDjxW0kAYhTcskp0YTZZqDSga0d+BLSRl+hMVb5sCXdEAQ0sRnTNslWo+syvuznQabZNhqYHtmSgwPqZ9+MpfGXoxLA4tDGAfvCulcJod/xaEbXA+9C2c9nE8kamPF6zKhEpznYgbcfumyGLVz+YpXSze0OOflaemSIzhMec2OnqywqZLQ89EWhC6quxkhrcgWAnNfYIYAmaAk9f8QrHRQzElt+C6tb1E/UhfpQ HZ7AHkAm oHrMvAxmSmph6QYbiHWABU0GPSwn3UipBR+ARh90eWwhALPckx7wb1L8Of/WmXA+cp09qZMlVPxScIxpKgnq4gFB7aHrHJFAMgjgeWz1LjIxTZBL38XvKoCbaS7/oZ+A+m5A97pgzIhpILkUkX/TA6qIVewaRhOZcOvJg7MGg98zLp9A= 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 }