| Message ID | 20191022015925.31916-43-sean.j.christopherson@intel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | KVM: Refactor vCPU creation | expand |
On Mon, Oct 21, 2019 at 06:59:22PM -0700, Sean Christopherson wrote: > Add an arm specific hook to free the arm64-only sve_state. Doing so > eliminates the last functional code from kvm_arch_vcpu_uninit() across > all architectures and paves the way for removing kvm_arch_vcpu_init() > and kvm_arch_vcpu_uninit() entirely. > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > --- > arch/arm/include/asm/kvm_host.h | 1 + > arch/arm64/include/asm/kvm_host.h | 1 + > arch/arm64/kvm/reset.c | 5 +++++ > virt/kvm/arm/arm.c | 2 ++ > 4 files changed, 9 insertions(+) > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > index 8a37c8e89777..cc414de5acd3 100644 > --- a/arch/arm/include/asm/kvm_host.h > +++ b/arch/arm/include/asm/kvm_host.h > @@ -333,6 +333,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} > static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} > static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} > static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {} > +static inline int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) {} > > static inline void kvm_arm_init_debug(void) {} > static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {} > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index f656169db8c3..92d7c384a4ed 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -52,6 +52,7 @@ int kvm_arm_init_sve(void); > > int __attribute_const__ kvm_target_cpu(void); > int kvm_reset_vcpu(struct kvm_vcpu *vcpu); > +int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu); > void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu); > int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext); > void __extended_idmap_trampoline(phys_addr_t boot_pgd, phys_addr_t idmap_start); > diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c > index f4a8ae918827..98abc4278f42 100644 > --- a/arch/arm64/kvm/reset.c > +++ b/arch/arm64/kvm/reset.c > @@ -205,6 +205,11 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu) > } > > void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) > +{ > + > +} > + > +int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) > { > kfree(vcpu->arch.sve_state); > } nit: warning: control reaches end of non-void function > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > index aac4e5a1a521..b38088415cde 100644 > --- a/virt/kvm/arm/arm.c > +++ b/virt/kvm/arm/arm.c > @@ -298,6 +298,8 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) > kvm_mmu_free_memory_caches(vcpu); > kvm_timer_vcpu_terminate(vcpu); > kvm_pmu_vcpu_destroy(vcpu); > + > + kvm_arm_vcpu_destroy(vcpu); > } > > int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) > -- > 2.22.0 > > _______________________________________________ Thanks, Christoffer
On Tue, Oct 22, 2019 at 01:43:42PM +0200, Christoffer Dall wrote: > On Mon, Oct 21, 2019 at 06:59:22PM -0700, Sean Christopherson wrote: > > Add an arm specific hook to free the arm64-only sve_state. Doing so > > eliminates the last functional code from kvm_arch_vcpu_uninit() across > > all architectures and paves the way for removing kvm_arch_vcpu_init() > > and kvm_arch_vcpu_uninit() entirely. > > > > Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> > > --- > > arch/arm/include/asm/kvm_host.h | 1 + > > arch/arm64/include/asm/kvm_host.h | 1 + > > arch/arm64/kvm/reset.c | 5 +++++ > > virt/kvm/arm/arm.c | 2 ++ > > 4 files changed, 9 insertions(+) > > > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > > index 8a37c8e89777..cc414de5acd3 100644 > > --- a/arch/arm/include/asm/kvm_host.h > > +++ b/arch/arm/include/asm/kvm_host.h > > @@ -333,6 +333,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} > > static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} > > static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} > > static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {} > > +static inline int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) {} > > > > static inline void kvm_arm_init_debug(void) {} > > static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {} > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index f656169db8c3..92d7c384a4ed 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -52,6 +52,7 @@ int kvm_arm_init_sve(void); > > > > int __attribute_const__ kvm_target_cpu(void); > > int kvm_reset_vcpu(struct kvm_vcpu *vcpu); > > +int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu); > > void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu); > > int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext); > > void __extended_idmap_trampoline(phys_addr_t boot_pgd, phys_addr_t idmap_start); > > diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c > > index f4a8ae918827..98abc4278f42 100644 > > --- a/arch/arm64/kvm/reset.c > > +++ b/arch/arm64/kvm/reset.c > > @@ -205,6 +205,11 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu) > > } > > > > void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) > > +{ > > + > > +} > > + > > +int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) > > { > > kfree(vcpu->arch.sve_state); > > } > > nit: warning: control reaches end of non-void function Doh, fixed. Thanks for the quick review!
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 8a37c8e89777..cc414de5acd3 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -333,6 +333,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {} +static inline int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) {} static inline void kvm_arm_init_debug(void) {} static inline void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) {} diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index f656169db8c3..92d7c384a4ed 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -52,6 +52,7 @@ int kvm_arm_init_sve(void); int __attribute_const__ kvm_target_cpu(void); int kvm_reset_vcpu(struct kvm_vcpu *vcpu); +int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu); void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu); int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext); void __extended_idmap_trampoline(phys_addr_t boot_pgd, phys_addr_t idmap_start); diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index f4a8ae918827..98abc4278f42 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -205,6 +205,11 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu) } void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) +{ + +} + +int kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) { kfree(vcpu->arch.sve_state); } diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index aac4e5a1a521..b38088415cde 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -298,6 +298,8 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) kvm_mmu_free_memory_caches(vcpu); kvm_timer_vcpu_terminate(vcpu); kvm_pmu_vcpu_destroy(vcpu); + + kvm_arm_vcpu_destroy(vcpu); } int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
Add an arm specific hook to free the arm64-only sve_state. Doing so eliminates the last functional code from kvm_arch_vcpu_uninit() across all architectures and paves the way for removing kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit() entirely. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/arm/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/reset.c | 5 +++++ virt/kvm/arm/arm.c | 2 ++ 4 files changed, 9 insertions(+)