lkml.org 
[lkml]   [2021]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
Subject[PATCH 46/54] KVM: x86/mmu: Use MMU's role to determine PTTYPE
From
Use the MMU's role instead of vCPU state or role_regs to determine the
PTTYPE, i.e. which helpers to wire up.

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/mmu/mmu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 4e11cb284006..92260cf48d5e 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4637,9 +4637,9 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
context->inject_page_fault = kvm_inject_page_fault;
context->root_level = role_regs_to_root_level(&regs);

- if (!is_paging(vcpu))
+ if (!is_cr0_pg(context))
context->gva_to_gpa = nonpaging_gva_to_gpa;
- else if (is_pae(vcpu))
+ else if (is_cr4_pae(context))
context->gva_to_gpa = paging64_gva_to_gpa;
else
context->gva_to_gpa = paging32_gva_to_gpa;
@@ -4689,9 +4689,9 @@ static void shadow_mmu_init_context(struct kvm_vcpu *vcpu, struct kvm_mmu *conte

context->mmu_role.as_u64 = new_role.as_u64;

- if (!____is_cr0_pg(regs))
+ if (!is_cr0_pg(context))
nonpaging_init_context(context);
- else if (____is_cr4_pae(regs))
+ else if (is_cr4_pae(context))
paging64_init_context(context);
else
paging32_init_context(context);
--
2.32.0.288.g62a8d224e6-goog
\
 
 \ /
  Last update: 2021-06-22 20:04    [W:1.870 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site