| Message ID | 20190731185556.GA703@kroah.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] KVM: remove kvm_arch_has_vcpu_debugfs() | expand |
On 31/07/19 20:55, Greg KH wrote: > There is no need for this function as all arches have to implement > kvm_arch_create_vcpu_debugfs() no matter what, so just remove this call > as it is pointless. > > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: "Radim Krm" <rkrcmar@redhat.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Borislav Petkov <bp@alien8.de> > Cc: "H. Peter Anvin" <hpa@zytor.com> > Cc: <x86@kernel.org> > Cc: <kvm@vger.kernel.org> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > v2: new patch in the series Let's remove kvm_arch_arch_create_vcpu_debugfs too for non-x86 arches. I'll queue your 2/2. ---------------- 8< ------------------ From fe1b874aca4679836f0533a923c641a1a367cd32 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini <pbonzini@redhat.com> Date: Sat, 3 Aug 2019 08:14:25 +0200 Subject: [PATCH] KVM: remove kvm_arch_has_vcpu_debugfs() There is no need for this function as all arches have to implement kvm_arch_create_vcpu_debugfs() no matter what. A #define symbol let us actually simplify the code. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 2cfe839f0b3a..1109924560d8 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -150,16 +150,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return 0; } -bool kvm_arch_has_vcpu_debugfs(void) -{ - return false; -} - -int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) -{ - return 0; -} - void kvm_mips_free_vcpus(struct kvm *kvm) { unsigned int i; diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 0dba7eb24f92..d71b21b4eea6 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -452,16 +452,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return -EINVAL; } -bool kvm_arch_has_vcpu_debugfs(void) -{ - return false; -} - -int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) -{ - return 0; -} - void kvm_arch_destroy_vm(struct kvm *kvm) { unsigned int i; diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 3f520cd837fb..f329dcb3f44c 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2516,16 +2516,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return rc; } -bool kvm_arch_has_vcpu_debugfs(void) -{ - return false; -} - -int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) -{ - return 0; -} - void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) { VCPU_EVENT(vcpu, 3, "%s", "free cpu"); diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index e74f0711eaaf..a40a77e09cb0 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -35,6 +35,8 @@ #include <asm/kvm_vcpu_regs.h> #include <asm/hyperv-tlfs.h> +#define __KVM_HAVE_ARCH_VCPU_DEBUGFS + #define KVM_MAX_VCPUS 288 #define KVM_SOFT_MAX_VCPUS 240 #define KVM_MAX_VCPU_ID 1023 diff --git a/arch/x86/kvm/debugfs.c b/arch/x86/kvm/debugfs.c index 329361b69d5e..9bd93e0d5f63 100644 --- a/arch/x86/kvm/debugfs.c +++ b/arch/x86/kvm/debugfs.c @@ -8,11 +8,6 @@ #include <linux/debugfs.h> #include "lapic.h" -bool kvm_arch_has_vcpu_debugfs(void) -{ - return true; -} - static int vcpu_get_timer_advance_ns(void *data, u64 *val) { struct kvm_vcpu *vcpu = (struct kvm_vcpu *) data; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 5c5b5867024c..65b85737ad22 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -861,8 +861,9 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu); -bool kvm_arch_has_vcpu_debugfs(void); +#ifdef __KVM_HAVE_ARCH_VCPU_DEBUGFS int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu); +#endif int kvm_arch_hardware_enable(void); void kvm_arch_hardware_disable(void); diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index acc43242a310..13f5a1aa6d79 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -144,11 +144,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return ret; } -bool kvm_arch_has_vcpu_debugfs(void) -{ - return false; -} - int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) { return 0; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 887f3b0c2b60..9c210f848ebd 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2593,12 +2593,10 @@ static int create_vcpu_fd(struct kvm_vcpu *vcpu) static int kvm_create_vcpu_debugfs(struct kvm_vcpu *vcpu) { +#ifdef __KVM_HAVE_ARCH_VCPU_DEBUGFS char dir_name[ITOA_MAX_LEN * 2]; int ret; - if (!kvm_arch_has_vcpu_debugfs()) - return 0; - if (!debugfs_initialized()) return 0; @@ -2613,6 +2611,7 @@ static int kvm_create_vcpu_debugfs(struct kvm_vcpu *vcpu) debugfs_remove_recursive(vcpu->debugfs_dentry); return ret; } +#endif return 0; }
On Sat, 3 Aug 2019, Paolo Bonzini wrote: > On 31/07/19 20:55, Greg KH wrote: > > There is no need for this function as all arches have to implement > > kvm_arch_create_vcpu_debugfs() no matter what, so just remove this call > > as it is pointless. > > Let's remove kvm_arch_arch_create_vcpu_debugfs too for non-x86 arches. Can't we remove _all_ that virt muck? That would solve a lot more problems in one go. /me ducks
On Sat, Aug 03, 2019 at 08:23:25AM +0200, Paolo Bonzini wrote: > On 31/07/19 20:55, Greg KH wrote: > > There is no need for this function as all arches have to implement > > kvm_arch_create_vcpu_debugfs() no matter what, so just remove this call > > as it is pointless. > > > > Cc: Paolo Bonzini <pbonzini@redhat.com> > > Cc: "Radim Krm" <rkrcmar@redhat.com> > > Cc: Thomas Gleixner <tglx@linutronix.de> > > Cc: Ingo Molnar <mingo@redhat.com> > > Cc: Borislav Petkov <bp@alien8.de> > > Cc: "H. Peter Anvin" <hpa@zytor.com> > > Cc: <x86@kernel.org> > > Cc: <kvm@vger.kernel.org> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > --- > > v2: new patch in the series > > Let's remove kvm_arch_arch_create_vcpu_debugfs too for non-x86 arches. > > I'll queue your 2/2. Great, so what about 1/2? I have no objection to your patch for this. thanks, greg k-h
On 05/08/19 17:36, Greg KH wrote: > On Sat, Aug 03, 2019 at 08:23:25AM +0200, Paolo Bonzini wrote: >> On 31/07/19 20:55, Greg KH wrote: >>> There is no need for this function as all arches have to implement >>> kvm_arch_create_vcpu_debugfs() no matter what, so just remove this call >>> as it is pointless. >>> >>> Cc: Paolo Bonzini <pbonzini@redhat.com> >>> Cc: "Radim Krm" <rkrcmar@redhat.com> >>> Cc: Thomas Gleixner <tglx@linutronix.de> >>> Cc: Ingo Molnar <mingo@redhat.com> >>> Cc: Borislav Petkov <bp@alien8.de> >>> Cc: "H. Peter Anvin" <hpa@zytor.com> >>> Cc: <x86@kernel.org> >>> Cc: <kvm@vger.kernel.org> >>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >>> --- >>> v2: new patch in the series >> >> Let's remove kvm_arch_arch_create_vcpu_debugfs too for non-x86 arches. >> >> I'll queue your 2/2. > > Great, so what about 1/2? I have no objection to your patch for this. I'll queue my own replacement of 1/2, together with your 2/2. Both should reach Linus later this week. Paolo
On 03/08/19 09:41, Thomas Gleixner wrote: > On Sat, 3 Aug 2019, Paolo Bonzini wrote: >> On 31/07/19 20:55, Greg KH wrote: >>> There is no need for this function as all arches have to implement >>> kvm_arch_create_vcpu_debugfs() no matter what, so just remove this call >>> as it is pointless. >> >> Let's remove kvm_arch_arch_create_vcpu_debugfs too for non-x86 arches. > > Can't we remove _all_ that virt muck? That would solve a lot more problems > in one go. It sure would take some maintainer burden off me. :) Paolo
On Mon, Aug 05, 2019 at 05:48:15PM +0200, Paolo Bonzini wrote: > On 05/08/19 17:36, Greg KH wrote: > > On Sat, Aug 03, 2019 at 08:23:25AM +0200, Paolo Bonzini wrote: > >> On 31/07/19 20:55, Greg KH wrote: > >>> There is no need for this function as all arches have to implement > >>> kvm_arch_create_vcpu_debugfs() no matter what, so just remove this call > >>> as it is pointless. > >>> > >>> Cc: Paolo Bonzini <pbonzini@redhat.com> > >>> Cc: "Radim Krm" <rkrcmar@redhat.com> > >>> Cc: Thomas Gleixner <tglx@linutronix.de> > >>> Cc: Ingo Molnar <mingo@redhat.com> > >>> Cc: Borislav Petkov <bp@alien8.de> > >>> Cc: "H. Peter Anvin" <hpa@zytor.com> > >>> Cc: <x86@kernel.org> > >>> Cc: <kvm@vger.kernel.org> > >>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > >>> --- > >>> v2: new patch in the series > >> > >> Let's remove kvm_arch_arch_create_vcpu_debugfs too for non-x86 arches. > >> > >> I'll queue your 2/2. > > > > Great, so what about 1/2? I have no objection to your patch for this. > > I'll queue my own replacement of 1/2, together with your 2/2. Both > should reach Linus later this week. Wonderful, thanks. greg k-h
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 2cfe839f0b3a..948ef36ca87c 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -150,11 +150,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return 0; } -bool kvm_arch_has_vcpu_debugfs(void) -{ - return false; -} - int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) { return 0; diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 0dba7eb24f92..78d166672492 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -452,11 +452,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return -EINVAL; } -bool kvm_arch_has_vcpu_debugfs(void) -{ - return false; -} - int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) { return 0; diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 3f520cd837fb..4dd49bda8d25 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -2516,11 +2516,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return rc; } -bool kvm_arch_has_vcpu_debugfs(void) -{ - return false; -} - int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) { return 0; diff --git a/arch/x86/kvm/debugfs.c b/arch/x86/kvm/debugfs.c index 329361b69d5e..9bd93e0d5f63 100644 --- a/arch/x86/kvm/debugfs.c +++ b/arch/x86/kvm/debugfs.c @@ -8,11 +8,6 @@ #include <linux/debugfs.h> #include "lapic.h" -bool kvm_arch_has_vcpu_debugfs(void) -{ - return true; -} - static int vcpu_get_timer_advance_ns(void *data, u64 *val) { struct kvm_vcpu *vcpu = (struct kvm_vcpu *) data; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 5c5b5867024c..52596a27ab27 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -861,7 +861,6 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu); -bool kvm_arch_has_vcpu_debugfs(void); int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu); int kvm_arch_hardware_enable(void); diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index f645c0fbf7ec..cc85259a243d 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -144,11 +144,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) return ret; } -bool kvm_arch_has_vcpu_debugfs(void) -{ - return false; -} - int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu) { return 0; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 887f3b0c2b60..ac0a2f6a50a4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2596,9 +2596,6 @@ static int kvm_create_vcpu_debugfs(struct kvm_vcpu *vcpu) char dir_name[ITOA_MAX_LEN * 2]; int ret; - if (!kvm_arch_has_vcpu_debugfs()) - return 0; - if (!debugfs_initialized()) return 0;
There is no need for this function as all arches have to implement kvm_arch_create_vcpu_debugfs() no matter what, so just remove this call as it is pointless. Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Radim Krm" <rkrcmar@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <x86@kernel.org> Cc: <kvm@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- v2: new patch in the series arch/mips/kvm/mips.c | 5 ----- arch/powerpc/kvm/powerpc.c | 5 ----- arch/s390/kvm/kvm-s390.c | 5 ----- arch/x86/kvm/debugfs.c | 5 ----- include/linux/kvm_host.h | 1 - virt/kvm/arm/arm.c | 5 ----- virt/kvm/kvm_main.c | 3 --- 7 files changed, 29 deletions(-)