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=-15.9 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1, USER_IN_DEF_DKIM_WL 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 86E0BC433DF for ; Tue, 7 Jul 2020 05:07:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4218C20702 for ; Tue, 7 Jul 2020 05:07:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="D+Yof6FF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4218C20702 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9F4FE6B0029; Tue, 7 Jul 2020 01:07:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A6676B002B; Tue, 7 Jul 2020 01:07:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8950A6B002C; Tue, 7 Jul 2020 01:07:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0153.hostedemail.com [216.40.44.153]) by kanga.kvack.org (Postfix) with ESMTP id 7316B6B0029 for ; Tue, 7 Jul 2020 01:07:40 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 2C7AB8248047 for ; Tue, 7 Jul 2020 05:07:40 +0000 (UTC) X-FDA: 77010097080.23.test37_3b084d426eb1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 019C637606 for ; Tue, 7 Jul 2020 05:07:39 +0000 (UTC) X-HE-Tag: test37_3b084d426eb1 X-Filterd-Recvd-Size: 6606 Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Tue, 7 Jul 2020 05:07:39 +0000 (UTC) Received: by mail-oi1-f194.google.com with SMTP id k4so33903954oik.2 for ; Mon, 06 Jul 2020 22:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=zAb/McZ8XV6K9mwnFmuQqAT3ttMAxvJlZ4c61ur+Pa0=; b=D+Yof6FF8oNlsgkmvQuu9+VtHHmA9NcZHMWdtgSC/QSPt6pr1sj+AiB3zxUjck6g39 ywslF1il3kMVm/aWTK3rXKezuwLifVn5w7C3ifktqJEi2o4eOwDbGiuHK27GRm7Un1V/ uAGDZ8reGtpiSosTpJXUMmhGknY10wUjR85pjFzVX9eFUNrcCBBFnL8Yv5a8Tovk6IKf E3O8YyKBDq73PTmSGkB/uslZp7RItO6oHD4KJbDoraUxxlpQe7aAhSwYZ/1b/2XmNUE/ kxJUH9iulFf8gugSa6TU/gETmNRFstl1Sq18kRVs8wwztF+RvVtQHYR2ezRguq6oNQze mssg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=zAb/McZ8XV6K9mwnFmuQqAT3ttMAxvJlZ4c61ur+Pa0=; b=L8OeypQQk2Rb18HLkchn+vPpngHn0QeyZ6hMQkncwZ1k17MCafTERMdZjXMUYJ5HVs aknGjngdAQ7INEo+1e0Nxh1CeHeqIBSnauMQT+G4ieog6JlR9pSPkH1uXMmoBSX553+1 i3EHrXk+KoroDPfCdP4DxyoME5PdMce56mYquFFx034oLECUTg9RjBNLinSNt4YlJopq BGnSljFDafr7TNBoevLAdUEs/wYeSt3BeW2fAhCBEhBrN3BXpwA1Tc/wCX8z9D0mIss7 WBRqq5qCbCwAj1pRFHD3kMVPFzRQLUFjau+YV9BwvPypYFmQ27LQ61D7EXArmdaLdyJO ORqw== X-Gm-Message-State: AOAM533l9pn+03ZzvLEcGFRIkOc4BY4afvVEnCs/jgCOaym3yrz/7537 sKoA3hBwF4rAaiawTl/PEUrwlg== X-Google-Smtp-Source: ABdhPJxVEHb5iTVD+kSh7pvIzuQgzyhih6LB4C6jdkDUZbpZpAoAQywdAuQlqTiMn0b3PGXucearDA== X-Received: by 2002:aca:5158:: with SMTP id f85mr2097275oib.6.1594098458258; Mon, 06 Jul 2020 22:07:38 -0700 (PDT) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id t187sm5490060oib.45.2020.07.06.22.07.35 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Mon, 06 Jul 2020 22:07:37 -0700 (PDT) Date: Mon, 6 Jul 2020 22:07:34 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Mike Rapoport cc: Andrea Arcangeli , linux-kernel@vger.kernel.org, Alan Cox , Andrew Morton , Andy Lutomirski , Christopher Lameter , Dave Hansen , Idan Yaniv , James Bottomley , "Kirill A. Shutemov" , Matthew Wilcox , Peter Zijlstra , "Reshetova, Elena" , Thomas Gleixner , Tycho Andersen , linux-api@vger.kernel.org, linux-mm@kvack.org, Mike Rapoport Subject: Re: [RFC PATCH v2 1/5] mm: make HPAGE_PxD_{SHIFT,MASK,SIZE} always available In-Reply-To: <20200706172051.19465-2-rppt@kernel.org> Message-ID: References: <20200706172051.19465-1-rppt@kernel.org> <20200706172051.19465-2-rppt@kernel.org> User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Rspamd-Queue-Id: 019C637606 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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 Mon, 6 Jul 2020, Mike Rapoport wrote: > From: Mike Rapoport > > The definitions of shift, mask and size for the second and the third level > of the leaf pages are available only when CONFIG_TRANSPARENT_HUGEPAGE is > set. Otherwise they evaluate to BUILD_BUG(). > > There is no explanation neither in the code nor in the changelog why the > usage of, e.g. HPAGE_PMD_SIZE should be only allowed with THP and forbidden > otherwise while the definitions of HPAGE_PMD_SIZE and HPAGE_PUD_SIZE > express the sizes better than ambiguous HPAGE_SIZE. > > Make HPAGE_PxD_{SHIFT,MASK,SIZE} definitions available unconditionally. Adding Andrea to Cc, he's the one who structured it that way, and should be consulted. I'm ambivalent myself. Many's the time I've been irritated by the BUILD_BUG() in HPAGE_etc, and it's responsible for very many #ifdef CONFIG_TRANSPARENT_HUGEPAGEs or IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)s that you find uglily scattered around the source. But that's the point of it: it's warning when you write code peculiar to THP, that is going to bloat the build of kernels without any THP. So although I've often been tempted to do as you suggest, I've always ended up respecting Andrea's intention, and worked around it instead (sometimes with #ifdef or IS_ENABLED(), sometimes with PMD_{SHIFT,MASK_SIZE}, sometimes with a local definition). Hugh > > Signed-off-by: Mike Rapoport > --- > include/linux/huge_mm.h | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 71f20776b06c..1f4b44a76e31 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -115,7 +115,6 @@ extern struct kobj_attribute shmem_enabled_attr; > #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) > #define HPAGE_PMD_NR (1< > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > #define HPAGE_PMD_SHIFT PMD_SHIFT > #define HPAGE_PMD_SIZE ((1UL) << HPAGE_PMD_SHIFT) > #define HPAGE_PMD_MASK (~(HPAGE_PMD_SIZE - 1)) > @@ -124,6 +123,8 @@ extern struct kobj_attribute shmem_enabled_attr; > #define HPAGE_PUD_SIZE ((1UL) << HPAGE_PUD_SHIFT) > #define HPAGE_PUD_MASK (~(HPAGE_PUD_SIZE - 1)) > > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > + > extern unsigned long transparent_hugepage_flags; > > /* > @@ -316,13 +317,6 @@ static inline struct list_head *page_deferred_list(struct page *page) > } > > #else /* CONFIG_TRANSPARENT_HUGEPAGE */ > -#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) > -#define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; }) > -#define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; }) > - > -#define HPAGE_PUD_SHIFT ({ BUILD_BUG(); 0; }) > -#define HPAGE_PUD_MASK ({ BUILD_BUG(); 0; }) > -#define HPAGE_PUD_SIZE ({ BUILD_BUG(); 0; }) > > static inline int hpage_nr_pages(struct page *page) > { > -- > 2.26.2