From patchwork Sat Mar 11 07:47:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13170650 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 9158DC61DA4 for ; Sat, 11 Mar 2023 07:27:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8AD416B0071; Sat, 11 Mar 2023 02:27:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8401E8E0002; Sat, 11 Mar 2023 02:27:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6FE388E0001; Sat, 11 Mar 2023 02:27:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5E0EB6B0071 for ; Sat, 11 Mar 2023 02:27:28 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2FBB01C6113 for ; Sat, 11 Mar 2023 07:27:28 +0000 (UTC) X-FDA: 80555786976.03.5C8F582 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf29.hostedemail.com (Postfix) with ESMTP id 64208120008 for ; Sat, 11 Mar 2023 07:27:24 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf29.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678519646; 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: references; bh=mm9DnT0Pe2Co7sOwwNy+5VuoVVYoE1K6mbEeGc9aC+A=; b=1J5jRY04J1VJrNvxPJOY0tge/4ojJQQOGVEKszZKdJ63EibTZV3OBJ2KbR4fl3npbhuklB hFDZuBc+10gV4ME3tr8BGzOIJkdtHgi8cBfSgTuggZJ6bRQfgDCpHfxY9CuLOfT1z+D2eM 9eBpbh+4pNn6DXwxnnc++/9VgKXQJwU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf29.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678519646; a=rsa-sha256; cv=none; b=F1zAOIzoIRpf2FPCEHZgujEomd0Hv/xcUiTPQOEy/JsZ+Wb9TOiSSWl8Ws/jM66JmdDQiS 9oTg3TSfy5Hc+EPXx6fbgaU50AWvxmA5XYQRmWt4yh2IwrZFQcfWip5m87FKhmPi5XUVpE horMgzNxVnoUuzAPZUebXLg4jD+DL4g= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PYZDP3g9JznWTZ; Sat, 11 Mar 2023 15:24:21 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sat, 11 Mar 2023 15:27:13 +0800 From: Kefeng Wang To: Luis Chamberlain , Mike Kravetz , Muchun Song CC: Andrew Morton , , , , Kees Cook , Iurii Zaikin , Kefeng Wang , Muchun Song Subject: [PATCH v2] mm: hugetlb: move hugeltb sysctls to its own file Date: Sat, 11 Mar 2023 15:47:34 +0800 Message-ID: <20230311074734.123269-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 64208120008 X-Stat-Signature: 3uauruijyeww5djo783dkx6rhu66dmd3 X-HE-Tag: 1678519644-51430 X-HE-Meta: U2FsdGVkX1+CDORwjwjJ7mBlZdmN03KCDTXa7R7AAs6OC/CM8RIpbVFtR8i66sWbfAmqtWktMqCmcqAHZA7E7fPolxUGoLvdjfpDH4z8M9p/VMNSSFlxvXQHNUwBjbxRaPqph8hqoKkuep/G5RqGM9F7loJCvLGnarCxlhHiaozhFdDgVhtlYU6xYPlvUuAI4Jw/jUp6/mzFaEkrhirT9OpbwFc8ez6l8WfAXi1VqVZ6k1YtcH0U4a076H5TJVoPAyGWv+zWZyvssfEs/dUg3coMm4hqeQ2MGxCpSTo6w0G/LdStlHz8k9pEpxhTU1w6xX8OOeLquqSozHFQd7KCz8Ahfyx1FLvzD/MN1LEkjY78qBU6SZDa5O0SGxooG6QlyyQTnCxFg7UoZQtnRdsIbtFw7AZoLCuLwmJySRjD8MfXxDN9nEk3jjBC0Soc/seVFM80DQcb2fafIcdpz5XC32AQI2HL0Xr6byzMQK0iwvHJyM22AkWYf/foyLDpq6bZ7QWN8TneTpRf174TbZqTzaHA3KcK4mB7mphxNbMI7SRF/kpXCECbQ8bbE1g9M0wrIZk28Ruy15lcqB+WtEctvnhsfdmKVZcpO8aQ2Rz+9/svb/3NWiBh9MOvDBU8nUO9OuXncfVKjwru4yK2HEafOkSZeMIEZ3ZNp43dl/9g3ZstOvWJqHcm8XhHwm8ODWaUet0h5yXztm+ugCRqzD6KzpBtjtiMTj1LPvnxnTJdk8lYMQO839B8kKym1Xzhk9hubSWYLAtlsKpQGRvuzm/ytjfrRxqC8496uDuMQrqGDmm9EnUG0cnfQeOKB8lLh2KmoK8R+7XL5Ys1ohSbWefW+2Zk2A8uE1X2HQU2Gl8ffpYA5cywUwKidkIzEOrCBBXt/JmQXYxJlV6/w/LugxrdDEhWVLTw5l99gqVlmL0yxqIIPUoVc7bJXpG0v448C/sfe3MNefLAzutAh/FqslF 6uLLNJ+b F3EeHrT8W+c0U8j+7U9O1AD4YRiseqQYVgTtX/0nWSDyvPv7QVQRwHteChRWdPzrkCMzbUlx9fi5Zwwe2TcGLGKxQ5aWI4uRdCMXuZ6ZplD/aiPGB+iymjpARnkvAZ25gdmBXp4eOQ3AHgOTyCAJyEC0I7WpmI0RHDgv1/M7Bl0HcA663rvrJDUPwEbld2CnbRSji2RiT8xZBWlnPHs3uvF2AAzi3tKTGmSo+8DMwJ/UAZ3b5ylvQRPxZHjb0ZGLx1IrkcXK19rx9JwsYt/jbQ0nuFS18qF43DtrUbkTjE4qcBmavioqidR3JxQ== 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: This moves all hugetlb sysctls to its own file, also kill an useless hugetlb_treat_movable_handler() since commit d6cb41cc44c6 ("mm, hugetlb: remove hugepages_treat_as_movable sysctl"). Signed-off-by: Kefeng Wang Reviewed-by: Luis Chamberlain Reviewed-by: Mike Kravetz Reviewed-by: Muchun Song --- v2: - add __init to hugetlb_sysfs_init - update commit and add RBs include/linux/hugetlb.h | 8 ------- kernel/sysctl.c | 32 -------------------------- mm/hugetlb.c | 51 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 48 insertions(+), 43 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 7c977d234aba..4056b05d81ed 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -124,14 +124,6 @@ void hugepage_put_subpool(struct hugepage_subpool *spool); void hugetlb_dup_vma_private(struct vm_area_struct *vma); void clear_vma_resv_huge_pages(struct vm_area_struct *vma); -int hugetlb_sysctl_handler(struct ctl_table *, int, void *, size_t *, loff_t *); -int hugetlb_overcommit_handler(struct ctl_table *, int, void *, size_t *, - loff_t *); -int hugetlb_treat_movable_handler(struct ctl_table *, int, void *, size_t *, - loff_t *); -int hugetlb_mempolicy_sysctl_handler(struct ctl_table *, int, void *, size_t *, - loff_t *); - int move_hugetlb_page_tables(struct vm_area_struct *vma, struct vm_area_struct *new_vma, unsigned long old_addr, unsigned long new_addr, diff --git a/kernel/sysctl.c b/kernel/sysctl.c index c14552a662ae..ce0297acf97c 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2140,38 +2140,6 @@ static struct ctl_table vm_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, -#endif -#ifdef CONFIG_HUGETLB_PAGE - { - .procname = "nr_hugepages", - .data = NULL, - .maxlen = sizeof(unsigned long), - .mode = 0644, - .proc_handler = hugetlb_sysctl_handler, - }, -#ifdef CONFIG_NUMA - { - .procname = "nr_hugepages_mempolicy", - .data = NULL, - .maxlen = sizeof(unsigned long), - .mode = 0644, - .proc_handler = &hugetlb_mempolicy_sysctl_handler, - }, -#endif - { - .procname = "hugetlb_shm_group", - .data = &sysctl_hugetlb_shm_group, - .maxlen = sizeof(gid_t), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "nr_overcommit_hugepages", - .data = NULL, - .maxlen = sizeof(unsigned long), - .mode = 0644, - .proc_handler = hugetlb_overcommit_handler, - }, #endif { .procname = "lowmem_reserve_ratio", diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 712e32b38295..6f3c5f587c66 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -4202,6 +4202,12 @@ static void __init hugetlb_sysfs_init(void) hugetlb_register_all_nodes(); } +#ifdef CONFIG_SYSCTL +static void __init hugetlb_sysctl_init(void); +#else +static void __init hugetlb_sysctl_init(void) { } +#endif + static int __init hugetlb_init(void) { int i; @@ -4257,6 +4263,7 @@ static int __init hugetlb_init(void) hugetlb_sysfs_init(); hugetlb_cgroup_file_init(); + hugetlb_sysctl_init(); #ifdef CONFIG_SMP num_fault_mutexes = roundup_pow_of_two(8 * num_possible_cpus()); @@ -4588,7 +4595,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy, return ret; } -int hugetlb_sysctl_handler(struct ctl_table *table, int write, +static int hugetlb_sysctl_handler(struct ctl_table *table, int write, void *buffer, size_t *length, loff_t *ppos) { @@ -4597,7 +4604,7 @@ int hugetlb_sysctl_handler(struct ctl_table *table, int write, } #ifdef CONFIG_NUMA -int hugetlb_mempolicy_sysctl_handler(struct ctl_table *table, int write, +static int hugetlb_mempolicy_sysctl_handler(struct ctl_table *table, int write, void *buffer, size_t *length, loff_t *ppos) { return hugetlb_sysctl_handler_common(true, table, write, @@ -4605,7 +4612,7 @@ int hugetlb_mempolicy_sysctl_handler(struct ctl_table *table, int write, } #endif /* CONFIG_NUMA */ -int hugetlb_overcommit_handler(struct ctl_table *table, int write, +static int hugetlb_overcommit_handler(struct ctl_table *table, int write, void *buffer, size_t *length, loff_t *ppos) { struct hstate *h = &default_hstate; @@ -4634,6 +4641,44 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write, return ret; } +static struct ctl_table hugetlb_table[] = { + { + .procname = "nr_hugepages", + .data = NULL, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = hugetlb_sysctl_handler, + }, +#ifdef CONFIG_NUMA + { + .procname = "nr_hugepages_mempolicy", + .data = NULL, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = &hugetlb_mempolicy_sysctl_handler, + }, +#endif + { + .procname = "hugetlb_shm_group", + .data = &sysctl_hugetlb_shm_group, + .maxlen = sizeof(gid_t), + .mode = 0644, + .proc_handler = proc_dointvec, + }, + { + .procname = "nr_overcommit_hugepages", + .data = NULL, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = hugetlb_overcommit_handler, + }, + { } +}; + +static void __init hugetlb_sysctl_init(void) +{ + register_sysctl_init("vm", hugetlb_table); +} #endif /* CONFIG_SYSCTL */ void hugetlb_report_meminfo(struct seq_file *m)