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 83CBBC43334 for ; Thu, 9 Jun 2022 08:46:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA1186B0088; Thu, 9 Jun 2022 04:45:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E51736B0089; Thu, 9 Jun 2022 04:45:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D18626B008A; Thu, 9 Jun 2022 04:45:59 -0400 (EDT) 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 C06386B0088 for ; Thu, 9 Jun 2022 04:45:59 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 987FA34BE6 for ; Thu, 9 Jun 2022 08:45:59 +0000 (UTC) X-FDA: 79558064838.02.A0E6069 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf09.hostedemail.com (Postfix) with ESMTP id 2E09A140062 for ; Thu, 9 Jun 2022 08:45:59 +0000 (UTC) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 9AFD2218B0; Thu, 9 Jun 2022 08:45:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1654764357; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=FvavTNx1f/0HsDobph2sXPyYgU5o7YbYGNlwn/kaUwk=; b=fD5Fv6UEhOehsMLElIPAGFa9Y8wFPPOucJgXizP2FtZqJT90k/SgyoBqzfdDsSG2m3H8oZ PrjRPp9zwLE7Hq22Skw4TDnOKbNaX/SQmy3OEB3gcqiT5UB9Md1SeKfDor35St3W1JTT67 fm3AS7I0f6Ba1JoGwfWmPey6MJ7CPbY= Received: from suse.cz (unknown [10.100.201.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 395B22C141; Thu, 9 Jun 2022 08:45:56 +0000 (UTC) Date: Thu, 9 Jun 2022 10:45:56 +0200 From: Michal Hocko To: Muchun Song Cc: mcgrof@kernel.org, keescook@chromium.org, yzaikin@google.com, akpm@linux-foundation.org, vbabka@suse.cz, mgorman@techsingularity.net, peterz@infradead.org, dhowells@redhat.com, willy@infradead.org, Liam.Howlett@oracle.com, kemi.wang@intel.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org Subject: Re: [PATCH] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE Message-ID: References: <20220609040342.2703-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220609040342.2703-1-songmuchun@bytedance.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1654764359; a=rsa-sha256; cv=none; b=lwHgN4hPJ2T07bGI/5m4RH2CtYUbEjaFP8tPNiemTHdA0Dbb7UmY08GjEtYfwvZkNmdLUz 8x3WRTAe+Vpch4iik8b4PMUXi1YY4s8cy3G5BI1OrYW4UHd0DdL3DO4K+HZyrxjAvO56K6 T8Dggm2yhUkaIcKwacESY874ZOmto5U= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=fD5Fv6UE; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf09.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1654764359; 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:in-reply-to:references:references:dkim-signature; bh=FvavTNx1f/0HsDobph2sXPyYgU5o7YbYGNlwn/kaUwk=; b=DW+OwuU/HFndR9+/YVoUIqYwQMcskR71YvRaaNYb2N5zcLYyf1GNIlwTQbLHYHQQaYSpNO rTC5DuqXJ/sZhl2YRZP16Pv+CXV00eQjI/MWoB6APzk4nTyPoap9GwavC763YgOTLk1D/1 hToDtJusVUiOBrxYLaxlFepf922IF9c= X-Rspamd-Queue-Id: 2E09A140062 X-Rspam-User: Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=fD5Fv6UE; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf09.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com X-Stat-Signature: jc4ywtst98fjb39j13k5ytyrdj6brdus X-Rspamd-Server: rspam02 X-HE-Tag: 1654764359-970858 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: On Thu 09-06-22 12:03:42, Muchun Song wrote: > "numa_stat" should not be included in the scope of CONFIG_HUGETLB_PAGE, > if CONFIG_HUGETLB_PAGE is not configured even if CONFIG_NUMA is configured, > "numa_stat" is missed form /proc. Remove it out of CONFIG_HUGETLB_PAGE > and move numa_stat sysctl handling to mm/vmstat.c. > > Fixes: 4518085e127d ("mm, sysctl: make NUMA stats configurable") > Signed-off-by: Muchun Song > Cc: It really looks like numa_stat is misplaced but I am wondering why the fix cannot be as simple as diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 830aaf8ca08e..b9c2cd9ed3a2 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2463,6 +2463,17 @@ 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 #ifdef CONFIG_HUGETLB_PAGE { .procname = "nr_hugepages", @@ -2479,15 +2490,6 @@ static struct ctl_table vm_table[] = { .mode = 0644, .proc_handler = &hugetlb_mempolicy_sysctl_handler, }, - { - .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 = "hugetlb_shm_group", -- Michal Hocko SUSE Labs