kevin/linux
1
Fork 0
Code

KVM: Get rid of return value from kvm_arch_create_vm_debugfs()

Browse Source 
The general expectation with debugfs is that any initialization failure
is nonfatal. Nevertheless, kvm_arch_create_vm_debugfs() allows
implementations to return an error and kvm_create_vm_debugfs() allows
that to fail VM creation.

Change to a void return to discourage architectures from making debugfs
failures fatal for the VM. Seems like everyone already had the right
idea, as all implementations already return 0 unconditionally.

Acked-by: Marc Zyngier <maz@kernel.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Link: https://lore.kernel.org/r/20240216155941.2029458-1-oliver.upton@linux.dev
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
This commit is contained in:
Oliver Upton 2024-02-16 15:59:41 +00:00
parent 8cdc71fbf6
commit 284851ee5c
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/kvm/powerpc.c
View File

@ -2538,9 +2538,8 @@ void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu, struct dentry *debugfs_
vcpu->kvm->arch.kvm_ops->create_vcpu_debugfs(vcpu, debugfs_dentry); vcpu->kvm->arch.kvm_ops->create_vcpu_debugfs(vcpu, debugfs_dentry);
} }
int kvm_arch_create_vm_debugfs(struct kvm *kvm) void kvm_arch_create_vm_debugfs(struct kvm *kvm)
{ {
if (kvm->arch.kvm_ops->create_vm_debugfs) if (kvm->arch.kvm_ops->create_vm_debugfs)
kvm->arch.kvm_ops->create_vm_debugfs(kvm); kvm->arch.kvm_ops->create_vm_debugfs(kvm);
return 0;
} }

3
arch/x86/kvm/debugfs.c
View File

@ -189,9 +189,8 @@ static const struct file_operations mmu_rmaps_stat_fops = {
.release = kvm_mmu_rmaps_stat_release, .release = kvm_mmu_rmaps_stat_release,
}; };
int kvm_arch_create_vm_debugfs(struct kvm *kvm) void kvm_arch_create_vm_debugfs(struct kvm *kvm)
{ {
debugfs_create_file("mmu_rmaps_stat", 0644, kvm->debugfs_dentry, kvm, debugfs_create_file("mmu_rmaps_stat", 0644, kvm->debugfs_dentry, kvm,
&mmu_rmaps_stat_fops); &mmu_rmaps_stat_fops);
return 0;
} }

2
include/linux/kvm_host.h
View File

@ -1507,7 +1507,7 @@ bool kvm_arch_dy_runnable(struct kvm_vcpu *vcpu);
bool kvm_arch_dy_has_pending_interrupt(struct kvm_vcpu *vcpu); bool kvm_arch_dy_has_pending_interrupt(struct kvm_vcpu *vcpu);
int kvm_arch_post_init_vm(struct kvm *kvm); int kvm_arch_post_init_vm(struct kvm *kvm);
void kvm_arch_pre_destroy_vm(struct kvm *kvm); void kvm_arch_pre_destroy_vm(struct kvm *kvm);
int kvm_arch_create_vm_debugfs(struct kvm *kvm); void kvm_arch_create_vm_debugfs(struct kvm *kvm);
#ifndef __KVM_HAVE_ARCH_VM_ALLOC #ifndef __KVM_HAVE_ARCH_VM_ALLOC
/* /*

8
virt/kvm/kvm_main.c
View File

@ -1150,10 +1150,7 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, const char *fdname)
&stat_fops_per_vm); &stat_fops_per_vm);
} }
ret = kvm_arch_create_vm_debugfs(kvm); kvm_arch_create_vm_debugfs(kvm);
if (ret)
goto out_err;
return 0; return 0;
out_err: out_err:
kvm_destroy_vm_debugfs(kvm); kvm_destroy_vm_debugfs(kvm);
@ -1183,9 +1180,8 @@ void __weak kvm_arch_pre_destroy_vm(struct kvm *kvm)
* Cleanup should be automatic done in kvm_destroy_vm_debugfs() recursively, so * Cleanup should be automatic done in kvm_destroy_vm_debugfs() recursively, so
* a per-arch destroy interface is not needed. * a per-arch destroy interface is not needed.
*/ */
int __weak kvm_arch_create_vm_debugfs(struct kvm *kvm) void __weak kvm_arch_create_vm_debugfs(struct kvm *kvm)
{ {
return 0;
} }
static struct kvm *kvm_create_vm(unsigned long type, const char *fdname) static struct kvm *kvm_create_vm(unsigned long type, const char *fdname)