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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 67888CCF2C4 for ; Sat, 17 Oct 2026 11:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:MIME-Version: References:In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jJmc5s72fxnzrSisazlCiSA9/N+0IuorH4FcHqR8R3Q=; b=sxY99QcpWXvUL3iQoH88BxguXl oeQUKuDZqzabRhauV7nKP3f/kWo7mTUTqYNVzYjSitxTcvOafFkajGRCq9zT/idWJ6vdhJ5xSrolw RANuUnyhY1uMOW+pPP+iTF9duZLRJThnuhwrSoMaAcTONVeSQuIAaelqOHgBGTxRm+hWHDcVb9srp TnzQ3HFTKInCeK8zNaLrYWgiYZ9FR8mul4bna/rysMPOPJttZPLnFMXW2IQ27qWAPBF60Rkw2L5PM PNmJksq5r/k8KoiKOkK5BewLJbw6m/pWVcROmB0JDQ19yjzO1CgDoqfQr3A+MUC/7aHmbRJS/5Wsi ekJcUgSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xI2tu-00000004jVi-0f44; Sat, 17 Oct 2026 11:48:34 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xI2tq-00000004jVV-3wNt for linux-arm-kernel@lists.infradead.org; Sat, 17 Oct 2026 11:48:31 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id D1A1D6022E; Sat, 17 Oct 2026 11:48:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E4251F000C4; Sat, 17 Oct 2026 11:48:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792237709; bh=jJmc5s72fxnzrSisazlCiSA9/N+0IuorH4FcHqR8R3Q=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=T6XsGeLv6DMHkSP68KPe1EP4tk+yLjiPAPERFWjp/cc64HhPR9M/EY5g4KzGqPhsq s9ZyCRe/Wte5Br0+77Xt/SJ59TP13Z5thDfc1ow5ctTsb09aF1aUA7Ev9UuUz1qUpJ ANXbRY3WzL6cdisADF0z+2IsINIYz4hwohQzHNGNTD9czKTtejHj4R3LfhP17TM/x0 jwrIaKz3earIeawjC36RR5TNjyjy7IbAWn2lpYVkAXgeGzWdCqpgIyjI1LvcQz4vAm 0iApAkw+VRn0SW96Vp1J3vzN4kN3lZukFsyqY0kIu2kTFL0WAX0XlSPWjAvtLDBD1m AQBhgOLqPYTIg== Received: from sofa.misterjones.org ([185.219.108.64] helo=lobster-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1xI2tn-0000000459f-0Czq; Sat, 17 Oct 2026 11:48:27 +0000 Date: Sat, 17 Oct 2026 12:51:41 +0100 Message-ID: <87y0bw8rzm.wl-maz@kernel.org> From: Marc Zyngier To: Sascha Bischoff Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, oupton@kernel.org, fuad.tabba@linux.dev, joey.gouly@arm.com, seiden@linux.ibm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Subject: Re: [PATCH 1/2] KVM: arm64: vgic: Require matching VGIC model for GICv3 ITS In-Reply-To: <20261016152225.898761-2-sascha.bischoff@arm.com> References: <20261016152225.898761-1-sascha.bischoff@arm.com> <20261016152225.898761-2-sascha.bischoff@arm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: sascha.bischoff@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, oupton@kernel.org, fuad.tabba@linux.dev, joey.gouly@arm.com, seiden@linux.ibm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 16 Oct 2026 16:22:23 +0100, Sascha Bischoff wrote: > > On a GICv5 host with legacy support, KVM registers both VGICv3 and > VGICv5 devices. A VM can create a GICv3 ITS with another VGIC model, > setting has_its even though that model cannot use the GICv3 ITS. > > Reject GICv3 ITS creation when the VM already has an incompatible VGIC. > KVM also permits creating an ITS before its VGIC, so record the model > required by the ITS and reject a later incompatible VGIC. Preserve > either creation order when the models match. > > Signed-off-by: Sascha Bischoff > --- > arch/arm64/kvm/vgic/vgic-init.c | 5 +++++ > arch/arm64/kvm/vgic/vgic-its.c | 9 +++++++++ > include/kvm/arm_vgic.h | 2 ++ > 3 files changed, 16 insertions(+) > > diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c > index b5ea1e39c6862..48a92555fa6ab 100644 > --- a/arch/arm64/kvm/vgic/vgic-init.c > +++ b/arch/arm64/kvm/vgic/vgic-init.c > @@ -125,6 +125,11 @@ int kvm_vgic_create(struct kvm *kvm, u32 type) > goto out_unlock; > } > > + if (kvm->arch.vgic.its_model && kvm->arch.vgic.its_model != type) { > + ret = -ENODEV; > + goto out_unlock; > + } > + > if (kvm_id_regs_final(kvm)) > goto out_unlock; > ret = 0; > diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c > index e5657cb603567..bf901626ea6df 100644 > --- a/arch/arm64/kvm/vgic/vgic-its.c > +++ b/arch/arm64/kvm/vgic/vgic-its.c > @@ -1875,6 +1875,14 @@ static int vgic_its_create(struct kvm_device *dev, u32 type) > > mutex_lock(&dev->kvm->arch.config_lock); > > + if ((irqchip_in_kernel(dev->kvm) && !vgic_is_v3(dev->kvm)) || > + (dev->kvm->arch.vgic.its_model && > + dev->kvm->arch.vgic.its_model != KVM_DEV_TYPE_ARM_VGIC_V3)) { > + mutex_unlock(&dev->kvm->arch.config_lock); > + kfree(its); > + return -ENODEV; > + } > + A comment would go a long way to make it clear what this is checking for: - if a GIC already exists and is not v3, fail - if an ITS already exists and is not v3, fail > if (vgic_initialized(dev->kvm)) { > ret = vgic_v4_init(dev->kvm); > if (ret < 0) { > @@ -1903,6 +1911,7 @@ static int vgic_its_create(struct kvm_device *dev, u32 type) > > dev->kvm->arch.vgic.msis_require_devid = true; > dev->kvm->arch.vgic.has_its = true; > + dev->kvm->arch.vgic.its_model = KVM_DEV_TYPE_ARM_VGIC_V3; > its->enabled = false; > its->dev = dev; > > diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h > index 7be81b936bf10..a2b6b328808ba 100644 > --- a/include/kvm/arm_vgic.h > +++ b/include/kvm/arm_vgic.h > @@ -548,6 +548,8 @@ struct vgic_dist { > struct vgic_io_device cpuif_iodev; > > bool has_its; > + /* VGIC model required by the VM's ITS devices. */ > + u32 its_model; I reckon that has_its and its_model can be made the same thing, since its_model == 0 indicates the lack of ITS, and it is otherwise the same as vgic_model. I ended up with this (untested). Thoughts? M. diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index 2d915769cdc7c..c70390b7fcab6 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -456,6 +456,9 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu) */ if (vcpu->vcpu_id >= kvm_vgic_global_state.max_gicv5_vcpus) return -EINVAL; + break; + default: + unreachable(); } return ret; @@ -572,6 +575,8 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) kfree(dist->vgic_v5_irs_data); dist->vgic_v5_irs_data = NULL; break; + default: + unreachable(); } xa_destroy(&dist->lpi_xa); diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c index 0ec461df74cd9..171e5e345c220 100644 --- a/arch/arm64/kvm/vgic/vgic-its.c +++ b/arch/arm64/kvm/vgic/vgic-its.c @@ -1963,7 +1963,6 @@ static int vgic_its_create(struct kvm_device *dev, u32 type) xa_init(&its->translation_cache); dev->kvm->arch.vgic.msis_require_devid = true; - dev->kvm->arch.vgic.has_its = true; dev->kvm->arch.vgic.its_model = KVM_DEV_TYPE_ARM_VGIC_V3; its->enabled = false; its->dev = dev; diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c index 636c576b2b99e..282fac37b6642 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c +++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c @@ -42,10 +42,7 @@ bool vgic_has_its(struct kvm *kvm) { struct vgic_dist *dist = &kvm->arch.vgic; - if (dist->vgic_model != KVM_DEV_TYPE_ARM_VGIC_V3) - return false; - - return dist->has_its; + return (dist->its_model == dist->vgic_model); } bool vgic_supports_direct_msis(struct kvm *kvm) diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index c4135815884b6..4b2c41917b77c 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -503,7 +503,9 @@ struct vgic_dist { bool initialized; /* vGIC model the kernel emulates for the guest (GICv2 or GICv3) */ - u32 vgic_model; + enum kvm_device_type vgic_model; + /* VGIC model required by the VM's ITS devices. */ + enum kvm_device_type its_model; /* Implementation revision as reported in the GICD_IIDR */ u32 implementation_rev; @@ -548,9 +550,6 @@ struct vgic_dist { struct vgic_io_device dist_iodev; struct vgic_io_device cpuif_iodev; - bool has_its; - /* VGIC model required by the VM's ITS devices. */ - u32 its_model; bool table_write_in_progress; /* -- Jazz isn't dead. It just smells funny.