From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752676AbdF1PKL (ORCPT ); Wed, 28 Jun 2017 11:10:11 -0400 Received: from foss.arm.com ([217.140.101.70]:43614 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752511AbdF1PF5 (ORCPT ); Wed, 28 Jun 2017 11:05:57 -0400 From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: Christoffer Dall , Thomas Gleixner , Jason Cooper , Eric Auger , Shanker Donthineni , Mark Rutland Subject: [PATCH v2 38/52] KVM: arm/arm64: GICv4: Wire init/teardown of per-VM support Date: Wed, 28 Jun 2017 16:03:57 +0100 Message-Id: <20170628150411.15846-39-marc.zyngier@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170628150411.15846-1-marc.zyngier@arm.com> References: <20170628150411.15846-1-marc.zyngier@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Should the HW support GICv4 and an ITS being associated with this VM, let's init the its_vm and its_vpe structures. Signed-off-by: Marc Zyngier --- virt/kvm/arm/vgic/vgic-init.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 3a0b8999f011..0de1f0d986d4 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c @@ -285,8 +285,14 @@ int vgic_init(struct kvm *kvm) if (ret) goto out; - if (vgic_has_its(kvm)) + if (vgic_has_its(kvm)) { dist->msis_require_devid = true; + if (kvm_vgic_global_state.has_gicv4) { + ret = vgic_v4_init(kvm); + if (ret) + goto out; + } + } kvm_for_each_vcpu(i, vcpu, kvm) kvm_vgic_vcpu_enable(vcpu); @@ -323,6 +329,9 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) kfree(dist->spis); dist->nr_spis = 0; + + if (kvm_vgic_global_state.has_gicv4 && vgic_has_its(kvm)) + vgic_v4_teardown(kvm); } void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Zyngier Subject: [PATCH v2 38/52] KVM: arm/arm64: GICv4: Wire init/teardown of per-VM support Date: Wed, 28 Jun 2017 16:03:57 +0100 Message-ID: <20170628150411.15846-39-marc.zyngier@arm.com> References: <20170628150411.15846-1-marc.zyngier@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 4A43940EFE for ; Wed, 28 Jun 2017 11:05:35 -0400 (EDT) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WopKCHJQurfR for ; Wed, 28 Jun 2017 11:05:33 -0400 (EDT) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 3ED9849C43 for ; Wed, 28 Jun 2017 11:05:33 -0400 (EDT) In-Reply-To: <20170628150411.15846-1-marc.zyngier@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: Jason Cooper , Thomas Gleixner List-Id: kvmarm@lists.cs.columbia.edu Should the HW support GICv4 and an ITS being associated with this VM, let's init the its_vm and its_vpe structures. Signed-off-by: Marc Zyngier --- virt/kvm/arm/vgic/vgic-init.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 3a0b8999f011..0de1f0d986d4 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c @@ -285,8 +285,14 @@ int vgic_init(struct kvm *kvm) if (ret) goto out; - if (vgic_has_its(kvm)) + if (vgic_has_its(kvm)) { dist->msis_require_devid = true; + if (kvm_vgic_global_state.has_gicv4) { + ret = vgic_v4_init(kvm); + if (ret) + goto out; + } + } kvm_for_each_vcpu(i, vcpu, kvm) kvm_vgic_vcpu_enable(vcpu); @@ -323,6 +329,9 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) kfree(dist->spis); dist->nr_spis = 0; + + if (kvm_vgic_global_state.has_gicv4 && vgic_has_its(kvm)) + vgic_v4_teardown(kvm); } void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: marc.zyngier@arm.com (Marc Zyngier) Date: Wed, 28 Jun 2017 16:03:57 +0100 Subject: [PATCH v2 38/52] KVM: arm/arm64: GICv4: Wire init/teardown of per-VM support In-Reply-To: <20170628150411.15846-1-marc.zyngier@arm.com> References: <20170628150411.15846-1-marc.zyngier@arm.com> Message-ID: <20170628150411.15846-39-marc.zyngier@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Should the HW support GICv4 and an ITS being associated with this VM, let's init the its_vm and its_vpe structures. Signed-off-by: Marc Zyngier --- virt/kvm/arm/vgic/vgic-init.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 3a0b8999f011..0de1f0d986d4 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c @@ -285,8 +285,14 @@ int vgic_init(struct kvm *kvm) if (ret) goto out; - if (vgic_has_its(kvm)) + if (vgic_has_its(kvm)) { dist->msis_require_devid = true; + if (kvm_vgic_global_state.has_gicv4) { + ret = vgic_v4_init(kvm); + if (ret) + goto out; + } + } kvm_for_each_vcpu(i, vcpu, kvm) kvm_vgic_vcpu_enable(vcpu); @@ -323,6 +329,9 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) kfree(dist->spis); dist->nr_spis = 0; + + if (kvm_vgic_global_state.has_gicv4 && vgic_has_its(kvm)) + vgic_v4_teardown(kvm); } void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) -- 2.11.0