From mboxrd@z Thu Jan 1 00:00:00 1970 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 2A082C6FD20 for ; Wed, 22 Mar 2023 02:46:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E52C6B007B; Tue, 21 Mar 2023 22:46:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 795C4900003; Tue, 21 Mar 2023 22:46:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65D46900002; Tue, 21 Mar 2023 22:46:45 -0400 (EDT) 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 52D126B007B for ; Tue, 21 Mar 2023 22:46:45 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 12971120190 for ; Wed, 22 Mar 2023 02:46:45 +0000 (UTC) X-FDA: 80594996370.30.6030D9C Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by imf14.hostedemail.com (Postfix) with ESMTP id 7E813100008 for ; Wed, 22 Mar 2023 02:46:40 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf14.hostedemail.com: domain of ye.xingchen@zte.com.cn designates 183.62.165.209 as permitted sender) smtp.mailfrom=ye.xingchen@zte.com.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679453201; 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:in-reply-to: references; bh=h4eXdseVQHCueVIdTvWcCo22wjdPkl5aqM1WdfQA7c0=; b=3m/1FoJd/azTy3tO8/xMObZ6jFrwM8/GXXzLQYm2fU2P5mJUS33yNDcGsDfunWRyTl6DRx +5ORvuvo8jF4q9msE3U/jAVNUzOSOgXGeKaGtqnsiwrYzFCkC1010hZbPSzMaZaK49Dis/ bAZ+f0ppe1hoGAvAtHYxL40PBgEYg+0= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf14.hostedemail.com: domain of ye.xingchen@zte.com.cn designates 183.62.165.209 as permitted sender) smtp.mailfrom=ye.xingchen@zte.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679453201; a=rsa-sha256; cv=none; b=IcNdRdjcgI9Cdc3PeM8uSruKm2gnW1IESM7kCS5HFDjvQAUb99xAsm3p7h+BlC+tWUiGF3 RwPkaem0Goeb5K3HoNbgnAHTB3LMCkMBVGNBotTuD0hEgDpaszr4/sja68mdIcHB+OU96N VDyKnchqud0nm1GwGWgweUVZDJlffmg= Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4PhCXq6f09z501RZ; Wed, 22 Mar 2023 10:46:35 +0800 (CST) Received: from xaxapp01.zte.com.cn ([10.88.99.176]) by mse-fl2.zte.com.cn with SMTP id 32M2kRx0071270; Wed, 22 Mar 2023 10:46:27 +0800 (+08) (envelope-from ye.xingchen@zte.com.cn) Received: from mapi (xaxapp02[null]) by mapi (Zmail) with MAPI id mid31; Wed, 22 Mar 2023 10:46:28 +0800 (CST) Date: Wed, 22 Mar 2023 10:46:28 +0800 (CST) X-Zmail-TransId: 2afa641a6c04ffffffff993-4d9af X-Mailer: Zmail v1.0 Message-ID: <202303221046286197958@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , Subject: =?UTF-8?B?W1BBVENIIFY1IDEvMl0gbW06IGNvbXBhY3Rpb246IG1vdmUgY29tcGFjdGlvbiBzeXNjdGwgdG8gaXRzIG93biBmaWxl?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl2.zte.com.cn 32M2kRx0071270 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 641A6C0B.002/4PhCXq6f09z501RZ X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7E813100008 X-Stat-Signature: 86fe8j79rfw38pk3sco3ax1fdmb9ugcr X-HE-Tag: 1679453200-38045 X-HE-Meta: U2FsdGVkX1+OTXn7Ms6jcXH/JT0ZthenQMKttCgVNWO8vXM+cZq/LQjL10Yn1hLde0MXhFNVy09AN7eVmOSHSiIdoSEPz3T95D/GxqcKTxpisUjNCwIGrAC4NMzg/64kLL09W4pRIc+lWjsdgB9HfR98H9NLRMUL6DkuJCj/l+RdyIchsVfteOvjfg5Qc9DF/zhdO2La5Vfgw/uKIajzDt3FdEMce2qd2SlyLxxoAyBjIV3dPbMVCBGEiSoN0epJlseYSA9AvWQHJbYwsJ/MhKXtI/wxBQs0y9czJ9WUYCg39NCMpQO9K7lV6DLH7ObhatiDFYUzYQLCi94yiHk9guAX65ZPA/Wl1650tP7LJDRUKmDJv4RRcEki3YG3LFU+dlYTy1ynZj2TaznKywQDxCilTE/yyOXY9BG7vQ8jdpzZRwyludBrytupM7j5CBIpHHNCqxKaF+OVca281PMP7A600cPTY3gQynW/dh/uhx1JOAVYXRxs0J/urH+t4lDrOlalpORUCrao97AKqLUCV+G8GBKW3p4aMY04CDs/hKkft0GAt4eQR8PpYmkyvQFRAitvfgO5JjWKjv8+TUgX24WSN1jnRzqMnmCp3YmKvG2DR91ByrA7IItk8ZOyoGJF0W62LsfRPPV2qx2mDL38MdrZ0YakdnxHarv9Zd4nXCfhgOugAo1nATM/HmlyGo3KqnSoDSI34qHfrc+pMajQRl16GXB2889wxvFtkDzYYENbs8qZQIw1sun4WWrt8I1khipkjJe/zOAIZRiWUdugMPJYqmuGTxMJPE3M3I17UvVS/sdLQodRicT9EKsdGApvGCDuTIzrC9NAaCSDsqp10pEpNkbxelV8268S2ApzFw8FXS6SjPTCNmfuu5f+9GjF08FbeYN3bcSsBKpxlRSR06HxjBzxKk7GZY5xZeuLXOloedT/8YpsKcC3+rkb4/B+nbmaQ3WEcSO4ZOwnpxX MqcH+PNl /a+kYTZ75tyybpu8z3x4zxOhi0IGhcHqlp3eaDIOlEImSYYmqM0PvW3iuxqBAlB6HkjREEf9oigkaZCXRn4G4Sa2zrk1KuBemlysUICIYA/qDn7ipJcfNO1WCo6ZfFMCi6cFN5tl3BkoBS3yrFnzxr+wWleBTilOPVkIF6zir1qGC724BkXbHTe7qyKoTCRabKQqFDYNuWmSIA1WKROK73gIGwY/tT4VYtM1jxB/D+y8kIGO7FDZfzemBZRnMZuqUcBa1yIorPIet1hwVSMsj5u3AUi96Svu9ir+BrojjRTCvLuA= 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: From: Minghao Chi This moves all compaction sysctls to its own file. Link: https://lore.kernel.org/lkml/9952bbf8-cf59-7bea-ce50-0200d4f4165e@suse.cz/ Signed-off-by: Minghao Chi Signed-off-by: Ye Xingchen --- include/linux/compaction.h | 7 ---- kernel/sysctl.c | 59 ----------------------------- mm/compaction.c | 77 ++++++++++++++++++++++++++++++++++---- 3 files changed, 69 insertions(+), 74 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index 52a9ff65faee..a6e512cfb670 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -81,13 +81,6 @@ static inline unsigned long compact_gap(unsigned int order) } #ifdef CONFIG_COMPACTION -extern unsigned int sysctl_compaction_proactiveness; -extern int sysctl_compaction_handler(struct ctl_table *table, int write, - void *buffer, size_t *length, loff_t *ppos); -extern int compaction_proactiveness_sysctl_handler(struct ctl_table *table, - int write, void *buffer, size_t *length, loff_t *ppos); -extern int sysctl_extfrag_threshold; -extern int sysctl_compact_unevictable_allowed; extern unsigned int extfrag_for_order(struct zone *zone, unsigned int order); extern int fragmentation_index(struct zone *zone, unsigned int order); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ce0297acf97c..e23061f33237 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -746,27 +745,6 @@ int proc_dointvec(struct ctl_table *table, int write, void *buffer, return do_proc_dointvec(table, write, buffer, lenp, ppos, NULL, NULL); } -#ifdef CONFIG_COMPACTION -static int proc_dointvec_minmax_warn_RT_change(struct ctl_table *table, - int write, void *buffer, size_t *lenp, loff_t *ppos) -{ - int ret, old; - - if (!IS_ENABLED(CONFIG_PREEMPT_RT) || !write) - return proc_dointvec_minmax(table, write, buffer, lenp, ppos); - - old = *(int *)table->data; - ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); - if (ret) - return ret; - if (old != *(int *)table->data) - pr_warn_once("sysctl attribute %s changed by %s[%d]\n", - table->procname, current->comm, - task_pid_nr(current)); - return ret; -} -#endif - /** * proc_douintvec - read a vector of unsigned integers * @table: the sysctl table @@ -2157,43 +2135,6 @@ static struct ctl_table vm_table[] = { .extra1 = SYSCTL_ONE, .extra2 = SYSCTL_FOUR, }, -#ifdef CONFIG_COMPACTION - { - .procname = "compact_memory", - .data = NULL, - .maxlen = sizeof(int), - .mode = 0200, - .proc_handler = sysctl_compaction_handler, - }, - { - .procname = "compaction_proactiveness", - .data = &sysctl_compaction_proactiveness, - .maxlen = sizeof(sysctl_compaction_proactiveness), - .mode = 0644, - .proc_handler = compaction_proactiveness_sysctl_handler, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE_HUNDRED, - }, - { - .procname = "extfrag_threshold", - .data = &sysctl_extfrag_threshold, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE_THOUSAND, - }, - { - .procname = "compact_unevictable_allowed", - .data = &sysctl_compact_unevictable_allowed, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax_warn_RT_change, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, - -#endif /* CONFIG_COMPACTION */ { .procname = "min_free_kbytes", .data = &min_free_kbytes, diff --git a/mm/compaction.c b/mm/compaction.c index e689d66cedf4..ad5838c7fce7 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1728,7 +1728,9 @@ typedef enum { * Allow userspace to control policy on scanning the unevictable LRU for * compactable pages. */ -int sysctl_compact_unevictable_allowed __read_mostly = CONFIG_COMPACT_UNEVICTABLE_DEFAULT; +static int sysctl_compact_unevictable_allowed __read_mostly = CONFIG_COMPACT_UNEVICTABLE_DEFAULT; +unsigned int sysctl_compaction_proactiveness; +static int sysctl_extfrag_threshold = 500; static inline void update_fast_start_pfn(struct compact_control *cc, unsigned long pfn) @@ -2052,7 +2054,7 @@ static unsigned int fragmentation_score_node(pg_data_t *pgdat) return score; } - +unsigned int sysctl_compaction_proactiveness; static unsigned int fragmentation_score_wmark(pg_data_t *pgdat, bool low) { unsigned int wmark_low; @@ -2228,7 +2230,7 @@ static enum compact_result __compaction_suitable(struct zone *zone, int order, return COMPACT_CONTINUE; } - +static int sysctl_extfrag_threshold; /* * compaction_suitable: Is this suitable to run compaction on this zone now? * Returns @@ -2584,8 +2586,6 @@ static enum compact_result compact_zone_order(struct zone *zone, int order, return ret; } -int sysctl_extfrag_threshold = 500; - /** * try_to_compact_pages - Direct compact to satisfy a high-order allocation * @gfp_mask: The GFP mask of the current allocation @@ -2748,8 +2748,7 @@ static void compact_nodes(void) * background. It takes values in the range [0, 100]. */ unsigned int __read_mostly sysctl_compaction_proactiveness = 20; - -int compaction_proactiveness_sysctl_handler(struct ctl_table *table, int write, +static int compaction_proactiveness_sysctl_handler(struct ctl_table *table, int write, void *buffer, size_t *length, loff_t *ppos) { int rc, nid; @@ -2779,7 +2778,7 @@ int compaction_proactiveness_sysctl_handler(struct ctl_table *table, int write, * This is the entry point for compacting all nodes via * /proc/sys/vm/compact_memory */ -int sysctl_compaction_handler(struct ctl_table *table, int write, +static int sysctl_compaction_handler(struct ctl_table *table, int write, void *buffer, size_t *length, loff_t *ppos) { if (write) @@ -3075,6 +3074,65 @@ static int kcompactd_cpu_online(unsigned int cpu) return 0; } +static int proc_dointvec_minmax_warn_RT_change(struct ctl_table *table, + int write, void *buffer, size_t *lenp, loff_t *ppos) +{ + int ret, old; + + if (!IS_ENABLED(CONFIG_PREEMPT_RT) || !write) + return proc_dointvec_minmax(table, write, buffer, lenp, ppos); + + old = *(int *)table->data; + ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); + if (ret) + return ret; + if (old != *(int *)table->data) + pr_warn_once("sysctl attribute %s changed by %s[%d]\n", + table->procname, current->comm, + task_pid_nr(current)); + return ret; +} + +#ifdef CONFIG_SYSCTL +static struct ctl_table vm_compaction[] = { + { + .procname = "compact_memory", + .data = NULL, + .maxlen = sizeof(int), + .mode = 0200, + .proc_handler = sysctl_compaction_handler, + }, + { + .procname = "compaction_proactiveness", + .data = &sysctl_compaction_proactiveness, + .maxlen = sizeof(sysctl_compaction_proactiveness), + .mode = 0644, + .proc_handler = compaction_proactiveness_sysctl_handler, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE_HUNDRED, + }, + { + .procname = "extfrag_threshold", + .data = &sysctl_extfrag_threshold, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE_THOUSAND, + }, + { + .procname = "compact_unevictable_allowed", + .data = &sysctl_compact_unevictable_allowed, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec_minmax_warn_RT_change, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, + { } +}; +#endif + static int __init kcompactd_init(void) { int nid; @@ -3090,6 +3148,9 @@ static int __init kcompactd_init(void) for_each_node_state(nid, N_MEMORY) kcompactd_run(nid); +#ifdef CONFIG_SYSCTL + register_sysctl_init("vm", vm_compaction); +#endif return 0; } subsys_initcall(kcompactd_init) -- 2.25.1