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.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, 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 9AD13C4338F for ; Tue, 10 Aug 2021 04:59:37 +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 5E5C960C3E for ; Tue, 10 Aug 2021 04:59:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5E5C960C3E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gcVWwynIF7sZdr6qKrqa0tbx+l6juApM2hOo3bYfQOk=; b=ja5wmtKnYqbjXQ zFVJsvfGvc77+OXm8cdo4sNGKtoxtN8BHdWsXLjnZTtLfCJQtRuUQIfNTHCtCX7yi+EqOsXDDcZ6m Z9hEtQ4bVdp7mymv8G7jrTi2HRJUF5FcAVD+Wxw0XZI3H9Lzd1/gNYHAT7FEce9Py4ZLQxt4FQLuH mrEcTbtmwQSfdFlZyk8k+E46f8EPpsIa96hAn/oZjnzHM67zZB8GVppQZIt+OJHbyhPSdz4uYkw3y Gt16lANLw97foRHFb+3UKPwO6K+bUue0t7BrIweYjr3Cm5NB3ed9KOKLChHnNHTPBsncMynYup3X/ Hw2SWnXlzQUjBONaS1aA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDJou-002TRa-Bs; Tue, 10 Aug 2021 04:56:56 +0000 Received: from mail-ot1-x330.google.com ([2607:f8b0:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mDJon-002TPG-PH for linux-arm-kernel@lists.infradead.org; Tue, 10 Aug 2021 04:56:54 +0000 Received: by mail-ot1-x330.google.com with SMTP id d10-20020a9d4f0a0000b02904f51c5004e3so16327089otl.9 for ; Mon, 09 Aug 2021 21:56:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mxeliMxH5RLFkPOnb9VsFpY7z4s/EY26/y2zKcYFTKM=; b=bVgvBw5b7c+dnqH9Mqa8QCUVGtdlkSzsJdLu8tgceEC8aichoBtE9PmOu7p2DgHM/b Kg3vuLFLb8vLj2+1Uy5FN/4DASs1PxiRhu3EwFF/6FQDKASEhmcdz9yTTSGvH4NbmizX pVd6NBGKtdNZbROLtLmKdHU7uYasf6BWB0RZf85go1IgfV3Od2wkYyFTGOHg5RvSNmDs ABT95AgjkumKr5rgI78ZQr7ONkZwHeX5V5aUn4IV+ZmzafkNsOszHE4lgKZRsySe5qqP Vx8zx5mPT6nLUfgEGyNsDWQcWtkgpaLTePlxsMAIS++oDe/4mutz19DbGmQLmhn22LYb qdmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mxeliMxH5RLFkPOnb9VsFpY7z4s/EY26/y2zKcYFTKM=; b=SPLLMewYinSOYKSrZpE/WyqAZGrl4W4vFEg/nOA/+epjiXpACG8I+uLDZqjAM9rb7+ bFeG1p+T+Y9GV5S+u3GVSvNJzzoPRGIpYuljT8Dgh0vd1ko4laVCnR2RLZWAv/AXKoWB jQTa4uBFrAbix3DHQ5CKUPjNsI25Hhihwxq2WS8CRqPkmnS/MORm8KspoowWW67N2bL9 yhmCbpK2KOF8aBSNrZzCxXOgrgTLso2lrn0xlqnC3mSh7cW3or+EtuRepF6x9WA4UWdx IfmnCVO8ygj9DJ4AnuY5nxfYNIRYYoELAQ8H/rIG/zWruNLySzXb4nkYA7dzXn6sL5/Y yW3g== X-Gm-Message-State: AOAM530HJ0a+adbbNfD+VkHZs+lCuJzbrUTyVBaoP+dgG4ytucMemiL5 021rc+u9e/CnIh5GIGlqco74R+5CTUJdVn2tv5HMsg== X-Google-Smtp-Source: ABdhPJxj6p0KnGyA4aW6SVCeVdmvEmXsuvlbMJKaWVWtf3r2Eo7FyUh+gAsfwiu9BiPHdssNSgxFG1JxZLzy2B1wzSc= X-Received: by 2002:a9d:7359:: with SMTP id l25mr1020479otk.52.1628571408731; Mon, 09 Aug 2021 21:56:48 -0700 (PDT) MIME-Version: 1.0 References: <20210809152448.1810400-1-qperret@google.com> <20210809152448.1810400-6-qperret@google.com> In-Reply-To: <20210809152448.1810400-6-qperret@google.com> From: Fuad Tabba Date: Tue, 10 Aug 2021 06:56:12 +0200 Message-ID: Subject: Re: [PATCH v4 05/21] KVM: arm64: Expose page-table helpers To: Quentin Perret Cc: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, ardb@kernel.org, qwandor@google.com, dbrazdil@google.com, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210809_215649_892445_C6B6F95F X-CRM114-Status: GOOD ( 23.91 ) 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-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 Hi Quentin, On Mon, Aug 9, 2021 at 5:25 PM Quentin Perret wrote: > > The KVM pgtable API exposes the kvm_pgtable_walk() function to allow > the definition of walkers outside of pgtable.c. However, it is not easy > to implement any of those walkers without some of the low-level helpers. > Move some of them to the header file to allow re-use from other places. > > Signed-off-by: Quentin Perret Reviewed-by: Fuad Tabba Thanks, /fuad > --- > arch/arm64/include/asm/kvm_pgtable.h | 40 ++++++++++++++++++++++++++++ > arch/arm64/kvm/hyp/pgtable.c | 39 --------------------------- > 2 files changed, 40 insertions(+), 39 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h > index 082b9d65f40b..6938eac72c1f 100644 > --- a/arch/arm64/include/asm/kvm_pgtable.h > +++ b/arch/arm64/include/asm/kvm_pgtable.h > @@ -25,6 +25,46 @@ static inline u64 kvm_get_parange(u64 mmfr0) > > typedef u64 kvm_pte_t; > > +#define KVM_PTE_VALID BIT(0) > + > +#define KVM_PTE_ADDR_MASK GENMASK(47, PAGE_SHIFT) > +#define KVM_PTE_ADDR_51_48 GENMASK(15, 12) > + > +static inline bool kvm_pte_valid(kvm_pte_t pte) > +{ > + return pte & KVM_PTE_VALID; > +} > + > +static inline u64 kvm_pte_to_phys(kvm_pte_t pte) > +{ > + u64 pa = pte & KVM_PTE_ADDR_MASK; > + > + if (PAGE_SHIFT == 16) > + pa |= FIELD_GET(KVM_PTE_ADDR_51_48, pte) << 48; > + > + return pa; > +} > + > +static inline u64 kvm_granule_shift(u32 level) > +{ > + /* Assumes KVM_PGTABLE_MAX_LEVELS is 4 */ > + return ARM64_HW_PGTABLE_LEVEL_SHIFT(level); > +} > + > +static inline u64 kvm_granule_size(u32 level) > +{ > + return BIT(kvm_granule_shift(level)); > +} > + > +static inline 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)); > +} > + > /** > * struct kvm_pgtable_mm_ops - Memory management callbacks. > * @zalloc_page: Allocate a single zeroed memory page. > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > index 78f36bd5df6c..49d768b92997 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -11,16 +11,12 @@ > #include > #include > > -#define KVM_PTE_VALID BIT(0) > > #define KVM_PTE_TYPE BIT(1) > #define KVM_PTE_TYPE_BLOCK 0 > #define KVM_PTE_TYPE_PAGE 1 > #define KVM_PTE_TYPE_TABLE 1 > > -#define KVM_PTE_ADDR_MASK GENMASK(47, PAGE_SHIFT) > -#define KVM_PTE_ADDR_51_48 GENMASK(15, 12) > - > #define KVM_PTE_LEAF_ATTR_LO GENMASK(11, 2) > > #define KVM_PTE_LEAF_ATTR_LO_S1_ATTRIDX GENMASK(4, 2) > @@ -61,17 +57,6 @@ struct kvm_pgtable_walk_data { > u64 end; > }; > > -static u64 kvm_granule_shift(u32 level) > -{ > - /* Assumes KVM_PGTABLE_MAX_LEVELS is 4 */ > - return ARM64_HW_PGTABLE_LEVEL_SHIFT(level); > -} > - > -static u64 kvm_granule_size(u32 level) > -{ > - return BIT(kvm_granule_shift(level)); > -} > - > #define KVM_PHYS_INVALID (-1ULL) > > static bool kvm_phys_is_valid(u64 phys) > @@ -79,15 +64,6 @@ static bool kvm_phys_is_valid(u64 phys) > return phys < BIT(id_aa64mmfr0_parange_to_phys_shift(ID_AA64MMFR0_PARANGE_MAX)); > } > > -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)); > -} > - > static bool kvm_block_mapping_supported(u64 addr, u64 end, u64 phys, u32 level) > { > u64 granule = kvm_granule_size(level); > @@ -135,11 +111,6 @@ static u32 kvm_pgd_pages(u32 ia_bits, u32 start_level) > return __kvm_pgd_page_idx(&pgt, -1ULL) + 1; > } > > -static bool kvm_pte_valid(kvm_pte_t pte) > -{ > - return pte & KVM_PTE_VALID; > -} > - > static bool kvm_pte_table(kvm_pte_t pte, u32 level) > { > if (level == KVM_PGTABLE_MAX_LEVELS - 1) > @@ -151,16 +122,6 @@ static bool kvm_pte_table(kvm_pte_t pte, u32 level) > return FIELD_GET(KVM_PTE_TYPE, pte) == KVM_PTE_TYPE_TABLE; > } > > -static u64 kvm_pte_to_phys(kvm_pte_t pte) > -{ > - u64 pa = pte & KVM_PTE_ADDR_MASK; > - > - if (PAGE_SHIFT == 16) > - pa |= FIELD_GET(KVM_PTE_ADDR_51_48, pte) << 48; > - > - return pa; > -} > - > static kvm_pte_t kvm_phys_to_pte(u64 pa) > { > kvm_pte_t pte = pa & KVM_PTE_ADDR_MASK; > -- > 2.32.0.605.g8dce9f2422-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel