From patchwork Sat Jan 11 07:07:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixiong Yu X-Patchwork-Id: 13935832 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 BB612E7719C for ; Sat, 11 Jan 2025 07:12:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 37B026B0093; Sat, 11 Jan 2025 02:12:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 32E0D6B0095; Sat, 11 Jan 2025 02:12:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 158476B0096; Sat, 11 Jan 2025 02:12:28 -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 E9B8A6B0093 for ; Sat, 11 Jan 2025 02:12:27 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 92664810BB for ; Sat, 11 Jan 2025 07:12:27 +0000 (UTC) X-FDA: 82994302734.18.3CB3016 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf13.hostedemail.com (Postfix) with ESMTP id 269AB20009 for ; Sat, 11 Jan 2025 07:12:24 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf13.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.188 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=1736579545; 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=x0TY9YfZ+veyMYHsOyDoPIZkXGrJB3aadow7NE5NC7Q=; b=RoptC0DmX8JXWHCY4lOM9UgZlXHBotTM1TRdExd6elBvIdFPZL6D6xXzbaJ2FO0SK43KtR tb1S/iNmghFW8DYcCrbDq1rX+7zunHst2kZurw4mMr7X48U4YMEMd+6hSaPhtP9zbB9Tkj lFzEOStC9L0EK1WRPjd7o8u9Cn9SXVQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736579545; a=rsa-sha256; cv=none; b=ZwB2Z8zTfNZfGg1kbv3CKbc81cQUZ5CrcZUvEd0+gLRc2L+Pb2QEDWE9mC7DcZGc4uPsgL SiTeZ7XMyiptDaBQ12hU1XTP0rN5BUa3Rhxg+/gwHX6Aa1Tg/n1i1LdkoxdkUMaEnC25AX HtotGlt05u0a2bkDgn1uQF94ehNkeeI= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf13.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4YVV6R4bKjzrS4r; Sat, 11 Jan 2025 15:10:39 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id 9D196180064; Sat, 11 Jan 2025 15:12:20 +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; Sat, 11 Jan 2025 15:12:17 +0800 From: Kaixiong Yu To: , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 -next 01/16] mm: vmstat: move sysctls to mm/vmstat.c Date: Sat, 11 Jan 2025 15:07:36 +0800 Message-ID: <20250111070751.2588654-2-yukaixiong@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250111070751.2588654-1-yukaixiong@huawei.com> References: <20250111070751.2588654-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: 269AB20009 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: k1ar383hxufo7pw7xs1gex5qjo8tnn3r X-HE-Tag: 1736579544-66132 X-HE-Meta: U2FsdGVkX18POWLP8WOowxe+ICdKuv9v4vWEYu7CkdP0CA8X1NSErttF+HnXKHCZoSVeWp7f4dMT4BDGlT9hrSUehdBh31LQxoNrXj3t2LObgH5ZqsKk2QSBQ1i5wuD+rvXTEHNuQvZAuf3JPjyNh4VpySMa0jiLNVJTUzqk8R8mZtjDS0+CIc3EzHwRodXAgu7DB1pnw06Imsxp7wYwBN3LHwfKyeCURWVPFX4/bX2eGHwvcgv60Niig2t9E3g7PM4QxABHaEusXSjJoakkh3ldQRLoE81L7D5xYnxVfYzSui2G6ruWNXBmp8zGeOZVKn9DhETnRlVovmRL8FYVwuLi8xQ5aJhn4uFXAka00OVr4qTzdPenL6CXRbL7DvGhqvXVhfozJ6m4y/4VqMRvGPe1EGqq2Hxk8Bn/oRnyexPZjjKZRrdKipnpbHiUOuKIbfXd0rVBj4xAlTKvF636Dlv7FauJowhdwWW4svy7410gTjFJuTy+tXeyh+s1RZE3FVrJpWPLrZSSVkL3/AF8KPa7bzVAH2s4M0ERbz9u/Kv+m4qDQe8UIytKF2AgbtKP/iyXqqyM1cwCdWCUnE1nMTTg6aVg/xyVWzibUuV+UA5Eky+mvfDTIFxxK8yY8PYuN/PG+IYyTQH5qlhOTQDJpoFyqDdoSYn3gUt6bPcaqoi3PpfSMg0v3znZF/wIrmzgJZxadMNqfHJNPy3Uzjm9eGCM09xsBGHOs3+lM3wiCAe2kY5NaExCP+aufCf5zZyxOPEWLQXwCtOR0rjaPV9rRlPCwPsfyhqZnFfET87vo2U0S89vrwBlwq/Ca/bLSu2g8luA2Vg9IwQNoXoM8lMR017bPhw/I7Sy091Cz/2m8NM8dAeYd5J3chqm4GjdIrTLpUih0EHIyhCssC30W2FvK4M1AqNQt4jaKqws4oWZ9NqMbqD7r5zqY++tt4Y6bXeYN7Bgpb0K9exH8cvD8y1 HPkgPeU1 nwWXyt9+XmRa5unTQRQpRS5+Ivk/tCpd/6CykCl1M3xJ4VrtQe9AhJwFb/ilfJGMgFG64yTTxFHx+yKCuXreQSfPAPF6p9yf28S9EingTtMHIR+PEWdTc9DMGUTGq3IkuG1+/YDr8Dqhl3FkEIzDEZd5MwnpONmLlsFoW5NKCNVwTUp2/24uOHtNdQkhs3HIX8J/B14djLNzKTI/EyXyAnRuyNLVxN/ZUcG1R7gnLHSIinY2SJaUwsiRKe9p877ozdEAEkuUA8OeKnXWyeGDLOgWlJAPE5XedDSqqVrPHuqghKt1yGiQ7NXXvSKt36fE19chmk1nj+mz5Y4w= 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 16bfe1c694dd..39704b5b17e0 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; @@ -2196,6 +2199,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) @@ -2227,6 +2262,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 }