From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934720AbcA1WS2 (ORCPT ); Thu, 28 Jan 2016 17:18:28 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:18658 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933533AbcA1WSZ (ORCPT ); Thu, 28 Jan 2016 17:18:25 -0500 Subject: Re: Regression: 4.5-rc1 (bisect: hugetlb: make mm and fs code explicitly non-modular vs CONFIG_TIMER_STATS) To: Paul Gortmaker , Christian Borntraeger References: <56A9DC76.2030502@de.ibm.com> <059e01d159af$e4317390$ac945ab0$@alibaba-inc.com> <56A9E404.7000409@de.ibm.com> <20160128143723.GN8889@windriver.com> <56AA2E44.4070709@oracle.com> Cc: Hillf Danton , "'Andrew Morton'" , "'Nadia Yvette Chambers'" , "'Alexander Viro'" , "'Naoya Horiguchi'" , "'David Rientjes'" , "'Davidlohr Bueso'" , "'Linux Kernel Mailing List'" From: Mike Kravetz Message-ID: <56AA939D.6080104@oracle.com> Date: Thu, 28 Jan 2016 14:18:05 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <56AA2E44.4070709@oracle.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/28/2016 07:05 AM, Mike Kravetz wrote: > On 01/28/2016 06:37 AM, Paul Gortmaker wrote: >> [Re: Regression: 4.5-rc1 (bisect: hugetlb: make mm and fs code explicitly non-modular vs CONFIG_TIMER_STATS)] On 28/01/2016 (Thu 10:48) Christian Borntraeger wrote: >> >>> On 01/28/2016 10:40 AM, Hillf Danton wrote: >>>>> >>>>> Paul, >>>>> >>>>> the commit 3e89e1c5ea842 ("hugetlb: make mm and fs code explicitly non-modular") >>>>> triggers belows warning/oops, if CONFIG_TIMER_STATS is set. >>>>> >>>>> Looking at the patch the only "real" change is the init_call, >>>>> and indeed >>>>> --- a/mm/hugetlb.c >>>>> +++ b/mm/hugetlb.c >>>>> @@ -2653,7 +2653,7 @@ static int __init hugetlb_init(void) >>>>> mutex_init(&hugetlb_fault_mutex_table[i]); >>>>> return 0; >>>>> } >>>>> -subsys_initcall(hugetlb_init); >>>>> +device_initcall(hugetlb_init); >>>>> >>>>> /* Should be called on processing a hugepagesz=... option */ >>>>> void __init hugetlb_add_hstate(unsigned int order) >>>>> >>>>> makes the problem go away. >>>> >>>> Helps more if a patch is delivered. >>> >>> The problem is that the original change was intentional. So I do not not >>> what the right fix is. >> >> Thanks for the report ; let me see if I can work out what TIMER_STATS >> is doing to cause this sometime today. >> > > Hmmm? CONFIG_TIMER_STATS is set in my config and I am not seeing the > issue. Not sure, but it looks like Christian is building/running on > s390. This 'might' be a contributing factor. I do not see how CONFIG_TIMER_STATS contributes to this issue. However, on s390 numa nodes are initialized at device_initcall in the appropriately named routine numa_init_late(). hugetlb_init must be done after numa initialization. So, I suggest we just move the hugetlb initialization back to device_initcall. What do you think Paul? Patch below. Is there a way to add checks for this type of thing in the code? I'm guessing not. -- Mike Kravetz hugetlb: move hugetlb_init and init_hugetlbfs_fs to device_initcall level hugetlb_init() must be called after numa initialization for all architectures. Currently, numa initialization happens as late as device_initcall. Therefore, move hugetlb_init to device_initcall level. init_hugetlbfs_fs() depends on hugetlb_init(), so move it to device_initcall as well. Fixes: 3e89e1c5ea ("hugetlb: make mm and fs code explicitly non-modular") Reported-by: Christian Borntraeger Signed-off-by: Mike Kravetz --- fs/hugetlbfs/inode.c | 3 ++- mm/hugetlb.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 540ddc9..d27d3f6 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1363,4 +1363,5 @@ static int __init init_hugetlbfs_fs(void) out2: return error; } -fs_initcall(init_hugetlbfs_fs) +/* Must happen after hugetlb_init() */ +device_initcall(init_hugetlbfs_fs) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 12908dc..a4c0015 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2653,7 +2653,11 @@ static int __init hugetlb_init(void) mutex_init(&hugetlb_fault_mutex_table[i]); return 0; } -subsys_initcall(hugetlb_init); +/* + * hugetlb_init must be called after numa initialization for all architectures. + * Currently, this is as late as device_initcall(). + */ +device_initcall(hugetlb_init); /* Should be called on processing a hugepagesz=... option */ void __init hugetlb_add_hstate(unsigned int order) -- 2.4.3