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,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT 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 3C988C4338F for ; Tue, 10 Aug 2021 07:05:25 +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 0451860EE7 for ; Tue, 10 Aug 2021 07:05:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0451860EE7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com 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-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HWDcRW7K4ye+EWXshG7buihCKr3Ubcy1dd3i14cWpTg=; b=rHocbgVmTXy6ii dk9VusyI1sXGjGAC8ZBDL/bXwFTj5CqojeqwJ7XPEqe/lc3uq04dEUL0jvCIyYkQBlLPuCLhua6y7 RPInOQFLbMPjBCiYnulaPtW4FPrIB59f0QDJ/Hka0BA/XRmv5GEYXK7ZIHXTho1HvAxB5KgnXolaJ RlwY+IwfXcQW9b6CBEJmkPUcalN2mdRyd7B1jLG9D87YEZBIRsmIcwTLxsdVmZ+BrpvG/RW9YokOm NYxiz8sk3i4GiyOeQJY+sLDM2PW80HEaspn5D20RPiKOSB1AV2l8MJQhhLHNQHELjJJ2DoS6QHEbA 3mfDexKf3p9jwK0jaMhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDLmH-002gmw-NX; Tue, 10 Aug 2021 07:02:21 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDLm3-002gjS-IA for linux-arm-kernel@lists.infradead.org; Tue, 10 Aug 2021 07:02:09 +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 D39AB1042; Tue, 10 Aug 2021 00:02:06 -0700 (PDT) Received: from p8cg001049571a15.arm.com (unknown [10.163.67.89]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 76C913F718; Tue, 10 Aug 2021 00:02:03 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Cc: Anshuman Khandual , Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] KVM: arm64: Drop direct PAGE_[SHIFT|SIZE] usage as page size Date: Tue, 10 Aug 2021 12:32:37 +0530 Message-Id: <1628578961-29097-2-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1628578961-29097-1-git-send-email-anshuman.khandual@arm.com> References: <1628578961-29097-1-git-send-email-anshuman.khandual@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210810_000207_687454_B26D761A X-CRM114-Status: GOOD ( 10.90 ) 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: , MIME-Version: 1.0 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 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) -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel