From: David Matlack <dmatlack@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
seanjc@google.com, vkuznets@redhat.com
Subject: Re: [PATCH 23/23] KVM: MMU: replace direct_map with mmu_role.direct
Date: Mon, 7 Feb 2022 23:02:25 +0000 [thread overview]
Message-ID: <YgGlAbyLQGRUOlSG@google.com> (raw)
In-Reply-To: <20220204115718.14934-24-pbonzini@redhat.com>
On Fri, Feb 04, 2022 at 06:57:18AM -0500, Paolo Bonzini wrote:
> direct_map is always equal to the role's direct field:
>
> - for shadow paging, direct_map is true if CR0.PG=0 and mmu_role.direct is
> copied from cpu_role.base.direct
>
> - for TDP, it is always true and mmu_role.direct is also always true
>
> - for shadow EPT, it is always false and mmu_role.direct is also always
> false
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: David Matlack <dmatlack@google.com>
> ---
> arch/x86/include/asm/kvm_host.h | 1 -
> arch/x86/kvm/mmu/mmu.c | 30 ++++++++++++++----------------
> arch/x86/kvm/x86.c | 12 ++++++------
> 4 files changed, 21 insertions(+), 23 deletions(-)
>
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index c86a2beee92a..647b3f6d02d0 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -432,7 +432,6 @@ struct kvm_mmu {
> gpa_t root_pgd;
> union kvm_mmu_role cpu_role;
> union kvm_mmu_page_role mmu_role;
> - bool direct_map;
> struct kvm_mmu_root_info prev_roots[KVM_MMU_NUM_PREV_ROOTS];
>
> /*
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index 5a6541d6a424..ce55fad99671 100644
> --- a/arch/x86/kvm/mmu/mmu.c
> +++ b/arch/x86/kvm/mmu/mmu.c
> @@ -2045,7 +2045,7 @@ static struct kvm_mmu_page *kvm_mmu_get_page(struct kvm_vcpu *vcpu,
> int direct,
> unsigned int access)
> {
> - bool direct_mmu = vcpu->arch.mmu->direct_map;
> + bool direct_mmu = vcpu->arch.mmu->mmu_role.direct;
> union kvm_mmu_page_role role;
> struct hlist_head *sp_list;
> unsigned quadrant;
> @@ -2147,7 +2147,7 @@ static void shadow_walk_init_using_root(struct kvm_shadow_walk_iterator *iterato
>
> if (iterator->level >= PT64_ROOT_4LEVEL &&
> vcpu->arch.mmu->cpu_role.base.level < PT64_ROOT_4LEVEL &&
> - !vcpu->arch.mmu->direct_map)
> + !vcpu->arch.mmu->mmu_role.direct)
> iterator->level = PT32E_ROOT_LEVEL;
>
> if (iterator->level == PT32E_ROOT_LEVEL) {
> @@ -2523,7 +2523,7 @@ static int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva)
> gpa_t gpa;
> int r;
>
> - if (vcpu->arch.mmu->direct_map)
> + if (vcpu->arch.mmu->mmu_role.direct)
> return 0;
>
> gpa = kvm_mmu_gva_to_gpa_read(vcpu, gva, NULL);
> @@ -3255,7 +3255,8 @@ void kvm_mmu_free_roots(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
>
> if (free_active_root) {
> if (mmu->mmu_role.level >= PT64_ROOT_4LEVEL &&
> - (mmu->cpu_role.base.level >= PT64_ROOT_4LEVEL || mmu->direct_map)) {
> + (mmu->cpu_role.base.level >= PT64_ROOT_4LEVEL ||
> + mmu->mmu_role.direct)) {
> mmu_free_root_page(kvm, &mmu->root_hpa, &invalid_list);
> } else if (mmu->pae_root) {
> for (i = 0; i < 4; ++i) {
> @@ -3558,7 +3559,8 @@ static int mmu_alloc_special_roots(struct kvm_vcpu *vcpu)
> * equivalent level in the guest's NPT to shadow. Allocate the tables
> * on demand, as running a 32-bit L1 VMM on 64-bit KVM is very rare.
> */
> - if (mmu->direct_map || mmu->cpu_role.base.level >= PT64_ROOT_4LEVEL ||
> + if (mmu->mmu_role.direct ||
> + mmu->cpu_role.base.level >= PT64_ROOT_4LEVEL ||
> mmu->mmu_role.level < PT64_ROOT_4LEVEL)
> return 0;
>
> @@ -3647,7 +3649,7 @@ void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu)
> int i;
> struct kvm_mmu_page *sp;
>
> - if (vcpu->arch.mmu->direct_map)
> + if (vcpu->arch.mmu->mmu_role.direct)
> return;
>
> if (!VALID_PAGE(vcpu->arch.mmu->root_hpa))
> @@ -3872,7 +3874,7 @@ static bool 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.direct_map = vcpu->arch.mmu->mmu_role.direct;
> arch.cr3 = vcpu->arch.mmu->get_guest_pgd(vcpu);
>
> return kvm_setup_async_pf(vcpu, cr2_or_gpa,
> @@ -4090,7 +4092,6 @@ static void nonpaging_init_context(struct kvm_mmu *context)
> context->gva_to_gpa = nonpaging_gva_to_gpa;
> context->sync_page = nonpaging_sync_page;
> context->invlpg = NULL;
> - context->direct_map = true;
> }
>
> static inline bool is_root_usable(struct kvm_mmu_root_info *root, gpa_t pgd,
> @@ -4641,7 +4642,6 @@ static void paging64_init_context(struct kvm_mmu *context)
> context->gva_to_gpa = paging64_gva_to_gpa;
> context->sync_page = paging64_sync_page;
> context->invlpg = paging64_invlpg;
> - context->direct_map = false;
> }
>
> static void paging32_init_context(struct kvm_mmu *context)
> @@ -4650,7 +4650,6 @@ static void paging32_init_context(struct kvm_mmu *context)
> context->gva_to_gpa = paging32_gva_to_gpa;
> context->sync_page = paging32_sync_page;
> context->invlpg = paging32_invlpg;
> - context->direct_map = false;
> }
>
> static union kvm_mmu_role
> @@ -4735,7 +4734,6 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu, union kvm_mmu_role cpu_role)
> context->page_fault = kvm_tdp_page_fault;
> context->sync_page = nonpaging_sync_page;
> context->invlpg = NULL;
> - context->direct_map = true;
> context->get_guest_pgd = get_cr3;
> context->get_pdptr = kvm_pdptr_read;
> context->inject_page_fault = kvm_inject_page_fault;
> @@ -4852,7 +4850,7 @@ void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly,
> context->gva_to_gpa = ept_gva_to_gpa;
> context->sync_page = ept_sync_page;
> context->invlpg = ept_invlpg;
> - context->direct_map = false;
> +
> update_permission_bitmask(context, true);
> context->pkru_mask = 0;
> reset_rsvds_bits_mask_ept(vcpu, context, execonly, huge_page_level);
> @@ -4967,13 +4965,13 @@ int kvm_mmu_load(struct kvm_vcpu *vcpu)
> {
> int r;
>
> - r = mmu_topup_memory_caches(vcpu, !vcpu->arch.mmu->direct_map);
> + r = mmu_topup_memory_caches(vcpu, !vcpu->arch.mmu->mmu_role.direct);
> if (r)
> goto out;
> r = mmu_alloc_special_roots(vcpu);
> if (r)
> goto out;
> - if (vcpu->arch.mmu->direct_map)
> + if (vcpu->arch.mmu->mmu_role.direct)
> r = mmu_alloc_direct_roots(vcpu);
> else
> r = mmu_alloc_shadow_roots(vcpu);
> @@ -5176,7 +5174,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code,
> void *insn, int insn_len)
> {
> int r, emulation_type = EMULTYPE_PF;
> - bool direct = vcpu->arch.mmu->direct_map;
> + bool direct = vcpu->arch.mmu->mmu_role.direct;
>
> if (WARN_ON(!VALID_PAGE(vcpu->arch.mmu->root_hpa)))
> return RET_PF_RETRY;
> @@ -5207,7 +5205,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code,
> * paging in both guests. If true, we simply unprotect the page
> * and resume the guest.
> */
> - if (vcpu->arch.mmu->direct_map &&
> + if (vcpu->arch.mmu->mmu_role.direct &&
> (error_code & PFERR_NESTED_GUEST_PAGE) == PFERR_NESTED_GUEST_PAGE) {
> kvm_mmu_unprotect_page(vcpu->kvm, gpa_to_gfn(cr2_or_gpa));
> return 1;
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 657aa646871e..b910fa34e57e 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -7978,7 +7978,7 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
> WARN_ON_ONCE(!(emulation_type & EMULTYPE_PF)))
> return false;
>
> - if (!vcpu->arch.mmu->direct_map) {
> + if (!vcpu->arch.mmu->mmu_role.direct) {
> /*
> * Write permission should be allowed since only
> * write access need to be emulated.
> @@ -8011,7 +8011,7 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
> kvm_release_pfn_clean(pfn);
>
> /* The instructions are well-emulated on direct mmu. */
> - if (vcpu->arch.mmu->direct_map) {
> + if (vcpu->arch.mmu->mmu_role.direct) {
> unsigned int indirect_shadow_pages;
>
> write_lock(&vcpu->kvm->mmu_lock);
> @@ -8079,7 +8079,7 @@ static bool retry_instruction(struct x86_emulate_ctxt *ctxt,
> vcpu->arch.last_retry_eip = ctxt->eip;
> vcpu->arch.last_retry_addr = cr2_or_gpa;
>
> - if (!vcpu->arch.mmu->direct_map)
> + if (!vcpu->arch.mmu->mmu_role.direct)
> gpa = kvm_mmu_gva_to_gpa_write(vcpu, cr2_or_gpa, NULL);
>
> kvm_mmu_unprotect_page(vcpu->kvm, gpa_to_gfn(gpa));
> @@ -8359,7 +8359,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,
> ctxt->exception.address = cr2_or_gpa;
>
> /* With shadow page tables, cr2 contains a GVA or nGPA. */
> - if (vcpu->arch.mmu->direct_map) {
> + if (vcpu->arch.mmu->mmu_role.direct) {
> ctxt->gpa_available = true;
> ctxt->gpa_val = cr2_or_gpa;
> }
> @@ -12196,7 +12196,7 @@ void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu, struct kvm_async_pf *work)
> {
> int r;
>
> - if ((vcpu->arch.mmu->direct_map != work->arch.direct_map) ||
> + if ((vcpu->arch.mmu->mmu_role.direct != work->arch.direct_map) ||
> work->wakeup_all)
> return;
>
> @@ -12204,7 +12204,7 @@ void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu, struct kvm_async_pf *work)
> if (unlikely(r))
> return;
>
> - if (!vcpu->arch.mmu->direct_map &&
> + if (!vcpu->arch.mmu->mmu_role.direct &&
> work->arch.cr3 != vcpu->arch.mmu->get_guest_pgd(vcpu))
> return;
>
> --
> 2.31.1
>
next prev parent reply other threads:[~2022-02-08 1:07 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 11:56 [PATCH 00/23] KVM: MMU: MMU role refactoring Paolo Bonzini
2022-02-04 11:56 ` [PATCH 01/23] KVM: MMU: pass uses_nx directly to reset_shadow_zero_bits_mask Paolo Bonzini
2022-02-04 17:59 ` David Matlack
2022-02-05 14:52 ` Paolo Bonzini
2022-02-07 16:09 ` Sean Christopherson
2022-02-07 21:50 ` David Matlack
2022-02-10 0:30 ` Sean Christopherson
2022-02-10 16:38 ` Paolo Bonzini
2022-02-04 11:56 ` [PATCH 02/23] KVM: MMU: nested EPT cannot be used in SMM Paolo Bonzini
2022-02-04 18:16 ` David Matlack
2022-02-09 22:43 ` Sean Christopherson
2022-02-04 11:56 ` [PATCH 03/23] KVM: MMU: remove valid from extended role Paolo Bonzini
2022-02-04 18:32 ` David Matlack
2022-02-05 14:50 ` Paolo Bonzini
2022-02-09 22:54 ` Sean Christopherson
2022-02-10 9:53 ` Paolo Bonzini
2022-02-04 11:56 ` [PATCH 04/23] KVM: MMU: constify uses of struct kvm_mmu_role_regs Paolo Bonzini
2022-02-04 18:41 ` David Matlack
2022-02-09 22:57 ` Sean Christopherson
2022-02-04 11:57 ` [PATCH 05/23] KVM: MMU: pull computation of kvm_mmu_role_regs to kvm_init_mmu Paolo Bonzini
2022-02-04 18:45 ` David Matlack
2022-02-04 11:57 ` [PATCH 06/23] KVM: MMU: load new PGD once nested two-dimensional paging is initialized Paolo Bonzini
2022-02-04 19:18 ` David Matlack
2022-02-07 13:50 ` Paolo Bonzini
2022-02-07 14:35 ` Paolo Bonzini
2022-02-09 12:34 ` Paolo Bonzini
2022-02-04 11:57 ` [PATCH 07/23] KVM: MMU: remove kvm_mmu_calc_root_page_role Paolo Bonzini
2022-02-04 19:32 ` David Matlack
2022-02-05 14:46 ` Paolo Bonzini
2022-02-10 0:47 ` Sean Christopherson
2022-02-10 9:52 ` Paolo Bonzini
2022-02-10 17:29 ` Sean Christopherson
2022-02-10 17:43 ` Paolo Bonzini
2022-02-04 11:57 ` [PATCH 08/23] KVM: MMU: rephrase unclear comment Paolo Bonzini
2022-02-04 19:38 ` David Matlack
2022-02-04 11:57 ` [PATCH 09/23] KVM: MMU: remove "bool base_only" arguments Paolo Bonzini
2022-02-04 19:41 ` David Matlack
2022-02-04 11:57 ` [PATCH 10/23] KVM: MMU: split cpu_role from mmu_role Paolo Bonzini
2022-02-04 21:57 ` David Matlack
2022-02-05 14:49 ` Paolo Bonzini
2022-02-07 21:38 ` David Matlack
2022-02-04 11:57 ` [PATCH 11/23] KVM: MMU: do not recompute root level from kvm_mmu_role_regs Paolo Bonzini
2022-02-07 22:10 ` David Matlack
2022-02-07 22:17 ` David Matlack
2022-02-04 11:57 ` [PATCH 12/23] KVM: MMU: remove ept_ad field Paolo Bonzini
2022-02-04 11:57 ` [PATCH 13/23] KVM: MMU: remove kvm_calc_shadow_root_page_role_common Paolo Bonzini
2022-02-07 22:25 ` David Matlack
2022-02-04 11:57 ` [PATCH 14/23] KVM: MMU: cleanup computation of MMU roles for two-dimensional paging Paolo Bonzini
2022-02-04 11:57 ` [PATCH 15/23] KVM: MMU: cleanup computation of MMU roles for shadow paging Paolo Bonzini
2022-02-04 11:57 ` [PATCH 16/23] KVM: MMU: remove extended bits from mmu_role Paolo Bonzini
2022-02-04 11:57 ` [PATCH 17/23] KVM: MMU: remove redundant bits from extended role Paolo Bonzini
2022-02-04 11:57 ` [PATCH 18/23] KVM: MMU: fetch shadow EFER.NX from MMU role Paolo Bonzini
2022-02-04 11:57 ` [PATCH 19/23] KVM: MMU: simplify and/or inline computation of shadow MMU roles Paolo Bonzini
2022-02-04 11:57 ` [PATCH 20/23] KVM: MMU: pull CPU role computation to kvm_init_mmu Paolo Bonzini
2022-02-07 22:42 ` David Matlack
2022-02-04 11:57 ` [PATCH 21/23] KVM: MMU: store shadow_root_level into mmu_role Paolo Bonzini
2022-02-07 23:00 ` David Matlack
2022-02-04 11:57 ` [PATCH 22/23] KVM: MMU: use cpu_role for root_level Paolo Bonzini
2022-02-07 23:01 ` David Matlack
2022-02-04 11:57 ` [PATCH 23/23] KVM: MMU: replace direct_map with mmu_role.direct Paolo Bonzini
2022-02-07 23:02 ` David Matlack [this message]
2022-02-07 23:08 ` [PATCH 00/23] KVM: MMU: MMU role refactoring David Matlack
2022-02-07 23:27 ` Sean Christopherson
2022-02-07 23:53 ` David Matlack
2022-02-10 1:11 ` Sean Christopherson
2022-02-10 11:58 ` Paolo Bonzini
2022-02-10 16:55 ` Sean Christopherson
2022-02-10 17:30 ` Paolo Bonzini
2022-02-10 19:28 ` Sean Christopherson
2022-02-09 22:31 ` Sean Christopherson
2022-02-10 9:54 ` Paolo Bonzini
2022-02-14 18:14 ` David Matlack
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YgGlAbyLQGRUOlSG@google.com \
--to=dmatlack@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.