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 55134C64EC4 for ; Thu, 9 Mar 2023 03:44:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CBAF36B0075; Wed, 8 Mar 2023 22:44:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C6B36280001; Wed, 8 Mar 2023 22:44:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B59E16B007B; Wed, 8 Mar 2023 22:44:56 -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 9EDED6B0075 for ; Wed, 8 Mar 2023 22:44:56 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 56F0F1C673D for ; Thu, 9 Mar 2023 03:44:56 +0000 (UTC) X-FDA: 80547968592.30.0190333 Received: from mxct.zte.com.cn (mxct.zte.com.cn [183.62.165.209]) by imf29.hostedemail.com (Postfix) with ESMTP id 072F612000D for ; Thu, 9 Mar 2023 03:44:53 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf29.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=1678333494; 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=LsosM7DqC8On6ayaVxRflCT30U5w0EZQn6pWA98oOJ4=; b=Q1PAoXil4HD/FDsdJDJAQ73lMesFKNWIh9ixMxR7kZ7tc2cHJsQmgDkgmtcip3Bg0YwQw0 YYy3Vaa+JmddRXkFUf2Rq+nMqWSLb/gB0EyWpT05g9YJ0KjqKCFb5Do+eAtbUIxeR2U1Ht 4OHB7C936h0BWJAyvgbfqWl9Ba9zz/Q= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=zte.com.cn; spf=pass (imf29.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=1678333494; a=rsa-sha256; cv=none; b=b94QXtMuEbI/7R1Drghr4UROPv7XKG9/Y1sHQF21CGcXq6DUIFzVEaPHgPeEe3McAX8tAO qsjusTEeVSVZ5mQi7Z8LApLqAiza8mrE6cP5sUotECX3VXHFpZfKbGPRSgET9yFoG4zVUB mizXX2Q55INcqYFWvUIKaPmUsibm06s= 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 4PXFS23Pzlz501SW; Thu, 9 Mar 2023 11:44:50 +0800 (CST) Received: from xaxapp03.zte.com.cn ([10.88.97.17]) by mse-fl2.zte.com.cn with SMTP id 3293il2t098221; Thu, 9 Mar 2023 11:44:47 +0800 (+08) (envelope-from ye.xingchen@zte.com.cn) Received: from mapi (xaxapp02[null]) by mapi (Zmail) with MAPI id mid31; Thu, 9 Mar 2023 11:44:48 +0800 (CST) Date: Thu, 9 Mar 2023 11:44:48 +0800 (CST) X-Zmail-TransId: 2afa64095630232b9d7c X-Mailer: Zmail v1.0 Message-ID: <202303091144483856804@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , Subject: =?UTF-8?B?W1BBVENIIFYzIDEvMl0gbW06IGNvbXBhY3Rpb246IG1vdmUgY29tcGFjdF9tZW1vcnkgc3lzY3RsIHRvIGl0cyBvd24gZmlsZQ==?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl2.zte.com.cn 3293il2t098221 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 64095632.000/4PXFS23Pzlz501SW X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 072F612000D X-Rspam-User: X-Stat-Signature: uswdbn1j79ekagkwgynctycqtz5hxsdt X-HE-Tag: 1678333493-204832 X-HE-Meta: U2FsdGVkX19dSkKmNyZB4QMrJxJbpPJXjX00uJUGvaBD+Eu35nl87JkL3dXv8Cf8zDiOD3OYsaDPvhp8sa/B0K/+0HXdop3y3AgARjPuZhie1HTcIiUjZr7Mv2StUWhkhGp25skF75EJ+RkLhPO4QYbcBcw2BdD6jpNVIYBcOKitZp4HJ9o8HVRkcGPxSB2QKW176r6Vk8RJ8GkvUt1ykpOLfAIvfGRG5bGN5KEMyqcIfn+i5LAESeby5D7wdKb2DqF9szwibPH4eBZ6v7hnB+1YjkJPopXNGK2CXGDknTNqh8Nw3cW7OJj+I4ZpbERy/H439pRFAtd/EvPtldYquBZaWowiePUws/mBRvscpebqXxxD3LmJsXy/Es9oofcSa/rxT6fHuLifKMhtTgbumKSmhVn1JulhmfRNF49gqUy1WhdRIuRc2e7r42VtZXoagDo5DZCeGwtSe/T9iP93DPhXeD7zha2xe8ofFYAdnKWxmGlXCeB46KdomkJMXhFt+Y9ZSDw7rD4pksqTgReey35RAI66+P124CivKUwVk0+Kzv5iJmJLG9wqrZWD1pZ921nxgEeQKq9AN1qapJ2L3w6pBiRIqX1GybskP6iPkv8T16bqbw7Yl4uDNV5ApgHfimWtECHd7+z3ipOMvNXYEdCD/W7EAs6gDhAe4NTlyBdUOMY1zrbowJyk9aMgEqnhsWzdzPIgGOWOhKq/2zFzfBCTzB44WQljkj9wj2SjgU9yxPrxC63uOmhPYr9ysEnPijyiWMB3oZr997Lb6fcBBvvjiE49VmN5WeH1AM6vDhQSumjeiGXgOi4PHuXJyH/0mfDhJyqS4PXWY9FGfj7WwXcHAH9VukdOttLvbcqpQgD/VNhiKqf04ICvg/oyFbG517wgqYNlOkhFEch89/UH/PYpO7NNVjR0oXcVZihlPJ4ImjdAcSXDy4d5wmsgIKfUxUsCQyNkewfNQlkflKa 6J+SSXFV IVzP5F0ePX8vWO12oUTj/22arS+02kwLyxWMUFaq/3CtQuJTuX7OnTe4BwdZLms3Hqrhg26FVOUm6VgmlRhNEjRstSt+Rp3sBIUtHf/91ipW6mEzR3Q2L4rNncO4Jy2ewaSMjfXakfW0iUA63GLU45/XtueIZLGR4BOoPaO5ELt3Rrwj7lbq9jH8qiru1t3ph14+dHY+l67ApmQq5bHi8+MxtWEj+EbNki+12h59SWWHtUH2/JHFvGE1rGQckoze9cQNwTtk7avE7ztX3/knVQhXc6zELbu71/hO7KR4lU2l7DXl5bTo41IrKx6u4eMVFLN+PsSqSXw6c9pMfUHE38PWZzx7YWBGf8ehbLh/c8k4YBYuXyWKdy8b5WIG5pmZ5cFXz69b5z92N0hcQrUunBTaxEQ== 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 The compact_memory is part of compaction, move it to its own file. Link: https://lore.kernel.org/all/ZAJwoXJCzfk1WIBx@bombadil.infradead.org/ Signed-off-by: Minghao Chi Signed-off-by: Ye Xingchen --- kernel/sysctl.c | 7 ------- mm/compaction.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c14552a662ae..f574f9985df4 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2190,13 +2190,6 @@ static struct ctl_table vm_table[] = { .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, diff --git a/mm/compaction.c b/mm/compaction.c index 5a9501e0ae01..acbda28c11f4 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2763,6 +2763,18 @@ int compaction_proactiveness_sysctl_handler(struct ctl_table *table, int write, return 0; } +#ifdef CONFIG_SYSCTL +static struct ctl_table vm_compact_memory[] = { + { + .procname = "compact_memory", + .data = NULL, + .maxlen = sizeof(int), + .mode = 0200, + .proc_handler = sysctl_compaction_handler, + }, + { } +}; +#endif /* * This is the entry point for compacting all nodes via * /proc/sys/vm/compact_memory @@ -3078,6 +3090,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_compact_memory); +#endif return 0; } subsys_initcall(kcompactd_init) -- 2.25.1