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=-9.0 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, UNWANTED_LANGUAGE_BODY,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 C602EC433E2 for ; Thu, 3 Sep 2020 03:59:23 +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 90F4420716 for ; Thu, 3 Sep 2020 03:59:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ebVAq4uH"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eBRVLeTj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 90F4420716 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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-Type: Content-Transfer-Encoding:Cc:Reply-To:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AbGSMHpsUF87TRdrDE9PJZh8hp7Cep9hUGG7OTl5XbU=; b=ebVAq4uHfVzEJB KEtKUP6yC51hre755P1sjgyvE5tAbfHLksRRIQN3gOqirgAM82qbUqBHvHjEgIMFPsOh7jVFoPyzg Ye5LXl/nGpTT4KEqbc6vjjlmlddzFhUPbCnooenb3ZkekChvAzDoYhvNFKgsy8dtYKFJdAU2xW1Rw zPSi+uKaseoOsQfRMBg3ilLmieZOPZsXOEMZpBHNy4rpkBJLZut/uTTBWP3xkuMv915pSaaY7jahU 297inhTwR7mgtKT2HCxnCbvljSdXFdr+v0qQLkY5PkryBJPTfKiF58laurpeeKChE7hOQSXS2fy4P bRYBz8SVzq9yczSsnudQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDgO1-0001Um-BN; Thu, 03 Sep 2020 03:58:09 +0000 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120] helo=us-smtp-1.mimecast.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDgNz-0001UN-It for linux-arm-kernel@lists.infradead.org; Thu, 03 Sep 2020 03:58:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599105486; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YCdi2zrJcpqfRm+LNHjqqq/SWGwHguRwqUW57r1zgM0=; b=eBRVLeTjwqFdd/5uNGdzUDwCJ9UxEBahS4vecG8AN3+Nnph6bRNWqZl8pt6ZedaUUXyIGZ RhE6HVtcbd/vDUkzWJoSM1bHrKaDdQ4cRIXqQINQgR4vAk3K/A3IbULC9Xqhm7QPL1EBqg YAfL4UVsU7HPc9qVbgOI9u+MPq9+jPU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-505-PLneH7_DOUmEZfmdjJ3KIg-1; Wed, 02 Sep 2020 23:58:03 -0400 X-MC-Unique: PLneH7_DOUmEZfmdjJ3KIg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 807B01005E66; Thu, 3 Sep 2020 03:58:01 +0000 (UTC) Received: from [10.64.54.159] (vpn2-54-159.bne.redhat.com [10.64.54.159]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D1E717049D; Thu, 3 Sep 2020 03:57:58 +0000 (UTC) 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: Gavin Shan Message-ID: Date: Thu, 3 Sep 2020 13:57:56 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.0 MIME-Version: 1.0 In-Reply-To: <20200825093953.26493-8-will@kernel.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=gshan@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200902_235807_906760_09E80172 X-CRM114-Status: GOOD ( 23.10 ) 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: , Reply-To: Gavin Shan Cc: Suzuki Poulose , Marc Zyngier , Quentin Perret , James Morse , Catalin Marinas , kernel-team@android.com, linux-arm-kernel@lists.infradead.org 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 8/25/20 7:39 PM, 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(-) > Reviewed-by: Gavin Shan > 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); > 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