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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 B94EBC3B186 for ; Wed, 12 Feb 2020 12:01:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 904DB2073C for ; Wed, 12 Feb 2020 12:01:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VSE7yFHQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728428AbgBLMBA (ORCPT ); Wed, 12 Feb 2020 07:01:00 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:45662 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728252AbgBLMA7 (ORCPT ); Wed, 12 Feb 2020 07:00:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581508858; h=from:from: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=t5fKOSPBE8npqjvC4E7Sos0okp9RyOPPOUkKe29Zb9Y=; b=VSE7yFHQVUVoZ+WKYUQjEFh4W07g2Pm9UOSvx4x3gGbdzlZbkI8o0Rc5GHBzJLcg3JEfkF QxTWVbWPL0+kJrbFnsnMdQqK0pHI/SJcit5NWTBiVYmCdys0vosLikdTh4qa0iZcFnR99b m24L//Bcq1VmgJPyFYbjqVk+nUt2Y68= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-340-_5tXq_E5PbO2zkVUmnAtfw-1; Wed, 12 Feb 2020 07:00:56 -0500 X-MC-Unique: _5tXq_E5PbO2zkVUmnAtfw-1 Received: by mail-wm1-f70.google.com with SMTP id a189so636922wme.2 for ; Wed, 12 Feb 2020 04:00:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=t5fKOSPBE8npqjvC4E7Sos0okp9RyOPPOUkKe29Zb9Y=; b=rfgiZlljEWFLmCY6e89n+G4xCA/ZUQEe30cz1TUvLpEuX14hgCfdlGhaWBPRBpzeIb NYnvPgZNIeD40OTwz2Vx4qa9ZXLFxKPwXAr7K4qedDY6pN79kEbu7Uc4bZy2MsTRs1KL FPywQE4lHu8Y+HK70Qq4bPe0lr1SKFvnSXidcsHTjWiU1/YIGnOP0owb5HYjqnwdoctG JcPcmqNwWvVMg4sQRKdDLlayaVhPvTuvvoCtHgmBqOtAu3cNUQA3KdEJaBv4CEARA+OR 9tiTVAtMBjlwkgEwSlD4SHLV4Ewpz9Qno9C8LFJ37/IezKIyWiOytLmsNBLqGHS+KnS7 8qzg== X-Gm-Message-State: APjAAAUpHuyG3uBnC3b4WU55EMhM9PZ/65eH7s+ivTYSISKJkruhKoZc H/AE+uqUfO3DdM1rWWv0M8OqboSTb6re7ZRRnrq+Z3tkejgqxhAeFsIAviEIemdizdpWbjZoWbO YpzMRFwcUyv3a/33M0Vd1KX4/ X-Received: by 2002:adf:b352:: with SMTP id k18mr14637618wrd.242.1581508854961; Wed, 12 Feb 2020 04:00:54 -0800 (PST) X-Google-Smtp-Source: APXvYqxqKUKTK/LXZj659FKqEXgIuqLsOuUOLcQ0XyLeuBvUfrvCi4p4abJmqdOzVfUyB5pdBrR/lg== X-Received: by 2002:adf:b352:: with SMTP id k18mr14637580wrd.242.1581508854612; Wed, 12 Feb 2020 04:00:54 -0800 (PST) Received: from ?IPv6:2001:b07:6468:f312:652c:29a6:517b:66d9? ([2001:b07:6468:f312:652c:29a6:517b:66d9]) by smtp.gmail.com with ESMTPSA id u4sm370285wrt.37.2020.02.12.04.00.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Feb 2020 04:00:53 -0800 (PST) Subject: Re: [PATCH v2 6/7] KVM: x86/mmu: Rename kvm_mmu->get_cr3() to ->get_guest_cr3_or_eptp() To: Sean Christopherson Cc: Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org References: <20200207173747.6243-1-sean.j.christopherson@intel.com> <20200207173747.6243-7-sean.j.christopherson@intel.com> From: Paolo Bonzini Message-ID: <1424348b-7f09-513a-960b-6d15ac3a9ae4@redhat.com> Date: Wed, 12 Feb 2020 13:00:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20200207173747.6243-7-sean.j.christopherson@intel.com> Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/02/20 18:37, Sean Christopherson wrote: > Rename kvm_mmu->get_cr3() to call out that it is retrieving a guest > value, as opposed to kvm_mmu->set_cr3(), which sets a host value, and to > note that it will return L1's EPTP when nested EPT is in use. Hopefully > the new name will also make it more obvious that L1's nested_cr3 is > returned in SVM's nested NPT case. > > No functional change intended. Should we call it "get_pgd", since that is how Linux calls the top-level directory? I always get confused by PUD/PMD, but as long as we only keep one /p.d/ moniker it should be fine. Paolo > Signed-off-by: Sean Christopherson > --- > arch/x86/include/asm/kvm_host.h | 2 +- > arch/x86/kvm/mmu/mmu.c | 24 ++++++++++++------------ > arch/x86/kvm/mmu/paging_tmpl.h | 2 +- > arch/x86/kvm/svm.c | 10 +++++----- > arch/x86/kvm/vmx/nested.c | 8 ++++---- > arch/x86/kvm/x86.c | 2 +- > 6 files changed, 24 insertions(+), 24 deletions(-) > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h > index 4dffbc10d3f8..d3d69ad2e969 100644 > --- a/arch/x86/include/asm/kvm_host.h > +++ b/arch/x86/include/asm/kvm_host.h > @@ -383,7 +383,7 @@ struct kvm_mmu_root_info { > */ > struct kvm_mmu { > void (*set_cr3)(struct kvm_vcpu *vcpu, unsigned long root); > - unsigned long (*get_cr3)(struct kvm_vcpu *vcpu); > + unsigned long (*get_guest_cr3_or_eptp)(struct kvm_vcpu *vcpu); > u64 (*get_pdptr)(struct kvm_vcpu *vcpu, int index); > int (*page_fault)(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u32 err, > bool prefault); > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 70f67bcab7db..13df4b4a5649 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -3731,7 +3731,7 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu) > vcpu->arch.mmu->root_hpa = __pa(vcpu->arch.mmu->pae_root); > } else > BUG(); > - vcpu->arch.mmu->root_cr3 = vcpu->arch.mmu->get_cr3(vcpu); > + vcpu->arch.mmu->root_cr3 = vcpu->arch.mmu->get_guest_cr3_or_eptp(vcpu); > > return 0; > } > @@ -3743,7 +3743,7 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu) > gfn_t root_gfn, root_cr3; > int i; > > - root_cr3 = vcpu->arch.mmu->get_cr3(vcpu); > + root_cr3 = vcpu->arch.mmu->get_guest_cr3_or_eptp(vcpu); > root_gfn = root_cr3 >> PAGE_SHIFT; > > if (mmu_check_root(vcpu, root_gfn)) > @@ -4080,7 +4080,7 @@ static int kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, > arch.token = (vcpu->arch.apf.id++ << 12) | vcpu->vcpu_id; > arch.gfn = gfn; > arch.direct_map = vcpu->arch.mmu->direct_map; > - arch.cr3 = vcpu->arch.mmu->get_cr3(vcpu); > + arch.cr3 = vcpu->arch.mmu->get_guest_cr3_or_eptp(vcpu); > > return kvm_setup_async_pf(vcpu, cr2_or_gpa, > kvm_vcpu_gfn_to_hva(vcpu, gfn), &arch); > @@ -4932,7 +4932,7 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu) > context->shadow_root_level = kvm_x86_ops->get_tdp_level(vcpu); > context->direct_map = true; > context->set_cr3 = kvm_x86_ops->set_tdp_cr3; > - context->get_cr3 = get_cr3; > + context->get_guest_cr3_or_eptp = get_cr3; > context->get_pdptr = kvm_pdptr_read; > context->inject_page_fault = kvm_inject_page_fault; > > @@ -5080,10 +5080,10 @@ static void init_kvm_softmmu(struct kvm_vcpu *vcpu) > struct kvm_mmu *context = vcpu->arch.mmu; > > kvm_init_shadow_mmu(vcpu); > - context->set_cr3 = kvm_x86_ops->set_cr3; > - context->get_cr3 = get_cr3; > - context->get_pdptr = kvm_pdptr_read; > - context->inject_page_fault = kvm_inject_page_fault; > + context->set_cr3 = kvm_x86_ops->set_cr3; > + context->get_guest_cr3_or_eptp = get_cr3; > + context->get_pdptr = kvm_pdptr_read; > + context->inject_page_fault = kvm_inject_page_fault; > } > > static void init_kvm_nested_mmu(struct kvm_vcpu *vcpu) > @@ -5095,10 +5095,10 @@ static void init_kvm_nested_mmu(struct kvm_vcpu *vcpu) > if (new_role.as_u64 == g_context->mmu_role.as_u64) > return; > > - g_context->mmu_role.as_u64 = new_role.as_u64; > - g_context->get_cr3 = get_cr3; > - g_context->get_pdptr = kvm_pdptr_read; > - g_context->inject_page_fault = kvm_inject_page_fault; > + g_context->mmu_role.as_u64 = new_role.as_u64; > + g_context->get_guest_cr3_or_eptp = get_cr3; > + g_context->get_pdptr = kvm_pdptr_read; > + g_context->inject_page_fault = kvm_inject_page_fault; > > /* > * Note that arch.mmu->gva_to_gpa translates l2_gpa to l1_gpa using > diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h > index 6b15b58f3ecc..24dfa0fcba56 100644 > --- a/arch/x86/kvm/mmu/paging_tmpl.h > +++ b/arch/x86/kvm/mmu/paging_tmpl.h > @@ -333,7 +333,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker, > trace_kvm_mmu_pagetable_walk(addr, access); > retry_walk: > walker->level = mmu->root_level; > - pte = mmu->get_cr3(vcpu); > + pte = mmu->get_guest_cr3_or_eptp(vcpu); > have_ad = PT_HAVE_ACCESSED_DIRTY(mmu); > > #if PTTYPE == 64 > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c > index a3e32d61d60c..1e2f05a79417 100644 > --- a/arch/x86/kvm/svm.c > +++ b/arch/x86/kvm/svm.c > @@ -3026,11 +3026,11 @@ static void nested_svm_init_mmu_context(struct kvm_vcpu *vcpu) > > vcpu->arch.mmu = &vcpu->arch.guest_mmu; > kvm_init_shadow_mmu(vcpu); > - vcpu->arch.mmu->set_cr3 = nested_svm_set_tdp_cr3; > - vcpu->arch.mmu->get_cr3 = nested_svm_get_tdp_cr3; > - vcpu->arch.mmu->get_pdptr = nested_svm_get_tdp_pdptr; > - vcpu->arch.mmu->inject_page_fault = nested_svm_inject_npf_exit; > - vcpu->arch.mmu->shadow_root_level = get_npt_level(vcpu); > + vcpu->arch.mmu->set_cr3 = nested_svm_set_tdp_cr3; > + vcpu->arch.mmu->get_guest_cr3_or_eptp = nested_svm_get_tdp_cr3; > + vcpu->arch.mmu->get_pdptr = nested_svm_get_tdp_pdptr; > + vcpu->arch.mmu->inject_page_fault = nested_svm_inject_npf_exit; > + vcpu->arch.mmu->shadow_root_level = get_npt_level(vcpu); > reset_shadow_zero_bits_mask(vcpu, vcpu->arch.mmu); > vcpu->arch.walk_mmu = &vcpu->arch.nested_mmu; > } > diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c > index 4fb05c0e29fe..2d7b87b532f5 100644 > --- a/arch/x86/kvm/vmx/nested.c > +++ b/arch/x86/kvm/vmx/nested.c > @@ -354,10 +354,10 @@ static void nested_ept_init_mmu_context(struct kvm_vcpu *vcpu) > VMX_EPT_EXECUTE_ONLY_BIT, > nested_ept_ad_enabled(vcpu), > nested_ept_get_eptp(vcpu)); > - vcpu->arch.mmu->set_cr3 = vmx_set_cr3; > - vcpu->arch.mmu->get_cr3 = nested_ept_get_eptp; > - vcpu->arch.mmu->inject_page_fault = nested_ept_inject_page_fault; > - vcpu->arch.mmu->get_pdptr = kvm_pdptr_read; > + vcpu->arch.mmu->set_cr3 = vmx_set_cr3; > + vcpu->arch.mmu->get_guest_cr3_or_eptp = nested_ept_get_eptp; > + vcpu->arch.mmu->inject_page_fault = nested_ept_inject_page_fault; > + vcpu->arch.mmu->get_pdptr = kvm_pdptr_read; > > vcpu->arch.walk_mmu = &vcpu->arch.nested_mmu; > } > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index fbabb2f06273..1e6d8766fbdd 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -10179,7 +10179,7 @@ void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu, struct kvm_async_pf *work) > return; > > if (!vcpu->arch.mmu->direct_map && > - work->arch.cr3 != vcpu->arch.mmu->get_cr3(vcpu)) > + work->arch.cr3 != vcpu->arch.mmu->get_guest_cr3_or_eptp(vcpu)) > return; > > vcpu->arch.mmu->page_fault(vcpu, work->cr2_or_gpa, 0, true); >