Skip to content

Commit 243e13e

Browse files
rpedgecobonzini
authored andcommitted
KVM: x86/mmu: Make kvm_tdp_mmu_alloc_root() return void
The kvm_tdp_mmu_alloc_root() function currently always returns 0. This allows for the caller, mmu_alloc_direct_roots(), to call kvm_tdp_mmu_alloc_root() and also return 0 in one line: return kvm_tdp_mmu_alloc_root(vcpu); So it is useful even though the return value of kvm_tdp_mmu_alloc_root() is always the same. However, in future changes, kvm_tdp_mmu_alloc_root() will be called twice in mmu_alloc_direct_roots(). This will force the first call to either awkwardly handle the return value that will always be zero or ignore it. So change kvm_tdp_mmu_alloc_root() to return void. Do it in a separate change so the future change will be cleaner. Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-ID: <20240718211230.1492011-7-rick.p.edgecombe@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 6961ab0 commit 243e13e

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

arch/x86/kvm/mmu/mmu.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3663,8 +3663,10 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu)
36633663
unsigned i;
36643664
int r;
36653665

3666-
if (tdp_mmu_enabled)
3667-
return kvm_tdp_mmu_alloc_root(vcpu);
3666+
if (tdp_mmu_enabled) {
3667+
kvm_tdp_mmu_alloc_root(vcpu);
3668+
return 0;
3669+
}
36683670

36693671
write_lock(&vcpu->kvm->mmu_lock);
36703672
r = make_mmu_pages_available(vcpu);

arch/x86/kvm/mmu/tdp_mmu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static void tdp_mmu_init_child_sp(struct kvm_mmu_page *child_sp,
224224
tdp_mmu_init_sp(child_sp, iter->sptep, iter->gfn, role);
225225
}
226226

227-
int kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu)
227+
void kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu)
228228
{
229229
struct kvm_mmu *mmu = vcpu->arch.mmu;
230230
union kvm_mmu_page_role role = mmu->root_role;
@@ -285,7 +285,6 @@ int kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu)
285285
*/
286286
mmu->root.hpa = __pa(root->spt);
287287
mmu->root.pgd = 0;
288-
return 0;
289288
}
290289

291290
static void handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn,

arch/x86/kvm/mmu/tdp_mmu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
void kvm_mmu_init_tdp_mmu(struct kvm *kvm);
1111
void kvm_mmu_uninit_tdp_mmu(struct kvm *kvm);
1212

13-
int kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu);
13+
void kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu);
1414

1515
__must_check static inline bool kvm_tdp_mmu_get_root(struct kvm_mmu_page *root)
1616
{

0 commit comments

Comments
 (0)