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 09/23] KVM: MMU: remove "bool base_only" arguments
Date: Fri, 4 Feb 2022 19:41:23 +0000 [thread overview]
Message-ID: <Yf2BY7d8TsmNrceY@google.com> (raw)
In-Reply-To: <20220204115718.14934-10-pbonzini@redhat.com>
On Fri, Feb 04, 2022 at 06:57:04AM -0500, Paolo Bonzini wrote:
> The argument is always false now that kvm_mmu_calc_root_page_role has
> been removed.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: David Matlack <dmatlack@google.com>
> ---
> arch/x86/kvm/mmu/mmu.c | 63 +++++++++++++++---------------------------
> 1 file changed, 22 insertions(+), 41 deletions(-)
>
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index 42475e4c2a48..dd69cfc8c4f6 100644
> --- a/arch/x86/kvm/mmu/mmu.c
> +++ b/arch/x86/kvm/mmu/mmu.c
> @@ -4658,46 +4658,30 @@ static void paging32_init_context(struct kvm_mmu *context)
> context->direct_map = false;
> }
>
> -static union kvm_mmu_extended_role kvm_calc_mmu_role_ext(struct kvm_vcpu *vcpu,
> - const struct kvm_mmu_role_regs *regs)
> -{
> - union kvm_mmu_extended_role ext = {0};
> -
> - if (____is_cr0_pg(regs)) {
> - ext.cr0_pg = 1;
> - ext.cr4_pae = ____is_cr4_pae(regs);
> - ext.cr4_smep = ____is_cr4_smep(regs);
> - ext.cr4_smap = ____is_cr4_smap(regs);
> - ext.cr4_pse = ____is_cr4_pse(regs);
> -
> - /* PKEY and LA57 are active iff long mode is active. */
> - ext.cr4_pke = ____is_efer_lma(regs) && ____is_cr4_pke(regs);
> - ext.cr4_la57 = ____is_efer_lma(regs) && ____is_cr4_la57(regs);
> - ext.efer_lma = ____is_efer_lma(regs);
> - }
> -
> - return ext;
> -}
> -
> static union kvm_mmu_role kvm_calc_mmu_role_common(struct kvm_vcpu *vcpu,
> - const struct kvm_mmu_role_regs *regs,
> - bool base_only)
> + const struct kvm_mmu_role_regs *regs)
> {
> union kvm_mmu_role role = {0};
>
> role.base.access = ACC_ALL;
> if (____is_cr0_pg(regs)) {
> + role.ext.cr0_pg = 1;
> role.base.efer_nx = ____is_efer_nx(regs);
> role.base.cr0_wp = ____is_cr0_wp(regs);
> +
> + role.ext.cr4_pae = ____is_cr4_pae(regs);
> + role.ext.cr4_smep = ____is_cr4_smep(regs);
> + role.ext.cr4_smap = ____is_cr4_smap(regs);
> + role.ext.cr4_pse = ____is_cr4_pse(regs);
> +
> + /* PKEY and LA57 are active iff long mode is active. */
> + role.ext.cr4_pke = ____is_efer_lma(regs) && ____is_cr4_pke(regs);
> + role.ext.cr4_la57 = ____is_efer_lma(regs) && ____is_cr4_la57(regs);
> + role.ext.efer_lma = ____is_efer_lma(regs);
> }
> role.base.smm = is_smm(vcpu);
> role.base.guest_mode = is_guest_mode(vcpu);
>
> - if (base_only)
> - return role;
> -
> - role.ext = kvm_calc_mmu_role_ext(vcpu, regs);
> -
> return role;
> }
>
> @@ -4716,10 +4700,9 @@ static inline int kvm_mmu_get_tdp_level(struct kvm_vcpu *vcpu)
>
> static union kvm_mmu_role
> kvm_calc_tdp_mmu_root_page_role(struct kvm_vcpu *vcpu,
> - const struct kvm_mmu_role_regs *regs,
> - bool base_only)
> + const struct kvm_mmu_role_regs *regs)
> {
> - union kvm_mmu_role role = kvm_calc_mmu_role_common(vcpu, regs, base_only);
> + union kvm_mmu_role role = kvm_calc_mmu_role_common(vcpu, regs);
>
> role.base.ad_disabled = (shadow_accessed_mask == 0);
> role.base.level = kvm_mmu_get_tdp_level(vcpu);
> @@ -4734,7 +4717,7 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu,
> {
> struct kvm_mmu *context = &vcpu->arch.root_mmu;
> union kvm_mmu_role new_role =
> - kvm_calc_tdp_mmu_root_page_role(vcpu, regs, false);
> + kvm_calc_tdp_mmu_root_page_role(vcpu, regs);
>
> if (new_role.as_u64 == context->mmu_role.as_u64)
> return;
> @@ -4763,10 +4746,9 @@ static void init_kvm_tdp_mmu(struct kvm_vcpu *vcpu,
>
> static union kvm_mmu_role
> kvm_calc_shadow_root_page_role_common(struct kvm_vcpu *vcpu,
> - const struct kvm_mmu_role_regs *regs,
> - bool base_only)
> + const struct kvm_mmu_role_regs *regs)
> {
> - union kvm_mmu_role role = kvm_calc_mmu_role_common(vcpu, regs, base_only);
> + union kvm_mmu_role role = kvm_calc_mmu_role_common(vcpu, regs);
>
> role.base.smep_andnot_wp = role.ext.cr4_smep && !____is_cr0_wp(regs);
> role.base.smap_andnot_wp = role.ext.cr4_smap && !____is_cr0_wp(regs);
> @@ -4777,11 +4759,10 @@ kvm_calc_shadow_root_page_role_common(struct kvm_vcpu *vcpu,
>
> static union kvm_mmu_role
> kvm_calc_shadow_mmu_root_page_role(struct kvm_vcpu *vcpu,
> - const struct kvm_mmu_role_regs *regs,
> - bool base_only)
> + const struct kvm_mmu_role_regs *regs)
> {
> union kvm_mmu_role role =
> - kvm_calc_shadow_root_page_role_common(vcpu, regs, base_only);
> + kvm_calc_shadow_root_page_role_common(vcpu, regs);
>
> role.base.direct = !____is_cr0_pg(regs);
>
> @@ -4821,7 +4802,7 @@ static void kvm_init_shadow_mmu(struct kvm_vcpu *vcpu,
> {
> struct kvm_mmu *context = &vcpu->arch.root_mmu;
> union kvm_mmu_role new_role =
> - kvm_calc_shadow_mmu_root_page_role(vcpu, regs, false);
> + kvm_calc_shadow_mmu_root_page_role(vcpu, regs);
>
> shadow_mmu_init_context(vcpu, context, regs, new_role);
>
> @@ -4841,7 +4822,7 @@ kvm_calc_shadow_npt_root_page_role(struct kvm_vcpu *vcpu,
> const struct kvm_mmu_role_regs *regs)
> {
> union kvm_mmu_role role =
> - kvm_calc_shadow_root_page_role_common(vcpu, regs, false);
> + kvm_calc_shadow_root_page_role_common(vcpu, regs);
>
> role.base.direct = false;
> role.base.level = kvm_mmu_get_tdp_level(vcpu);
> @@ -4937,7 +4918,7 @@ kvm_calc_nested_mmu_role(struct kvm_vcpu *vcpu, const struct kvm_mmu_role_regs *
> {
> union kvm_mmu_role role;
>
> - role = kvm_calc_shadow_root_page_role_common(vcpu, regs, false);
> + role = kvm_calc_shadow_root_page_role_common(vcpu, regs);
>
> /*
> * Nested MMUs are used only for walking L2's gva->gpa, they never have
> --
> 2.31.1
>
>
next prev parent reply other threads:[~2022-02-04 19:41 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 [this message]
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
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=Yf2BY7d8TsmNrceY@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox