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=-11.8 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 7A242C433E2 for ; Thu, 3 Sep 2020 04:38:46 +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 3BF6520716 for ; Thu, 3 Sep 2020 04:38:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dMMHle4F"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cuOfVMfY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3BF6520716 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=AWMkt1+2xMyGnb8/px6np4OlUpQArwxN2e/BosXXr7Y=; b=dMMHle4F+9dVW3 63Yzl3MjgwsBTtMFNC4bBCNu+mVX7V58DrFdmdS1ofkUxuMu47/r2F8iC1LmjhvANkISffTez15pO xWOFMlRL0eHmjVlzCi3VoTbQBpeeOyUnz0iT3/kcfy3eGuSHV09UxAgit5tvbQ1cMVdPM/FczVv7L cb+VMdERVmualHjWSF3MxVx6ymkbp6yZT45wntPbXH+r1nVALiWCOKKnlARw3fK1HpqfNGWe+C0ZF aKOZQsffYxOOP+F4IqPJSR9jmJSP0OCfOwtquQhEos0m0uvUvXVdEy929D4enOWG4Vb2xabkfQEsm 7SXwx18fRlxGfHu6vuRA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDh04-00046w-RC; Thu, 03 Sep 2020 04:37:28 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDh02-00046W-Ku for linux-arm-kernel@lists.infradead.org; Thu, 03 Sep 2020 04:37:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599107845; 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=S68/9hVCwulCuaMk9J3W2zX+S4GaU7CGv+1Yli5RMGo=; b=cuOfVMfYw2PM7HeL3NC7yWaBfjJtFRdas4d5NQhsnDEFHqz5bNHs99g0/1OtoKwc6DmWA1 EPJk+PkmLZYqDxacQIAf0M5IVDX4Vj5GlepNlUG3ITUZdX96QDVg50g1GX3y24T0bojozv o9tUqqZwi42B25sglftgj5Xd23Qsoo8= 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-527-jX7D0PapO6G9-R_sUSd8TQ-1; Thu, 03 Sep 2020 00:37:24 -0400 X-MC-Unique: jX7D0PapO6G9-R_sUSd8TQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3FFA418B9ECA; Thu, 3 Sep 2020 04:37:22 +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 1718860C0F; Thu, 3 Sep 2020 04:37:19 +0000 (UTC) Subject: Re: [PATCH v3 11/21] KVM: arm64: Convert page-aging and access faults to generic page-table API To: Will Deacon , kvmarm@lists.cs.columbia.edu References: <20200825093953.26493-1-will@kernel.org> <20200825093953.26493-12-will@kernel.org> From: Gavin Shan Message-ID: <10da8311-1b80-dd1b-1a30-6e3aebc0f196@redhat.com> Date: Thu, 3 Sep 2020 14:37:17 +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-12-will@kernel.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-20200903_003726_729971_5F43FBA4 X-CRM114-Status: GOOD ( 24.71 ) 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 Hi Will, On 8/25/20 7:39 PM, Will Deacon wrote: > Convert the page-aging functions and access fault handler to use the > generic page-table code instead of walking the page-table directly. > > Cc: Marc Zyngier > Cc: Quentin Perret > Signed-off-by: Will Deacon > --- > arch/arm64/kvm/mmu.c | 74 ++++++++++---------------------------------- > 1 file changed, 16 insertions(+), 58 deletions(-) > Reviewed-by: Gavin Shan > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 751ce2462765..d3db8e00ce0a 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -1698,46 +1698,23 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > return ret; > } > > -/* > - * Resolve the access fault by making the page young again. > - * Note that because the faulting entry is guaranteed not to be > - * cached in the TLB, we don't need to invalidate anything. > - * Only the HW Access Flag updates are supported for Stage 2 (no DBM), > - * so there is no need for atomic (pte|pmd)_mkyoung operations. > - */ > +/* Resolve the access fault by making the page young again. */ > static void handle_access_fault(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa) > { > - pud_t *pud; > - pmd_t *pmd; > - pte_t *pte; > - kvm_pfn_t pfn; > - bool pfn_valid = false; > + pte_t pte; > + kvm_pte_t kpte; > + struct kvm_s2_mmu *mmu; > > trace_kvm_access_fault(fault_ipa); > > spin_lock(&vcpu->kvm->mmu_lock); > - > - if (!stage2_get_leaf_entry(vcpu->arch.hw_mmu, fault_ipa, &pud, &pmd, &pte)) > - goto out; > - > - if (pud) { /* HugeTLB */ > - *pud = kvm_s2pud_mkyoung(*pud); > - pfn = kvm_pud_pfn(*pud); > - pfn_valid = true; > - } else if (pmd) { /* THP, HugeTLB */ > - *pmd = pmd_mkyoung(*pmd); > - pfn = pmd_pfn(*pmd); > - pfn_valid = true; > - } else { > - *pte = pte_mkyoung(*pte); /* Just a page... */ > - pfn = pte_pfn(*pte); > - pfn_valid = true; > - } > - > -out: > + mmu = vcpu->arch.hw_mmu; > + kpte = kvm_pgtable_stage2_mkyoung(mmu->pgt, fault_ipa); > spin_unlock(&vcpu->kvm->mmu_lock); > - if (pfn_valid) > - kvm_set_pfn_accessed(pfn); > + > + pte = __pte(kpte); > + if (pte_valid(pte)) > + kvm_set_pfn_accessed(pte_pfn(pte)); > } > > /** > @@ -1954,38 +1931,19 @@ int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) > > static int kvm_age_hva_handler(struct kvm *kvm, gpa_t gpa, u64 size, void *data) > { > - pud_t *pud; > - pmd_t *pmd; > - pte_t *pte; > + pte_t pte; > + kvm_pte_t kpte; > > WARN_ON(size != PAGE_SIZE && size != PMD_SIZE && size != PUD_SIZE); > - if (!stage2_get_leaf_entry(&kvm->arch.mmu, gpa, &pud, &pmd, &pte)) > - return 0; > - > - if (pud) > - return stage2_pudp_test_and_clear_young(pud); > - else if (pmd) > - return stage2_pmdp_test_and_clear_young(pmd); > - else > - return stage2_ptep_test_and_clear_young(pte); > + kpte = kvm_pgtable_stage2_mkold(kvm->arch.mmu.pgt, gpa); > + pte = __pte(kpte); > + return pte_valid(pte) && pte_young(pte); > } > > static int kvm_test_age_hva_handler(struct kvm *kvm, gpa_t gpa, u64 size, void *data) > { > - pud_t *pud; > - pmd_t *pmd; > - pte_t *pte; > - > WARN_ON(size != PAGE_SIZE && size != PMD_SIZE && size != PUD_SIZE); > - if (!stage2_get_leaf_entry(&kvm->arch.mmu, gpa, &pud, &pmd, &pte)) > - return 0; > - > - if (pud) > - return kvm_s2pud_young(*pud); > - else if (pmd) > - return pmd_young(*pmd); > - else > - return pte_young(*pte); > + return kvm_pgtable_stage2_is_young(kvm->arch.mmu.pgt, gpa); > } > > int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end) > Thanks, Gavin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel