| Message ID | 20211120045046.3940942-9-seanjc@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: x86/mmu: Overhaul TDP MMU zapping and flushing | expand |
On Fri, Nov 19, 2021 at 8:51 PM Sean Christopherson <seanjc@google.com> wrote: > > Drop the unused @kvm param from kvm_tdp_mmu_get_root(). No functional > change intended. > > Signed-off-by: Sean Christopherson <seanjc@google.com> Reviewed-by: Ben Gardon <bgardon@google.com> > --- > arch/x86/kvm/mmu/tdp_mmu.c | 7 ++++--- > arch/x86/kvm/mmu/tdp_mmu.h | 3 +-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c > index 4305ee8e3de3..12a28afce73f 100644 > --- a/arch/x86/kvm/mmu/tdp_mmu.c > +++ b/arch/x86/kvm/mmu/tdp_mmu.c > @@ -129,9 +129,10 @@ static struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm, > next_root = list_first_or_null_rcu(&kvm->arch.tdp_mmu_roots, > typeof(*next_root), link); > > - while (next_root && !kvm_tdp_mmu_get_root(kvm, next_root)) > + while (next_root && !kvm_tdp_mmu_get_root(next_root)) > next_root = list_next_or_null_rcu(&kvm->arch.tdp_mmu_roots, > - &next_root->link, typeof(*next_root), link); > + &next_root->link, > + typeof(*next_root), link); > > rcu_read_unlock(); > > @@ -211,7 +212,7 @@ hpa_t kvm_tdp_mmu_get_vcpu_root_hpa(struct kvm_vcpu *vcpu) > /* Check for an existing root before allocating a new one. */ > for_each_tdp_mmu_root(kvm, root, kvm_mmu_role_as_id(role)) { > if (root->role.word == role.word && > - kvm_tdp_mmu_get_root(kvm, root)) > + kvm_tdp_mmu_get_root(root)) > goto out; > } > > diff --git a/arch/x86/kvm/mmu/tdp_mmu.h b/arch/x86/kvm/mmu/tdp_mmu.h > index 3899004a5d91..599714de67c3 100644 > --- a/arch/x86/kvm/mmu/tdp_mmu.h > +++ b/arch/x86/kvm/mmu/tdp_mmu.h > @@ -7,8 +7,7 @@ > > hpa_t kvm_tdp_mmu_get_vcpu_root_hpa(struct kvm_vcpu *vcpu); > > -__must_check static inline bool kvm_tdp_mmu_get_root(struct kvm *kvm, > - struct kvm_mmu_page *root) > +__must_check static inline bool kvm_tdp_mmu_get_root(struct kvm_mmu_page *root) > { > if (root->role.invalid) > return false; > -- > 2.34.0.rc2.393.gf8c9666880-goog >
diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 4305ee8e3de3..12a28afce73f 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -129,9 +129,10 @@ static struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm, next_root = list_first_or_null_rcu(&kvm->arch.tdp_mmu_roots, typeof(*next_root), link); - while (next_root && !kvm_tdp_mmu_get_root(kvm, next_root)) + while (next_root && !kvm_tdp_mmu_get_root(next_root)) next_root = list_next_or_null_rcu(&kvm->arch.tdp_mmu_roots, - &next_root->link, typeof(*next_root), link); + &next_root->link, + typeof(*next_root), link); rcu_read_unlock(); @@ -211,7 +212,7 @@ hpa_t kvm_tdp_mmu_get_vcpu_root_hpa(struct kvm_vcpu *vcpu) /* Check for an existing root before allocating a new one. */ for_each_tdp_mmu_root(kvm, root, kvm_mmu_role_as_id(role)) { if (root->role.word == role.word && - kvm_tdp_mmu_get_root(kvm, root)) + kvm_tdp_mmu_get_root(root)) goto out; } diff --git a/arch/x86/kvm/mmu/tdp_mmu.h b/arch/x86/kvm/mmu/tdp_mmu.h index 3899004a5d91..599714de67c3 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.h +++ b/arch/x86/kvm/mmu/tdp_mmu.h @@ -7,8 +7,7 @@ hpa_t kvm_tdp_mmu_get_vcpu_root_hpa(struct kvm_vcpu *vcpu); -__must_check static inline bool kvm_tdp_mmu_get_root(struct kvm *kvm, - struct kvm_mmu_page *root) +__must_check static inline bool kvm_tdp_mmu_get_root(struct kvm_mmu_page *root) { if (root->role.invalid) return false;
Drop the unused @kvm param from kvm_tdp_mmu_get_root(). No functional change intended. Signed-off-by: Sean Christopherson <seanjc@google.com> --- arch/x86/kvm/mmu/tdp_mmu.c | 7 ++++--- arch/x86/kvm/mmu/tdp_mmu.h | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-)