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 EDFA5C43334 for ; Thu, 9 Jun 2022 11:43:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C2108D0001; Thu, 9 Jun 2022 07:43:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 372106B0087; Thu, 9 Jun 2022 07:43:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2392B8D0001; Thu, 9 Jun 2022 07:43:29 -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 146AD6B0083 for ; Thu, 9 Jun 2022 07:43:29 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 52495107F for ; Thu, 9 Jun 2022 11:43:28 +0000 (UTC) X-FDA: 79558512096.20.9A9E34C Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf16.hostedemail.com (Postfix) with ESMTP id D177F180038 for ; Thu, 9 Jun 2022 11:43:27 +0000 (UTC) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 3701E21EA7; Thu, 9 Jun 2022 11:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1654775006; 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=NTIXiOJ4EIvDrC+cpN3ttiEi4lKSukSvnqa1HJ4/Oak=; b=YXpo6ssGyrb/fcSzskiXF+qvjIWqbYsLGxCRO5ZeUL79XM8bels9dxFRjxVTtsWJYGAamp mxqfBXNKNnYm2asFfExTve8ddzIDCTIhcjMxOHkrk2EkQaFgnO8soJJ9boo+5MtbgNtKKh IrMzF3sB5OuNDhf3InfPp2yEHgrFUEQ= 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 B75D42C141; Thu, 9 Jun 2022 11:43:25 +0000 (UTC) Date: Thu, 9 Jun 2022 13:43:24 +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, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org Subject: Re: [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE Message-ID: References: <20220609104032.18350-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220609104032.18350-1-songmuchun@bytedance.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1654775008; 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=NTIXiOJ4EIvDrC+cpN3ttiEi4lKSukSvnqa1HJ4/Oak=; b=e4L7OYVEE7VH8JZMXqSYFsPiw2t6rKdjYYD9VvGE9yxqeG38858JnrThSuWGCBR1jP+vYG kIZOZjzk2htYfjgCNIqfyDZRWcgEMkDyXLSIQOiPT0HKdhCI2G00t5khEvJbxFWMCOWWd+ jhpnjor0wvWy5psSkL63pd+i3zhEmoQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=YXpo6ssG; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf16.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1654775008; a=rsa-sha256; cv=none; b=JKu9j8rNT4hwGqCIEQQ6VEXyiGGtyPa7oISqjY8B0ahAqen4+PiKnc/rxRpi9AXvBrJhM0 Ceh4OU6uXffWF1TFICXiSOxA7QpFcFnooW4PVhvnd9iXZ+aGGxbGOv5t2apJ38icHqRUF0 P96RBEWDcDbB5SIdfEDlA7AlD7XABM4= X-Stat-Signature: g9sx816mrs4k55wdiczuisygd41e69az X-Rspamd-Queue-Id: D177F180038 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=YXpo6ssG; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf16.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1654775007-76868 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 18:40:32, 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. Move it out of CONFIG_HUGETLB_PAGE to > fix it. > > Fixes: 4518085e127d ("mm, sysctl: make NUMA stats configurable") > Signed-off-by: Muchun Song > Cc: Acked-by: Michal Hocko Thanks! > --- > v2: > - Simplify the fix, thanks to Michal. > > kernel/sysctl.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index 50a2c29efc94..485d2b1bc873 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -2091,6 +2091,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", > @@ -2107,15 +2118,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", > -- > 2.11.0 -- Michal Hocko SUSE Labs