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.6 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 3A820C433E2 for ; Tue, 1 Sep 2020 17:08:38 +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 03F8F206FA for ; Tue, 1 Sep 2020 17:08:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="wTWFpDSC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03F8F206FA 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:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=scakGj92jvm17Ui+ItxOohobpm9aSFwLaeZIMn4c9XA=; b=wTWFpDSCjD1pSqbbswHCQbgHU WTsx9js4vO01WdZ7G9loFnU9tpbAvuHCtkuTUWVJob7/M2d06S/xFpPwS9YOM0bOtXbO13z4PufmC xpv7FO/2sXrrpm+sdO6HYiPc82wQRvbhigpu0PeWfbiUTEd52B7xwZBhkxDr9YBnccu7MSDwumaA6 HX2J2kFro5v9RkjdI9+VqBbB0x2L3qsCjMdDbV8k9THNJQc/hKXu0Qt2pjEt/Zj/QAY3t8Fieba/J IBTGdOJ4/1mTZseMeKa65S94xET+XLFvQBsJUPDO+F7a/2vxhR7ekpQqdEGNB1Xtw5EJ5D6JFXFls USTUrtMpw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kD9kS-00029G-B1; Tue, 01 Sep 2020 17:07:08 +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 1kD9kO-00028g-QB for linux-arm-kernel@lists.infradead.org; Tue, 01 Sep 2020 17:07:05 +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 D7B9E1FB; Tue, 1 Sep 2020 10:07:03 -0700 (PDT) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 131503F71F; Tue, 1 Sep 2020 10:07:02 -0700 (PDT) Subject: Re: [PATCH v3 07/21] KVM: arm64: Convert kvm_phys_addr_ioremap() to generic page-table API To: Will Deacon , kvmarm@lists.cs.columbia.edu References: <20200825093953.26493-1-will@kernel.org> <20200825093953.26493-8-will@kernel.org> From: Alexandru Elisei Message-ID: Date: Tue, 1 Sep 2020 18:08:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200825093953.26493-8-will@kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200901_130704_954463_994D36FF X-CRM114-Status: GOOD ( 27.29 ) 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: Marc Zyngier , kernel-team@android.com, linux-arm-kernel@lists.infradead.org, Catalin Marinas 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 Will, The patch looks correct to me. I also had another look at the pre-order visitor for kvm_pgtable_stage2_map, and it will not try to map the address range using a block mapping (kvm_block_mapping_supported returns false). One nitpick below. On 8/25/20 10:39 AM, Will Deacon wrote: > Convert kvm_phys_addr_ioremap() to use kvm_pgtable_stage2_map() instead > of stage2_set_pte(). > > Cc: Marc Zyngier > Cc: Quentin Perret > Signed-off-by: Will Deacon > --- > arch/arm64/kvm/hyp/pgtable.c | 14 +------------- > arch/arm64/kvm/mmu.c | 29 ++++++++++++----------------- > 2 files changed, 13 insertions(+), 30 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > index 41ee8f3c0369..6f65d3841ec9 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -439,18 +439,6 @@ struct stage2_map_data { > struct kvm_mmu_memory_cache *memcache; > }; > > -static kvm_pte_t *stage2_memcache_alloc_page(struct stage2_map_data *data) > -{ > - kvm_pte_t *ptep = NULL; > - struct kvm_mmu_memory_cache *mc = data->memcache; > - > - /* Allocated with GFP_PGTABLE_USER, so no need to zero */ > - if (mc && mc->nobjs) > - ptep = mc->objects[--mc->nobjs]; > - > - return ptep; > -} > - > static int stage2_map_set_prot_attr(enum kvm_pgtable_prot prot, > struct stage2_map_data *data) > { > @@ -531,7 +519,7 @@ static int stage2_map_walk_leaf(u64 addr, u64 end, u32 level, kvm_pte_t *ptep, > if (WARN_ON(level == KVM_PGTABLE_MAX_LEVELS - 1)) > return -EINVAL; > > - childp = stage2_memcache_alloc_page(data); > + childp = kvm_mmu_memory_cache_alloc(data->memcache); I think this hunk and the above could have been squashed in the previous patch, I think we could have used kvm_mmu_memory_cache_alloc directly from the start. Thanks, Alex > if (!childp) > return -ENOMEM; > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 4607e9ca60a2..33146d3dc93a 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -1154,35 +1154,30 @@ static int stage2_pudp_test_and_clear_young(pud_t *pud) > int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, > phys_addr_t pa, unsigned long size, bool writable) > { > - phys_addr_t addr, end; > + phys_addr_t addr; > int ret = 0; > - unsigned long pfn; > struct kvm_mmu_memory_cache cache = { 0, __GFP_ZERO, NULL, }; > + struct kvm_pgtable *pgt = kvm->arch.mmu.pgt; > + enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_DEVICE | > + KVM_PGTABLE_PROT_R | > + (writable ? KVM_PGTABLE_PROT_W : 0); > > - end = (guest_ipa + size + PAGE_SIZE - 1) & PAGE_MASK; > - pfn = __phys_to_pfn(pa); > - > - for (addr = guest_ipa; addr < end; addr += PAGE_SIZE) { > - pte_t pte = kvm_pfn_pte(pfn, PAGE_S2_DEVICE); > - > - if (writable) > - pte = kvm_s2pte_mkwrite(pte); > - > + for (addr = guest_ipa; addr < guest_ipa + size; addr += PAGE_SIZE) { > ret = kvm_mmu_topup_memory_cache(&cache, > kvm_mmu_cache_min_pages(kvm)); > if (ret) > - goto out; > + break; > + > spin_lock(&kvm->mmu_lock); > - ret = stage2_set_pte(&kvm->arch.mmu, &cache, addr, &pte, > - KVM_S2PTE_FLAG_IS_IOMAP); > + ret = kvm_pgtable_stage2_map(pgt, addr, PAGE_SIZE, pa, prot, > + &cache); > spin_unlock(&kvm->mmu_lock); > if (ret) > - goto out; > + break; > > - pfn++; > + pa += PAGE_SIZE; > } > > -out: > kvm_mmu_free_memory_cache(&cache); > return ret; > } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel