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=-13.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 EE137C433E2 for ; Fri, 11 Sep 2020 07:07:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7FB9921D81 for ; Fri, 11 Sep 2020 07:07:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="D+cbSKtr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FB9921D81 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:References: To:Subject:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=D/yqM4KMBu+pQoGN9A+Yi95mIYYLb+r3CmVOm1/56kY=; b=D+cbSKtrOAlH1NcACmB3BlGK8 Ps7dCfNdhoqWL+fXjInMZLCS5fq7rfPYsO70RoCGdexE47Lr+0wEgPw/ctDf6JjvD3We+Ypjg3lBX kiqbjO1UzC/50wybIHO5cnAbO3gXG+dLh0W0o+9DtYNIQzIDqw4UPxxseZDc7bZPaAC05O30McvCc 9NZHuE0uDkJT4y28YSPwapXU3Vu8W5abSszPl6jW5B+xCHNNxjzfNdcZ//G13S/NjkTjtwppTkqRL yAEkiRwXJFFUAvCP6iDUTXM/5Ol3eSOlNzTu56MJooC+nFEqw6d4viMou2k2cGSQeeOVUWRkY9B43 G/d+XJfhQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGd8c-0002gr-Az; Fri, 11 Sep 2020 07:06:26 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGd8Z-0002fK-Hx for linux-arm-kernel@lists.infradead.org; Fri, 11 Sep 2020 07:06:24 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 67647113E; Fri, 11 Sep 2020 00:06:21 -0700 (PDT) Received: from [192.168.0.130] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8A6763F73C; Fri, 11 Sep 2020 00:06:19 -0700 (PDT) From: Anshuman Khandual Subject: Re: [PATCH v2 3/3] arm64/mm: Unitify CONT_PMD_SHIFT To: Gavin Shan , linux-arm-kernel@lists.infradead.org References: <20200910095936.20307-1-gshan@redhat.com> <20200910095936.20307-3-gshan@redhat.com> Message-ID: <1af39001-8d8f-b573-8159-666999d25543@arm.com> Date: Fri, 11 Sep 2020 12:35:42 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200910095936.20307-3-gshan@redhat.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200911_030623_962552_75C881E2 X-CRM114-Status: GOOD ( 19.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: catalin.marinas@arm.com, will@kernel.org, linux-kernel@vger.kernel.org, shan.gavin@gmail.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 09/10/2020 03:29 PM, Gavin Shan wrote: > Similar to how CONT_PTE_SHIFT is determined, this introduces a new > kernel option (CONFIG_CONT_PMD_SHIFT) to determine CONT_PMD_SHIFT. > > Signed-off-by: Gavin Shan > --- > arch/arm64/Kconfig | 6 ++++++ > arch/arm64/include/asm/pgtable-hwdef.h | 10 ++-------- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 7ec30dd56300..d58e17fe9473 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -217,6 +217,12 @@ config ARM64_CONT_PTE_SHIFT > default 7 if ARM64_16K_PAGES > default 4 > > +config ARM64_CONT_PMD_SHIFT > + int > + default 5 if ARM64_64K_PAGES > + default 5 if ARM64_16K_PAGES > + default 4 > + > config ARCH_MMAP_RND_BITS_MIN > default 14 if ARM64_64K_PAGES > default 16 if ARM64_16K_PAGES > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h > index 6c9c67f62551..94b3f2ac2e9d 100644 > --- a/arch/arm64/include/asm/pgtable-hwdef.h > +++ b/arch/arm64/include/asm/pgtable-hwdef.h > @@ -82,17 +82,11 @@ > * Contiguous page definitions. > */ > #define CONT_PTE_SHIFT (CONFIG_ARM64_CONT_PTE_SHIFT + PAGE_SHIFT) > -#ifdef CONFIG_ARM64_64K_PAGES > -#define CONT_PMD_SHIFT (5 + PMD_SHIFT) > -#elif defined(CONFIG_ARM64_16K_PAGES) > -#define CONT_PMD_SHIFT (5 + PMD_SHIFT) > -#else > -#define CONT_PMD_SHIFT (4 + PMD_SHIFT) > -#endif > - > #define CONT_PTES (1 << (CONT_PTE_SHIFT - PAGE_SHIFT)) > #define CONT_PTE_SIZE (CONT_PTES * PAGE_SIZE) > #define CONT_PTE_MASK (~(CONT_PTE_SIZE - 1)) > + > +#define CONT_PMD_SHIFT (CONFIG_ARM64_CONT_PMD_SHIFT + PMD_SHIFT) > #define CONT_PMDS (1 << (CONT_PMD_SHIFT - PMD_SHIFT)) > #define CONT_PMD_SIZE (CONT_PMDS * PMD_SIZE) > #define CONT_PMD_MASK (~(CONT_PMD_SIZE - 1)) > This is cleaner and more uniform. Did not see any problem while running some quick hugetlb tests across multiple page size configs after applying all patches in this series. Adding this new configuration ARM64_CONT_PMD_SHIFT makes sense, as it eliminates existing constant values that are used in an ad hoc manner, while computing contiguous page table entry properties. Reviewed-by: Anshuman Khandual _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel