From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Martin Subject: Re: [PATCH v7 21/27] KVM: arm/arm64: Add hook for arch-specific KVM initialisation Date: Thu, 4 Apr 2019 15:53:55 +0100 Message-ID: <20190404145354.GG3567@e103592.cambridge.arm.com> References: <1553864452-15080-1-git-send-email-Dave.Martin@arm.com> <1553864452-15080-22-git-send-email-Dave.Martin@arm.com> <20190404142528.pxo3vrnk6mfsgmyq@kamzik.brq.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20190404142528.pxo3vrnk6mfsgmyq@kamzik.brq.redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Andrew Jones Cc: Okamoto Takayuki , Christoffer Dall , Ard Biesheuvel , Marc Zyngier , Catalin Marinas , Will Deacon , Zhang Lei , Julien Grall , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org List-Id: kvmarm@lists.cs.columbia.edu On Thu, Apr 04, 2019 at 04:25:28PM +0200, Andrew Jones wrote: > On Fri, Mar 29, 2019 at 01:00:46PM +0000, Dave Martin wrote: > > This patch adds a kvm_arm_init_arch_resources() hook to perform > > subarch-specific initialisation when starting up KVM. > > > > This will be used in a subsequent patch for global SVE-related > > setup on arm64. > > > > No functional change. > > > > Signed-off-by: Dave Martin > > Reviewed-by: Julien Thierry > > Tested-by: zhang.lei > > --- > > arch/arm/include/asm/kvm_host.h | 2 ++ > > arch/arm64/include/asm/kvm_host.h | 2 ++ > > virt/kvm/arm/arm.c | 4 ++++ > > 3 files changed, 8 insertions(+) > > > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > > index 770d732..a49ee01 100644 > > --- a/arch/arm/include/asm/kvm_host.h > > +++ b/arch/arm/include/asm/kvm_host.h > > @@ -53,6 +53,8 @@ > > > > DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use); > > > > +static inline int kvm_arm_init_arch_resources(void) { return 0; } > > + > > u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode); > > int __attribute_const__ kvm_target_cpu(void); > > int kvm_reset_vcpu(struct kvm_vcpu *vcpu); > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index 205438a..3e89509 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -58,6 +58,8 @@ > > > > DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use); > > > > +static inline int kvm_arm_init_arch_resources(void) { return 0; } > > + > > int __attribute_const__ kvm_target_cpu(void); > > int kvm_reset_vcpu(struct kvm_vcpu *vcpu); > > int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext); > > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > > index 99c3738..c69e137 100644 > > --- a/virt/kvm/arm/arm.c > > +++ b/virt/kvm/arm/arm.c > > @@ -1664,6 +1664,10 @@ int kvm_arch_init(void *opaque) > > if (err) > > return err; > > > > + err = kvm_arm_init_arch_resources(); > > + if (err) > > + return err; > > + > > if (!in_hyp_mode) { > > err = init_hyp_mode(); > > if (err) > > -- > > 2.1.4 > > > > It's not clear to me from the commit message why init_common_resources() > won't work for this. Maybe it'll be more clear as I continue the review. init_common_resources() is for stuff common to arm and arm64. kvm_arm_init_arch_resources() is intended for stuff specific to the particular arch backend. Maybe there is a better name for this. Cheers ---Dave 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.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham 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 C1A98C4360F for ; Thu, 4 Apr 2019 14:54:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8D850205F4 for ; Thu, 4 Apr 2019 14:54:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ftvue+Bs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D850205F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=WEbix7cDbbJf9dJtmrUVBK/xVakS9WHfGv3SbbXPJD8=; b=ftvue+BsT5oL46 0X/AoDfLdW3hP09LIWTWGfLLn9N2MnyNrRHom/1p0R1BX7RvS1olCdDm+8v7TuppWeVCpG/gsgrEy WCwpBXCZtGaINLwok2zNKWm3plHCl1+nEcqCaz6d6ddtzXpL5+wynst7JDOmpqrKxZ/zscFMVuccs 62b3k3zrU1iuqJT3uatj/GbiBAG9BbFP4X5tTufFy0kitC4RRDRWu8Mex3bFm17h3JEBse6OODlk2 GtJ5TGKs1sQvXf+cS1u4me21003MhYpt6RzKaxrxXmtN/hhgJb2MbV47lgHIcWzc2EYHbJ6n+3yuF aC4RrFyWQQFKeGZbsT9A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hC3kh-0008QI-8O; Thu, 04 Apr 2019 14:54:03 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hC3kd-0008OF-Uf for linux-arm-kernel@lists.infradead.org; Thu, 04 Apr 2019 14:54:01 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7ABDF169E; Thu, 4 Apr 2019 07:53:59 -0700 (PDT) Received: from e103592.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 886ED3F59C; Thu, 4 Apr 2019 07:53:57 -0700 (PDT) Date: Thu, 4 Apr 2019 15:53:55 +0100 From: Dave Martin To: Andrew Jones Subject: Re: [PATCH v7 21/27] KVM: arm/arm64: Add hook for arch-specific KVM initialisation Message-ID: <20190404145354.GG3567@e103592.cambridge.arm.com> References: <1553864452-15080-1-git-send-email-Dave.Martin@arm.com> <1553864452-15080-22-git-send-email-Dave.Martin@arm.com> <20190404142528.pxo3vrnk6mfsgmyq@kamzik.brq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190404142528.pxo3vrnk6mfsgmyq@kamzik.brq.redhat.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190404_075359_991355_5546B2C1 X-CRM114-Status: GOOD ( 20.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Okamoto Takayuki , Christoffer Dall , Ard Biesheuvel , Marc Zyngier , Catalin Marinas , Will Deacon , Zhang Lei , Julien Grall , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Apr 04, 2019 at 04:25:28PM +0200, Andrew Jones wrote: > On Fri, Mar 29, 2019 at 01:00:46PM +0000, Dave Martin wrote: > > This patch adds a kvm_arm_init_arch_resources() hook to perform > > subarch-specific initialisation when starting up KVM. > > > > This will be used in a subsequent patch for global SVE-related > > setup on arm64. > > > > No functional change. > > > > Signed-off-by: Dave Martin > > Reviewed-by: Julien Thierry > > Tested-by: zhang.lei > > --- > > arch/arm/include/asm/kvm_host.h | 2 ++ > > arch/arm64/include/asm/kvm_host.h | 2 ++ > > virt/kvm/arm/arm.c | 4 ++++ > > 3 files changed, 8 insertions(+) > > > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > > index 770d732..a49ee01 100644 > > --- a/arch/arm/include/asm/kvm_host.h > > +++ b/arch/arm/include/asm/kvm_host.h > > @@ -53,6 +53,8 @@ > > > > DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use); > > > > +static inline int kvm_arm_init_arch_resources(void) { return 0; } > > + > > u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode); > > int __attribute_const__ kvm_target_cpu(void); > > int kvm_reset_vcpu(struct kvm_vcpu *vcpu); > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index 205438a..3e89509 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -58,6 +58,8 @@ > > > > DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use); > > > > +static inline int kvm_arm_init_arch_resources(void) { return 0; } > > + > > int __attribute_const__ kvm_target_cpu(void); > > int kvm_reset_vcpu(struct kvm_vcpu *vcpu); > > int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext); > > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > > index 99c3738..c69e137 100644 > > --- a/virt/kvm/arm/arm.c > > +++ b/virt/kvm/arm/arm.c > > @@ -1664,6 +1664,10 @@ int kvm_arch_init(void *opaque) > > if (err) > > return err; > > > > + err = kvm_arm_init_arch_resources(); > > + if (err) > > + return err; > > + > > if (!in_hyp_mode) { > > err = init_hyp_mode(); > > if (err) > > -- > > 2.1.4 > > > > It's not clear to me from the commit message why init_common_resources() > won't work for this. Maybe it'll be more clear as I continue the review. init_common_resources() is for stuff common to arm and arm64. kvm_arm_init_arch_resources() is intended for stuff specific to the particular arch backend. Maybe there is a better name for this. Cheers ---Dave _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel