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=-14.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 75DA9C4338F for ; Tue, 10 Aug 2021 13:33:33 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id D5F0A61008 for ; Tue, 10 Aug 2021 13:33:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D5F0A61008 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 603794A4CD; Tue, 10 Aug 2021 09:33:32 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rwlk4RCGLsjX; Tue, 10 Aug 2021 09:33:27 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id EF9774A483; Tue, 10 Aug 2021 09:33:26 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 7370C40630 for ; Tue, 10 Aug 2021 09:33:25 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2CnDaDivkW8G for ; Tue, 10 Aug 2021 09:33:21 -0400 (EDT) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id E53B04029C for ; Tue, 10 Aug 2021 09:33:20 -0400 (EDT) Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDFE960FDA; Tue, 10 Aug 2021 13:33:19 +0000 (UTC) Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mDRsb-0044Ei-UE; Tue, 10 Aug 2021 14:33:18 +0100 MIME-Version: 1.0 Date: Tue, 10 Aug 2021 14:33:17 +0100 From: Marc Zyngier To: Anshuman Khandual Subject: Re: [PATCH 1/5] KVM: arm64: Drop direct PAGE_[SHIFT|SIZE] usage as page size In-Reply-To: <1628578961-29097-2-git-send-email-anshuman.khandual@arm.com> References: <1628578961-29097-1-git-send-email-anshuman.khandual@arm.com> <1628578961-29097-2-git-send-email-anshuman.khandual@arm.com> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <25ee7799069492f2501003faec7f9732@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: anshuman.khandual@arm.com, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Cc: Will Deacon , linux-kernel@vger.kernel.org, Catalin Marinas , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On 2021-08-10 08:02, Anshuman Khandual wrote: > All instances here could just directly test against > CONFIG_ARM64_XXK_PAGES > instead of evaluating via PAGE_SHIFT or PAGE_SIZE. With this change, > there > will be no such usage left. > > Cc: Marc Zyngier > Cc: James Morse > Cc: Alexandru Elisei > Cc: Suzuki K Poulose > Cc: Catalin Marinas > Cc: Will Deacon > Cc: linux-arm-kernel@lists.infradead.org > Cc: kvmarm@lists.cs.columbia.edu > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual > --- > arch/arm64/kvm/hyp/pgtable.c | 6 +++--- > arch/arm64/mm/mmu.c | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/pgtable.c > b/arch/arm64/kvm/hyp/pgtable.c > index 05321f4165e3..a6112b6d6ef6 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -85,7 +85,7 @@ static bool kvm_level_supports_block_mapping(u32 > level) > * Reject invalid block mappings and don't bother with 4TB mappings > for > * 52-bit PAs. > */ > - return !(level == 0 || (PAGE_SIZE != SZ_4K && level == 1)); > + return !(level == 0 || (!IS_ENABLED(CONFIG_ARM64_4K_PAGES) && level > == 1)); > } > > static bool kvm_block_mapping_supported(u64 addr, u64 end, u64 phys, > u32 level) > @@ -155,7 +155,7 @@ static u64 kvm_pte_to_phys(kvm_pte_t pte) > { > u64 pa = pte & KVM_PTE_ADDR_MASK; > > - if (PAGE_SHIFT == 16) > + if (IS_ENABLED(CONFIG_ARM64_64K_PAGES)) > pa |= FIELD_GET(KVM_PTE_ADDR_51_48, pte) << 48; > > return pa; > @@ -165,7 +165,7 @@ static kvm_pte_t kvm_phys_to_pte(u64 pa) > { > kvm_pte_t pte = pa & KVM_PTE_ADDR_MASK; > > - if (PAGE_SHIFT == 16) > + if (IS_ENABLED(CONFIG_ARM64_64K_PAGES)) > pte |= FIELD_PREP(KVM_PTE_ADDR_51_48, pa >> 48); > > return pte; > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index 9ff0de1b2b93..8fdfca179815 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -296,7 +296,7 @@ static void alloc_init_cont_pmd(pud_t *pudp, > unsigned long addr, > static inline bool use_1G_block(unsigned long addr, unsigned long > next, > unsigned long phys) > { > - if (PAGE_SHIFT != 12) > + if (!IS_ENABLED(CONFIG_ARM64_4K_PAGES)) > return false; > > if (((addr | next | phys) & ~PUD_MASK) != 0) I personally find it a lot less readable. Also, there is no evaluation whatsoever. All the code guarded by a PAGE_SIZE/PAGE_SHIFT that doesn't match the configuration is dropped at compile time. Thanks, M. -- Jazz is not dead. It just smells funny... _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-14.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 677ABC4338F for ; Tue, 10 Aug 2021 13:37:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 2E6FA61008 for ; Tue, 10 Aug 2021 13:37:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2E6FA61008 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:Cc:To:From :Date:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NV+wWQBCuvE1JScH3LMopa7gRRcrq/+yT8GV4Nauj84=; b=Zm8D4ZtAUg8nf60frtQR3zhodJ SMCk9BI4ldi+XRAGCPW3QprW7OI7gm6qlWBJhjJXWBb/zFgmA/r5prXyL8gaxN6HDoAA02MhTT6W/ AJXyd+JMDxNMjuPrikv2d2WY5xl3q9PfZGXye/Ty9YJWIkxWyv8QWXnxa/CRn07ov3dWDGeh4Jr43 FQIdiFkrSZiDsW6uKAid8PEyX2Fg99cZmfpKkhHuyih7ROcE7wJFr+e4Q9tpRKLAbxYWSkGzxJwz6 JVbsi6TKdk9QygDAUhJhFuvKzNqEfnMiyZ74nHWkb99STZez+aq3ynMaJaKqfhtKsKTY6tU7xPRj0 eHUoi1iQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDRsl-003zXw-2a; Tue, 10 Aug 2021 13:33:27 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDRse-003zWQ-7Q for linux-arm-kernel@lists.infradead.org; Tue, 10 Aug 2021 13:33:21 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDFE960FDA; Tue, 10 Aug 2021 13:33:19 +0000 (UTC) Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mDRsb-0044Ei-UE; Tue, 10 Aug 2021 14:33:18 +0100 MIME-Version: 1.0 Date: Tue, 10 Aug 2021 14:33:17 +0100 From: Marc Zyngier To: Anshuman Khandual Cc: linux-arm-kernel@lists.infradead.org, James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/5] KVM: arm64: Drop direct PAGE_[SHIFT|SIZE] usage as page size In-Reply-To: <1628578961-29097-2-git-send-email-anshuman.khandual@arm.com> References: <1628578961-29097-1-git-send-email-anshuman.khandual@arm.com> <1628578961-29097-2-git-send-email-anshuman.khandual@arm.com> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <25ee7799069492f2501003faec7f9732@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: anshuman.khandual@arm.com, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210810_063320_364430_8C84F77E X-CRM114-Status: GOOD ( 20.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2021-08-10 08:02, Anshuman Khandual wrote: > All instances here could just directly test against > CONFIG_ARM64_XXK_PAGES > instead of evaluating via PAGE_SHIFT or PAGE_SIZE. With this change, > there > will be no such usage left. > > Cc: Marc Zyngier > Cc: James Morse > Cc: Alexandru Elisei > Cc: Suzuki K Poulose > Cc: Catalin Marinas > Cc: Will Deacon > Cc: linux-arm-kernel@lists.infradead.org > Cc: kvmarm@lists.cs.columbia.edu > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual > --- > arch/arm64/kvm/hyp/pgtable.c | 6 +++--- > arch/arm64/mm/mmu.c | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/pgtable.c > b/arch/arm64/kvm/hyp/pgtable.c > index 05321f4165e3..a6112b6d6ef6 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -85,7 +85,7 @@ static bool kvm_level_supports_block_mapping(u32 > level) > * Reject invalid block mappings and don't bother with 4TB mappings > for > * 52-bit PAs. > */ > - return !(level == 0 || (PAGE_SIZE != SZ_4K && level == 1)); > + return !(level == 0 || (!IS_ENABLED(CONFIG_ARM64_4K_PAGES) && level > == 1)); > } > > static bool kvm_block_mapping_supported(u64 addr, u64 end, u64 phys, > u32 level) > @@ -155,7 +155,7 @@ static u64 kvm_pte_to_phys(kvm_pte_t pte) > { > u64 pa = pte & KVM_PTE_ADDR_MASK; > > - if (PAGE_SHIFT == 16) > + if (IS_ENABLED(CONFIG_ARM64_64K_PAGES)) > pa |= FIELD_GET(KVM_PTE_ADDR_51_48, pte) << 48; > > return pa; > @@ -165,7 +165,7 @@ static kvm_pte_t kvm_phys_to_pte(u64 pa) > { > kvm_pte_t pte = pa & KVM_PTE_ADDR_MASK; > > - if (PAGE_SHIFT == 16) > + if (IS_ENABLED(CONFIG_ARM64_64K_PAGES)) > pte |= FIELD_PREP(KVM_PTE_ADDR_51_48, pa >> 48); > > return pte; > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index 9ff0de1b2b93..8fdfca179815 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -296,7 +296,7 @@ static void alloc_init_cont_pmd(pud_t *pudp, > unsigned long addr, > static inline bool use_1G_block(unsigned long addr, unsigned long > next, > unsigned long phys) > { > - if (PAGE_SHIFT != 12) > + if (!IS_ENABLED(CONFIG_ARM64_4K_PAGES)) > return false; > > if (((addr | next | phys) & ~PUD_MASK) != 0) I personally find it a lot less readable. Also, there is no evaluation whatsoever. All the code guarded by a PAGE_SIZE/PAGE_SHIFT that doesn't match the configuration is dropped at compile time. Thanks, M. -- Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-14.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 80A2AC4338F for ; Tue, 10 Aug 2021 13:33:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 516B060F41 for ; Tue, 10 Aug 2021 13:33:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241455AbhHJNdn (ORCPT ); Tue, 10 Aug 2021 09:33:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:47572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235623AbhHJNdl (ORCPT ); Tue, 10 Aug 2021 09:33:41 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDFE960FDA; Tue, 10 Aug 2021 13:33:19 +0000 (UTC) Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mDRsb-0044Ei-UE; Tue, 10 Aug 2021 14:33:18 +0100 MIME-Version: 1.0 Date: Tue, 10 Aug 2021 14:33:17 +0100 From: Marc Zyngier To: Anshuman Khandual Cc: linux-arm-kernel@lists.infradead.org, James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/5] KVM: arm64: Drop direct PAGE_[SHIFT|SIZE] usage as page size In-Reply-To: <1628578961-29097-2-git-send-email-anshuman.khandual@arm.com> References: <1628578961-29097-1-git-send-email-anshuman.khandual@arm.com> <1628578961-29097-2-git-send-email-anshuman.khandual@arm.com> User-Agent: Roundcube Webmail/1.4.11 Message-ID: <25ee7799069492f2501003faec7f9732@kernel.org> X-Sender: maz@kernel.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: anshuman.khandual@arm.com, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021-08-10 08:02, Anshuman Khandual wrote: > All instances here could just directly test against > CONFIG_ARM64_XXK_PAGES > instead of evaluating via PAGE_SHIFT or PAGE_SIZE. With this change, > there > will be no such usage left. > > Cc: Marc Zyngier > Cc: James Morse > Cc: Alexandru Elisei > Cc: Suzuki K Poulose > Cc: Catalin Marinas > Cc: Will Deacon > Cc: linux-arm-kernel@lists.infradead.org > Cc: kvmarm@lists.cs.columbia.edu > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual > --- > arch/arm64/kvm/hyp/pgtable.c | 6 +++--- > arch/arm64/mm/mmu.c | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/pgtable.c > b/arch/arm64/kvm/hyp/pgtable.c > index 05321f4165e3..a6112b6d6ef6 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -85,7 +85,7 @@ static bool kvm_level_supports_block_mapping(u32 > level) > * Reject invalid block mappings and don't bother with 4TB mappings > for > * 52-bit PAs. > */ > - return !(level == 0 || (PAGE_SIZE != SZ_4K && level == 1)); > + return !(level == 0 || (!IS_ENABLED(CONFIG_ARM64_4K_PAGES) && level > == 1)); > } > > static bool kvm_block_mapping_supported(u64 addr, u64 end, u64 phys, > u32 level) > @@ -155,7 +155,7 @@ static u64 kvm_pte_to_phys(kvm_pte_t pte) > { > u64 pa = pte & KVM_PTE_ADDR_MASK; > > - if (PAGE_SHIFT == 16) > + if (IS_ENABLED(CONFIG_ARM64_64K_PAGES)) > pa |= FIELD_GET(KVM_PTE_ADDR_51_48, pte) << 48; > > return pa; > @@ -165,7 +165,7 @@ static kvm_pte_t kvm_phys_to_pte(u64 pa) > { > kvm_pte_t pte = pa & KVM_PTE_ADDR_MASK; > > - if (PAGE_SHIFT == 16) > + if (IS_ENABLED(CONFIG_ARM64_64K_PAGES)) > pte |= FIELD_PREP(KVM_PTE_ADDR_51_48, pa >> 48); > > return pte; > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index 9ff0de1b2b93..8fdfca179815 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -296,7 +296,7 @@ static void alloc_init_cont_pmd(pud_t *pudp, > unsigned long addr, > static inline bool use_1G_block(unsigned long addr, unsigned long > next, > unsigned long phys) > { > - if (PAGE_SHIFT != 12) > + if (!IS_ENABLED(CONFIG_ARM64_4K_PAGES)) > return false; > > if (((addr | next | phys) & ~PUD_MASK) != 0) I personally find it a lot less readable. Also, there is no evaluation whatsoever. All the code guarded by a PAGE_SIZE/PAGE_SHIFT that doesn't match the configuration is dropped at compile time. Thanks, M. -- Jazz is not dead. It just smells funny...