]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
KVM: arm64: Copy FGT traps to unprotected pKVM VCPU on VCPU load
authorAlexandru Elisei <alexandru.elisei@arm.com>
Tue, 16 Dec 2025 10:30:50 +0000 (10:30 +0000)
committerOliver Upton <oupton@kernel.org>
Thu, 8 Jan 2026 20:56:17 +0000 (12:56 -0800)
commit145cc42fe1217c66174c44c4034cc0fe3040bbb0
treeaebe3be5b34717a484c915839c8a50947910b481
parent8d8e882c2b4b73a3f894c3cad74718b633e3d166
KVM: arm64: Copy FGT traps to unprotected pKVM VCPU on VCPU load

Commit fb10ddf35c1c ("KVM: arm64: Compute per-vCPU FGTs at vcpu_load()")
introduced per-VCPU FGT traps. For an unprotected pKVM VCPU, the untrusted
host FGT configuration is copied in pkvm_vcpu_init_traps(), which is called
from __pkvm_init_vcpu(). __pkvm_init_vcpu() is called once per VCPU (when
the VCPU is first run) which means that the uninitialized, zero, values for
the FGT registers end up being used for the entire lifetime of the VCPU.
This causes both unwanted traps (for the inverse polarity trap bits) and
the guest being allowed to access registers it shouldn't.

Fix it by copying the FGT traps for unprotected pKVM VCPUs when the
untrusted host loads the VCPU.

Fixes: fb10ddf35c1c ("KVM: arm64: Compute per-vCPU FGTs at vcpu_load()")
Acked-by: Will Deacon <will@kernel.org>
Tested-by: Fuad Tabba <tabba@google.com>
Reviewed-by: Fuad Tabba <tabba@google.com>
Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Link: https://msgid.link/20251216103053.47224-2-alexandru.elisei@arm.com
Signed-off-by: Oliver Upton <oupton@kernel.org>
arch/arm64/kvm/hyp/nvhe/hyp-main.c
arch/arm64/kvm/hyp/nvhe/pkvm.c