From nobody Mon Sep 28 21:07:48 2026 Received: from mta0.migadu.com (out-194.mta0.migadu.com [91.218.175.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93DF73AFD16 for ; Mon, 17 Aug 2026 10:32:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786962761; cv=none; b=Kn7YM2k7hgtrYPp/Xlx5j8PAcd4HmlCEriMMxQYKwNBr+/hGlOXHy9FtxfgjynubemPc6+ZUSb7BiwlPiRSDXyq47ksUG6MpnYERYpRxgJMXBRmNUcw3pMP1ENvyVuq497e50DjX0lsNPD47FDpiBE1bBnKEKf4mg3vXTZmmh7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786962761; c=relaxed/simple; bh=iOgWnCEhDGyg56J6gm4nwCS3dgCjFHT30oB0fu9Wrzc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lvee8MmeSeChjnrGhPpOLUJGygItwwDjHqM1J5FGQ6N6cYMhWbbG7tUBjyIjRnXPl2kYpttn21lAlfvV0wN6LSR/etG2HL/M+icbrM5kSzHSCUek6K2iZoIHmndbyNqHEqMVEsal+Usp+aTcnECfOms5JXMZa7j6YyMdZP/YkvI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=P0hIBph8; arc=none smtp.client-ip=91.218.175.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="P0hIBph8" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=iOgWnCEhDGyg56J6gm4nwCS3dgCjFHT30oB0fu9Wrzc=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1786962757; v=1; x=1787567557; b=P0hIBph8QvyowagfkE397x6s/R4i/4IuIugcN9foyvrA00O1OFkjuz4YdnxnxKIfCbprQoRt R/5jYwS5xKPhlUZqQLz/ARWELJPusR9nnaLI/3nZS7kyq7Onui07FfZUVOe+1K9RVj3KpWX4TmE AgZNq6Sx4+cqmLlka2c7Opv4= X-Envelope-To: linux-kernel@vger.kernel.org Received: from claudy.lan (37.156.72.212) by smtp.migadu.com with ESMTPS id 0a54397236c5e6e6; Mon, 17 Aug 2026 10:32:37 +0000 X-Migadu-Flow: FLOW_OUT From: Fuad Tabba To: Marc Zyngier , Oliver Upton , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Fuad Tabba , Will Deacon , Catalin Marinas , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Sascha Bischoff Subject: [PATCH v2 1/4] KVM: arm64: Validate the host-provided vgic model in pKVM Date: Mon, 17 Aug 2026 11:32:25 +0100 Message-Id: <20260817103228.1203140-2-fuad.tabba@linux.dev> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260817103228.1203140-1-fuad.tabba@linux.dev> References: <20260817103228.1203140-1-fuad.tabba@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" EL2 copies vgic_model from the host's struct kvm unchecked, and the nVHE world switch dispatches on it with no cpucap guard. A host writing KVM_DEV_TYPE_ARM_VGIC_V5 makes EL2 access GICv5 CPU interface registers, which are UNDEFINED without FEAT_GCIE and panic the hypervisor on any GICv3 machine. Accept only GICv3, the one model pKVM supports, forcing anything else to 0. Fixes: 9b8e3d4ca0e73 ("KVM: arm64: gic-v5: Implement GICv5 load/put and sav= e/restore") Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 24d6f164129ac..f41b92c50ad7d 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -340,13 +340,20 @@ static void pkvm_init_features_from_host(struct pkvm_= hyp_vm *hyp_vm, const struc { struct kvm *kvm =3D &hyp_vm->kvm; unsigned long host_arch_flags =3D READ_ONCE(host_kvm->arch.flags); + u32 vgic_model =3D READ_ONCE(host_kvm->arch.vgic.vgic_model); DECLARE_BITMAP(allowed_features, KVM_VCPU_MAX_FEATURES); =20 /* CTR_EL0 is always under host control, even for protected VMs. */ hyp_vm->kvm.arch.ctr_el0 =3D host_kvm->arch.ctr_el0; =20 - /* Preserve the vgic model so that GICv3 emulation works */ - hyp_vm->kvm.arch.vgic.vgic_model =3D host_kvm->arch.vgic.vgic_model; + /* + * GICv3 is the only model pKVM runs, and the GICv5 world switch + * touches registers UNDEFINED at EL2 without FEAT_GCIE. 0 is not a + * valid kvm_device_type: "no vgic". + */ + if (vgic_model !=3D KVM_DEV_TYPE_ARM_VGIC_V3) + vgic_model =3D 0; + hyp_vm->kvm.arch.vgic.vgic_model =3D vgic_model; =20 /* No restrictions for non-protected VMs. */ if (!kvm_vm_is_protected(kvm)) { --=20 2.39.5 From nobody Mon Sep 28 21:07:48 2026 Received: from mta0.migadu.com (out-199.mta0.migadu.com [91.218.175.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0171C3AFD16 for ; Mon, 17 Aug 2026 10:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786962765; cv=none; b=RHB5joBaNuEfoQwe4qTrJddvEnATcUjFYNh2KN30AJ9Z6pdogm0FENY8PtSXq/ImsfFavNfcT/llmmq3y3BihYAgPQcxZG1fI7sOwADNPC91hpn4Dg5gCKfGxcjzLkFWguMZD3h7hZTPHqWgdr6wSHQI5XSWdiTHyk9IXuVReXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786962765; c=relaxed/simple; bh=z4EwF+2nV6LNFiwYHiCvrW4hUIU64iI/tXAhjD2lNDA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BKJ9X1OpvTlHGtYBuHvW0M4uWL1eAwpdup+OBLOsgMcQbfEliXEwT4+JJqx9GfMytquU8kbv9buGSvUVmQdwXJfzK+ZwHFPoiolZtSiUxy+Qzy3VXAgGFSiP7m9wYnJJol2JqcdZlGvJEP/giSNlfycxspzrKOdiInWi8IgZCUU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=DpHbinOo; arc=none smtp.client-ip=91.218.175.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="DpHbinOo" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=z4EwF+2nV6LNFiwYHiCvrW4hUIU64iI/tXAhjD2lNDA=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1786962762; v=1; x=1787567562; b=DpHbinOouCJSN6ZYW3beYVCTQdQz7pjlqQps/hWYeCP9v3lAvD/u2qJ3kL3Tr4XeV0nd1J+W I+cMCo6BJHaNLItlxPAe4IYNXxM/XU5yV3ATq62EeSug5eyZ9Fle6LhdEcu4vqdqNeQX/s4v2bN mKN+LHmBMlrmVCuzHwKPYKzQ= X-Envelope-To: linux-kernel@vger.kernel.org Received: from claudy.lan (37.156.72.212) by smtp.migadu.com with ESMTPS id 7c0f32848ff2a96c; Mon, 17 Aug 2026 10:32:42 +0000 X-Migadu-Flow: FLOW_OUT From: Fuad Tabba To: Marc Zyngier , Oliver Upton , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Fuad Tabba , Will Deacon , Catalin Marinas , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Sascha Bischoff Subject: [PATCH v2 2/4] KVM: arm64: Reject the GICv5 CPU interface hypercalls under pKVM Date: Mon, 17 Aug 2026 11:32:26 +0100 Message-Id: <20260817103228.1203140-3-fuad.tabba@linux.dev> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260817103228.1203140-1-fuad.tabba@linux.dev> References: <20260817103228.1203140-1-fuad.tabba@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" __vgic_v5_save_apr() and __vgic_v5_restore_vmcr_apr() remain callable after pKVM finalises. pKVM never registers a GICv5 vgic, so neither has a valid caller in protected mode, and on a GICv3 machine both reach a register that is UNDEFINED at EL2 and panic the hypervisor. Reject both when protected mode is enabled. Fixes: af325e87af5da ("KVM: arm64: gic-v5: Add vgic-v5 save/restore hyp int= erface") Reviewed-by: Sascha Bischoff Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/h= yp-main.c index d3df96ed8ba42..a9afd350b1fb3 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -695,6 +695,9 @@ static void handle___vgic_v5_save_apr(struct kvm_cpu_co= ntext *host_ctxt) { DECLARE_REG(struct vgic_v5_cpu_if *, cpu_if, host_ctxt, 1); =20 + if (unlikely(is_protected_kvm_enabled())) + return; + __vgic_v5_save_apr(kern_hyp_va(cpu_if)); } =20 @@ -702,6 +705,9 @@ static void handle___vgic_v5_restore_vmcr_apr(struct kv= m_cpu_context *host_ctxt) { DECLARE_REG(struct vgic_v5_cpu_if *, cpu_if, host_ctxt, 1); =20 + if (unlikely(is_protected_kvm_enabled())) + return; + __vgic_v5_restore_vmcr_apr(kern_hyp_va(cpu_if)); } =20 --=20 2.39.5 From nobody Mon Sep 28 21:07:48 2026 Received: from mta1.migadu.com (out-58.mta1.migadu.com [95.215.58.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E35D83AFD16 for ; Mon, 17 Aug 2026 10:32:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.58 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786962770; cv=none; b=HctXvuQOLJlHAZQRpbBg1HrH4GsUu+XxEQRk3XtS2arhJwnsvuD/g/1g9cPI24tro8cszz3eKV2RmLarWDxSMfepg1yRmSL1jbc/R6pXMRTw3/UOaKnDprrGRiSUs+tGEFzmu1atjOiFmf5sEik5IBjUKx2PdgWi5slqWIGV1aQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786962770; c=relaxed/simple; bh=+Voqs9fAmTLL/s31z+dkjB9bPNGxddhWAjF+IcSVPVE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RBqJDTjIwm85DQskNTf3s40Aux1NZdMBt0/bfCQc2/hCV+nkXx7Nd2d62YCeK80ieXO5nhoPUkv5DYd1SX5QdlvSNdGeKxdyk6LRjSzPu7j2s3yp16cUoy3Cq+yo7PaaQCp/a7HIrVu9+Ona+Pntr0ORARXc8m8+YvLqLDhfCWI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=FoF1b/Hs; arc=none smtp.client-ip=95.215.58.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="FoF1b/Hs" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=+Voqs9fAmTLL/s31z+dkjB9bPNGxddhWAjF+IcSVPVE=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1786962766; v=1; x=1787567566; b=FoF1b/Hsy2TRdJ2C0KsApUN5kPhnPO+RebhnRmetmjNMvDjUwHZ4pVfkT9fQ8gKdgM+t4d9k jzkHI2AhmWMhQNXbimV5I7JBUmHFuvJ2PBE8JI3yDNS/gsEUNzW5IBoqISst0gFqe+CYTGyJY1D aaIzfTmUIkocvZx9VmUzBoDA= X-Envelope-To: linux-kernel@vger.kernel.org Received: from claudy.lan (37.156.72.212) by smtp.migadu.com with ESMTPS id dd3bab2071ab8f95; Mon, 17 Aug 2026 10:32:46 +0000 X-Migadu-Flow: FLOW_OUT From: Fuad Tabba To: Marc Zyngier , Oliver Upton , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Fuad Tabba , Will Deacon , Catalin Marinas , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Sascha Bischoff Subject: [PATCH v2 3/4] KVM: arm64: vgic: Do not access the GICv5 CPU interface from EL1 Date: Mon, 17 Aug 2026 11:32:27 +0100 Message-Id: <20260817103228.1203140-4-fuad.tabba@linux.dev> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260817103228.1203140-1-fuad.tabba@linux.dev> References: <20260817103228.1203140-1-fuad.tabba@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" can_access_vgic_from_kernel() excludes only the GICv3 system register interface, so on a native GICv5 system without FEAT_GCIE_LEGACY it returns true under nVHE. The kernel then saves and restores the CPU interface from EL1, where ICH_VMCR_EL2 and the ICH_PPI_* registers are UNDEFINED, and the nVHE world switch already does that work at EL2. Require VHE for GICv5 as for GICv3. Fixes: 9b8e3d4ca0e73 ("KVM: arm64: gic-v5: Implement GICv5 load/put and sav= e/restore") Reviewed-by: Sascha Bischoff Signed-off-by: Fuad Tabba --- arch/arm64/kvm/vgic/vgic.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic.c b/arch/arm64/kvm/vgic/vgic.c index 74bace10a22ed..df58c0042ed63 100644 --- a/arch/arm64/kvm/vgic/vgic.c +++ b/arch/arm64/kvm/vgic/vgic.c @@ -1042,11 +1042,15 @@ static void vgic_flush_lr_state(struct kvm_vcpu *vc= pu) static inline bool can_access_vgic_from_kernel(void) { /* - * GICv2 can always be accessed from the kernel because it is - * memory-mapped, and VHE systems can access GICv3 EL2 system - * registers. + * GICv3 and GICv5 drive the CPU interface through EL2 system + * registers, so only VHE reaches them from the kernel. GICv2 is + * memory-mapped and always reachable. */ - return !static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif) || has= _vhe(); + if (kvm_vgic_global_state.type =3D=3D VGIC_V5 || + static_branch_unlikely(&kvm_vgic_global_state.gicv3_cpuif)) + return has_vhe(); + + return true; } =20 static inline void vgic_save_state(struct kvm_vcpu *vcpu) --=20 2.39.5 From nobody Mon Sep 28 21:07:48 2026 Received: from mta0.migadu.com (out-210.mta0.migadu.com [91.218.175.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D0EE3C81B4 for ; Mon, 17 Aug 2026 10:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.210 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786962774; cv=none; b=D7esq/qr49ZgNVhaPVZH7v4/n39Ul6BRifNMWd8g3UMqgDbPuuVbkzG+Wrw8ri2n64tqYXhrw0UVzvD48pclSpmc6KB7TwyvO+wwoykwpG8B3u5oOUXGALY7GyCKtpil1qFHTZaDrIcKZYwdF3l2+hOLG6ufNLdVcXZxrhtluqg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786962774; c=relaxed/simple; bh=9mF2czhn+PnLAGkFt/8xXgdkUXHiz0TaF0VIj2w/Nqw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pGSWKKUclf9FJhEmquhwCj/48F9m7QdEi8cZj3CK0SQP80QabSylPaxEf1NDLTpjpJV3pIR5mTai+9AswZtbkM7xo7rvuSlbi0FThz032jWBWTcpOEysQ7FYZ1/k8vmd7/vWEMiAgMQ3ix87A9PjJp9BrSBDekqueEhtXwntTbw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=vVwx+pn9; arc=none smtp.client-ip=91.218.175.210 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="vVwx+pn9" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=9mF2czhn+PnLAGkFt/8xXgdkUXHiz0TaF0VIj2w/Nqw=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1786962771; v=1; x=1787567571; b=vVwx+pn9VmoUXHpPIJGgfvsGQ9k8w70YkxzXdXFEiiOWrPh/OfwgFra0xGYkh9vG+f2c0Ri+ GOEP8SIv3yvzBspZyM7+oReYX67pgKulMrqf2ARViGQ1z4T8b6FZClHoePHZQIvZjSShKnCQkur fM2dQZHI5yonQTVT8QTCnNPQ= X-Envelope-To: linux-kernel@vger.kernel.org Received: from claudy.lan (37.156.72.212) by smtp.migadu.com with ESMTPS id 39157fbb1d010fff; Mon, 17 Aug 2026 10:32:51 +0000 X-Migadu-Flow: FLOW_OUT From: Fuad Tabba To: Marc Zyngier , Oliver Upton , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Fuad Tabba , Will Deacon , Catalin Marinas , Joey Gouly , Suzuki K Poulose , Zenghui Yu , Sascha Bischoff Subject: [PATCH v2 4/4] KVM: arm64: Fix stale VGICv3 comments in the nVHE world switch Date: Mon, 17 Aug 2026 11:32:28 +0100 Message-Id: <20260817103228.1203140-5-fuad.tabba@linux.dev> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260817103228.1203140-1-fuad.tabba@linux.dev> References: <20260817103228.1203140-1-fuad.tabba@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" __hyp_vgic_save_state() and __hyp_vgic_restore_state() handle GICv5 as well as GICv3, but their comments name VGICv3 only. No functional change intended. Reviewed-by: Sascha Bischoff Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/swi= tch.c index 7318e3e6a5f36..6b9e20f6b31b3 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -110,7 +110,7 @@ static void __deactivate_traps(struct kvm_vcpu *vcpu) write_sysreg(__kvm_hyp_host_vector, vbar_el2); } =20 -/* Save VGICv3 state on non-VHE systems */ +/* Save vgic state on non-VHE systems */ static void __hyp_vgic_save_state(struct kvm_vcpu *vcpu) { if (vgic_is_v5(kern_hyp_va(vcpu->kvm))) { @@ -125,7 +125,7 @@ static void __hyp_vgic_save_state(struct kvm_vcpu *vcpu) } } =20 -/* Restore VGICv3 state on non-VHE systems */ +/* Restore vgic state on non-VHE systems */ static void __hyp_vgic_restore_state(struct kvm_vcpu *vcpu) { if (vgic_is_v5(kern_hyp_va(vcpu->kvm))) { --=20 2.39.5