From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 109E8CA9EB9 for ; Tue, 22 Oct 2019 11:44:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6ADA21872 for ; Tue, 22 Oct 2019 11:44:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388790AbfJVLoI (ORCPT ); Tue, 22 Oct 2019 07:44:08 -0400 Received: from [217.140.110.172] ([217.140.110.172]:50224 "EHLO foss.arm.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S2387729AbfJVLoI (ORCPT ); Tue, 22 Oct 2019 07:44:08 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 09D031576; Tue, 22 Oct 2019 04:43:44 -0700 (PDT) Received: from localhost (e113682-lin.copenhagen.arm.com [10.32.145.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 900613F71F; Tue, 22 Oct 2019 04:43:43 -0700 (PDT) Date: Tue, 22 Oct 2019 13:43:42 +0200 From: Christoffer Dall To: Sean Christopherson Cc: Marc Zyngier , James Hogan , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , kvm-ppc@vger.kernel.org, Wanpeng Li , kvm@vger.kernel.org, David Hildenbrand , Joerg Roedel , Cornelia Huck , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Vitaly Kuznetsov , kvmarm@lists.cs.columbia.edu, Jim Mattson Subject: Re: [PATCH 42/45] KVM: arm64: Free sve_state via arm specific hook Message-ID: <20191022114342.GB2652@e113682-lin.lund.arm.com> References: <20191022015925.31916-1-sean.j.christopherson@intel.com> <20191022015925.31916-43-sean.j.christopherson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191022015925.31916-43-sean.j.christopherson@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org 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 > --- > 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