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 8E08BE7719A for ; Thu, 9 Jan 2025 02:27:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0ECB36B0082; Wed, 8 Jan 2025 21:27:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 09C056B0083; Wed, 8 Jan 2025 21:27:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E57D76B0085; Wed, 8 Jan 2025 21:27:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C6E736B0082 for ; Wed, 8 Jan 2025 21:27:02 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7377EA0BB8 for ; Thu, 9 Jan 2025 02:27:02 +0000 (UTC) X-FDA: 82986325884.03.B9C4481 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf22.hostedemail.com (Postfix) with ESMTP id 09B9CC0008 for ; Thu, 9 Jan 2025 02:26:59 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.187 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=1736389620; 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=Ga6SZy3oO6OmKNShbl5HC07cyyZoEGCoglRzzTQuEnY=; b=I5QfQpERH5v2zHvW5LY5Ip8okXLhg4+pLXY7xDdac2lnvwUOiGGtaLksep5fK+oVKAmzkv Nc1hjILlln/ebVTfAZtDycASvS6k0a1aZyM2yLlIew78snApQqa44NOe6jpjZFRXZqke0n EY/bhOYvqMJ6KoNRrxcGthmlktub4oc= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736389620; a=rsa-sha256; cv=none; b=3Bb5bgvjWyKLSuJvPHZmL7ZHhG+P5xxP2zxnL+fsr7hY0ByRRInjFw7QPa4JxQ5lQHZigJ jMH5F9qfSs+DBrVmDjXkUqRicIoWRA1WsKVjuCcMDpW8MUnJEnk/3eJQvXUdgspANm4PdN NM3sO7HITCzGWXGAdxGxqweZgHB+gUo= Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4YT7qh6fqxzjYB7; Thu, 9 Jan 2025 10:23:12 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id C86EE140382; Thu, 9 Jan 2025 10:26:55 +0800 (CST) Received: from [10.174.179.93] (10.174.179.93) 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; Thu, 9 Jan 2025 10:26:52 +0800 Subject: Re: [PATCH v4 -next 08/15] mm: nommu: move sysctl to mm/nommu.c To: Lorenzo Stoakes References: <20241223141550.638616-1-yukaixiong@huawei.com> <20241223141550.638616-9-yukaixiong@huawei.com> <93c2a55b-3f3b-488e-9156-0a7726f30be3@lucifer.local> CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , From: yukaixiong Message-ID: <1959b553-decd-7525-865e-425776841833@huawei.com> Date: Thu, 9 Jan 2025 10:26:51 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <93c2a55b-3f3b-488e-9156-0a7726f30be3@lucifer.local> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.93] X-ClientProxiedBy: dggpeml500006.china.huawei.com (7.185.36.76) To kwepemh100016.china.huawei.com (7.202.181.102) X-Rspamd-Queue-Id: 09B9CC0008 X-Stat-Signature: jtu7azt7zazafjbbw83bg3e1fp8amqpj X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1736389619-987705 X-HE-Meta: U2FsdGVkX1+aEtAg536DRto9THXgNjHjpsN38dkTe1ax+RSWgam9EiPQOcFONQEd4rXqZGhjJXz8v8S4zRLlxfCggJFA3O0xG43dS4ArOgCUVWPFhnseqHC5eiG1udEboXv8zMEYb3APq6W1P2daItEsBUk+1OPCgfkSjw7V276nhtnUVHU8WNw8X9jGjrjF3KjWRp3F/WjJfhSYxjlFHIIBj79BV4dBTf8NhBGoLZMNtRiXIYoC5y0z0dzXY8dGq41zOchMkXUm+hN1jQTi01QrIdX1c7YZmaEGULZVTQtfeB7mPvhA6b+J8Eblzsm+HnHfQ4PmEpHhldh4egsYwaW+yZUzqHc7ogVJOPG49ZjYlqPYntUcB6/jMxwyCxwTSKCd5xPbTKCgCnxgdw00pZ3iYNF3sYljbAYxP8eRxj6X/o2hrOn+Auqidqe+jCpFixjgTdQPuEGOGvuJiC6QuZ5FAxoxxFva7pAB72Xc6/mFAx8yUX94xtJ0mtdT2QXiOJ4F5HS02HNqwo39kt34hOz6ytcOdZ4+xLBz+f+U15IW5vq6h6bnwTldBR9T72uGDavjMncwXs+JoPUdLC2xUUbcyixXm25jf7weZNn/Sg6dS4FqP2r77DPH4je7wZQJZbYgUG/K11a7Wilo6yBh2dKswDjsJYxoZS3uYu0fkYkDrgvBSYoDSBNEg0ZEGpFhNPbOqLjlx6qTaYeKaYoYk3NI21clbX/CULtNYuGl0MGvh63qydq1wYM8lZqq2WQlry6/3ZfPIO9iOmx3vkd9TXafGJWuZAh/L9Jla+qkHxKiXiBD8Cet/1cGJUtVNcGmrgW/fjVGIu03kdVDtwOvSPjem56GkXcPp6Q1OTuPJZeC1p92ytjzXzqCKtRU/jFgesiiLLW3N8DnNKT+QcTDZtZ9+0QGLQegXGnRGInO/dH74rEpGuIOMazaGeg3prCWqsXe1yBm7Qec6OqovGr cXk7sdL4 NkbIFP4dK+SKZhVU6LuRlDzJY19MyReQnx/suJefSb3peAnAFQykUtXjSB29isJw7dqoIQl45jTFRj37f50zWVQsf8Ur676J0T+iXnmkStBP2FqkVvBFydnRwp/sFFwQPsKwqGri29XaWan3PG3uTttxRakNsph1tUHdHyEBDeyoeUq6uGmcAYKrt7w== 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: On 2025/1/2 22:09, Lorenzo Stoakes wrote: > On Mon, Dec 23, 2024 at 10:15:27PM +0800, Kaixiong Yu wrote: >> The sysctl_nr_trim_pages belongs to nommu.c, move it to mm/nommu.c >> from /kernel/sysctl.c. And remove the useless extern variable declaration >> from include/linux/mm.h >> >> Signed-off-by: Kaixiong Yu > Looks good to me, > > Reviewed-by: Lorenzo Stoakes Thanks for your review ! Best ... >> --- >> v4: >> - const qualify struct ctl_table nommu_table >> v3: >> - change the title >> v2: >> - fix the build error: expected ';' after top level declarator >> - fix the build error: call to undeclared function 'register_syscall_init', >> use 'register_sysctl_init' to replace it. >> --- >> --- >> include/linux/mm.h | 2 -- >> kernel/sysctl.c | 10 ---------- >> mm/nommu.c | 15 ++++++++++++++- >> 3 files changed, 14 insertions(+), 13 deletions(-) >> >> diff --git a/include/linux/mm.h b/include/linux/mm.h >> index b3b87c1dc1e4..9813b5b9c093 100644 >> --- a/include/linux/mm.h >> +++ b/include/linux/mm.h >> @@ -4080,8 +4080,6 @@ unsigned long wp_shared_mapping_range(struct address_space *mapping, >> pgoff_t first_index, pgoff_t nr); >> #endif >> >> -extern int sysctl_nr_trim_pages; >> - >> #ifdef CONFIG_PRINTK >> void mem_dump_obj(void *object); >> #else >> diff --git a/kernel/sysctl.c b/kernel/sysctl.c >> index 62a58e417c40..97f9abffff0f 100644 >> --- a/kernel/sysctl.c >> +++ b/kernel/sysctl.c >> @@ -2031,16 +2031,6 @@ static struct ctl_table vm_table[] = { >> .extra1 = SYSCTL_ONE, >> .extra2 = SYSCTL_FOUR, >> }, >> -#ifndef CONFIG_MMU >> - { >> - .procname = "nr_trim_pages", >> - .data = &sysctl_nr_trim_pages, >> - .maxlen = sizeof(sysctl_nr_trim_pages), >> - .mode = 0644, >> - .proc_handler = proc_dointvec_minmax, >> - .extra1 = SYSCTL_ZERO, >> - }, >> -#endif > Of course later on in the series you do what I asked in a previous commit :P Nice. > >> { >> .procname = "vfs_cache_pressure", >> .data = &sysctl_vfs_cache_pressure, >> diff --git a/mm/nommu.c b/mm/nommu.c >> index baa79abdaf03..3c32f8b1eb54 100644 >> --- a/mm/nommu.c >> +++ b/mm/nommu.c >> @@ -48,7 +48,6 @@ struct page *mem_map; >> unsigned long max_mapnr; >> EXPORT_SYMBOL(max_mapnr); >> unsigned long highest_memmap_pfn; >> -int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS; >> int heap_stack_gap = 0; >> >> atomic_long_t mmap_pages_allocated; >> @@ -392,6 +391,19 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) >> return mm->brk = brk; >> } >> >> +static int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS; >> + >> +static const struct ctl_table nommu_table[] = { >> + { >> + .procname = "nr_trim_pages", >> + .data = &sysctl_nr_trim_pages, >> + .maxlen = sizeof(sysctl_nr_trim_pages), >> + .mode = 0644, >> + .proc_handler = proc_dointvec_minmax, >> + .extra1 = SYSCTL_ZERO, >> + }, >> +}; >> + >> /* >> * initialise the percpu counter for VM and region record slabs >> */ >> @@ -402,6 +414,7 @@ void __init mmap_init(void) >> ret = percpu_counter_init(&vm_committed_as, 0, GFP_KERNEL); >> VM_BUG_ON(ret); >> vm_region_jar = KMEM_CACHE(vm_region, SLAB_PANIC|SLAB_ACCOUNT); >> + register_sysctl_init("vm", nommu_table); >> } >> >> /* >> -- >> 2.34.1 >> > . >