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 X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85B4DC433ED for ; Tue, 6 Apr 2021 19:57:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B776A61246 for ; Tue, 6 Apr 2021 19:57:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B776A61246 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3688C6B007E; Tue, 6 Apr 2021 15:57:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3199B6B0080; Tue, 6 Apr 2021 15:57:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2090C6B0081; Tue, 6 Apr 2021 15:57:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0059.hostedemail.com [216.40.44.59]) by kanga.kvack.org (Postfix) with ESMTP id 03CDF6B007E for ; Tue, 6 Apr 2021 15:57:07 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B9AFA814D for ; Tue, 6 Apr 2021 19:57:07 +0000 (UTC) X-FDA: 78003000894.22.B96AF7D Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf22.hostedemail.com (Postfix) with ESMTP id 8786EC0007D2 for ; Tue, 6 Apr 2021 19:57:05 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 09872AF9A; Tue, 6 Apr 2021 19:57:06 +0000 (UTC) Date: Tue, 6 Apr 2021 21:57:03 +0200 From: Oscar Salvador To: Randy Dunlap Cc: Stephen Rothwell , Linux Next Mailing List , Linux Kernel Mailing List , X86 ML , Andrew Morton , Linux MM Subject: Re: linux-next: Tree for Apr 6 (arch/x86/mm/init_64.c) Message-ID: References: <20210406223109.50ebe35a@canb.auug.org.au> <58d0c74b-ef4d-447b-9285-3d2c192fd3eb@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8786EC0007D2 X-Stat-Signature: b7z5pmxhagx6idoowa66uiwds9yipz9h Received-SPF: none (suse.de>: No applicable sender policy available) receiver=imf22; identity=mailfrom; envelope-from=""; helo=mx2.suse.de; client-ip=195.135.220.15 X-HE-DKIM-Result: none/none X-HE-Tag: 1617739025-71471 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 Tue, Apr 06, 2021 at 11:39:47AM -0700, Randy Dunlap wrote: > > Looks like that compound "if" is too much for gcc 7.5.0 to handle: > > > > } else if (IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP) && > > vmemmap_pmd_is_unused(addr, next)) { > > free_hugepage_table(pmd_page(*pmd), > > altmap); > > spin_lock(&init_mm.page_table_lock); > > pmd_clear(pmd); > > spin_unlock(&init_mm.page_table_lock); > > } > > > > > > This is what I am using for now: Hi Randy Yeah, that is what v4 was using [1]. We decided to get rid of the ifdef for costimetic reasons but it seems it does not do the trick. I will ask Andrew to squash that on top. [1] https://patchwork.kernel.org/project/linux-mm/patch/20210301083230.30924-4-osalvador@suse.de/ Thanks > > --- > --- > arch/x86/mm/init_64.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > --- linux-next-20210406.orig/arch/x86/mm/init_64.c > +++ linux-next-20210406/arch/x86/mm/init_64.c > @@ -1123,14 +1123,16 @@ remove_pmd_table(pmd_t *pmd_start, unsig > pmd_clear(pmd); > spin_unlock(&init_mm.page_table_lock); > pages++; > - } else if (IS_ENABLED(CONFIG_SPARSEMEM_VMEMMAP) && > - vmemmap_pmd_is_unused(addr, next)) { > + } > +#ifdef CONFIG_SPARSEMEM_VMEMMAP > + else if (vmemmap_pmd_is_unused(addr, next)) { > free_hugepage_table(pmd_page(*pmd), > altmap); > spin_lock(&init_mm.page_table_lock); > pmd_clear(pmd); > spin_unlock(&init_mm.page_table_lock); > } > +#endif > > continue; > } > -- Oscar Salvador SUSE L3