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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 DA8FBC43460 for ; Fri, 9 Apr 2021 08:24:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8873C611AD for ; Fri, 9 Apr 2021 08:24:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8873C611AD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F3DB66B006C; Fri, 9 Apr 2021 04:24:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC5B26B006E; Fri, 9 Apr 2021 04:24:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D695F6B0070; Fri, 9 Apr 2021 04:24:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0132.hostedemail.com [216.40.44.132]) by kanga.kvack.org (Postfix) with ESMTP id B65706B006C for ; Fri, 9 Apr 2021 04:24:24 -0400 (EDT) Received: from smtpin40.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 7BBB7180C4E4F for ; Fri, 9 Apr 2021 08:24:24 +0000 (UTC) X-FDA: 78012141648.40.29A5319 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf13.hostedemail.com (Postfix) with ESMTP id B0AC6E000104 for ; Fri, 9 Apr 2021 08:24:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617956663; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VZBU0P5qEZI2XAQHiBBHkCAjyC6MXnqauZxTSWZ9IvE=; b=MPtK3c8nkyIsFoYUdZ9aEuWfYKmkqIZEYfHstOnTqWh7a3s0l2lA4TgwDG0w3Zu7JAgLeD +VlJAW+Ok8SYRYNrvbXN8+swZ+kfUleEMOuYYoEaqzImPEAi7VYOVjrTOAXm22mgNQPaFN mL9zxaE7RC8yrFUsV1BdpmikyOuVRrU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-337-ykjAZNWTOhKv9lnMVfhQsA-1; Fri, 09 Apr 2021 04:24:21 -0400 X-MC-Unique: ykjAZNWTOhKv9lnMVfhQsA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F9D418B9F50; Fri, 9 Apr 2021 08:24:20 +0000 (UTC) Received: from [10.36.115.11] (ovpn-115-11.ams2.redhat.com [10.36.115.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 721C719C66; Fri, 9 Apr 2021 08:24:19 +0000 (UTC) Subject: Re: [PATCH] mm/page_alloc: Ensure that HUGETLB_PAGE_ORDER is less than MAX_ORDER To: Anshuman Khandual , linux-mm@kvack.org Cc: Andrew Morton , linux-kernel@vger.kernel.org References: <1617947717-2424-1-git-send-email-anshuman.khandual@arm.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: <5a92f302-1917-1374-a8c7-0badb9ec1b8c@redhat.com> Date: Fri, 9 Apr 2021 10:24:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <1617947717-2424-1-git-send-email-anshuman.khandual@arm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Stat-Signature: 7uxkpw9c7ewhzz8dw8csf57z571b9pf9 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: B0AC6E000104 Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf13; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=216.205.24.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1617956661-59504 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 09.04.21 07:55, Anshuman Khandual wrote: > pageblock_order must always be less than MAX_ORDER, otherwise it might lead > to an warning during boot. A similar problem got fixed on arm64 platform > with the commit 79cc2ed5a716 ("arm64/mm: Drop THP conditionality from > FORCE_MAX_ZONEORDER"). Assert the above condition before HUGETLB_PAGE_ORDER > gets assigned as pageblock_order. This will help detect the problem earlier > on platforms where HUGETLB_PAGE_SIZE_VARIABLE is enabled. > > Cc: Andrew Morton > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual > --- > mm/page_alloc.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 604dcd69397b..81b7460e1228 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -7068,10 +7068,17 @@ void __init set_pageblock_order(void) > if (pageblock_order) > return; > > - if (HPAGE_SHIFT > PAGE_SHIFT) > + if (HPAGE_SHIFT > PAGE_SHIFT) { > + /* > + * pageblock_order must always be less than > + * MAX_ORDER. So does HUGETLB_PAGE_ORDER if > + * that is being assigned here. > + */ > + WARN_ON(HUGETLB_PAGE_ORDER >= MAX_ORDER); Can't that be a BUILD_BUG_ON() ? > order = HUGETLB_PAGE_ORDER; > - else > + } else { > order = MAX_ORDER - 1; > + } > > /* > * Assume the largest contiguous order of interest is a huge page. > -- Thanks, David / dhildenb