Commit 6f00446c authored by Marc Zyngier's avatar Marc Zyngier Committed by Quentin Perret
Browse files

FROMGIT: KVM: arm64: Fix host's ZCR_EL2 restore on nVHE



We re-enter the EL1 host with CPTR_EL2.TZ set in order to
be able to lazily restore ZCR_EL2 when required.

However, the same CPTR_EL2 configuration also leads to trapping
when ZCR_EL2 is accessed from EL2. Duh!

Clear CPTR_EL2.TZ *before* writing to ZCR_EL2.

Fixes: beed0906 ("KVM: arm64: Trap host SVE accesses when the FPSIMD state is dirty")
Reported-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
(cherry picked from commit 5b087093
 git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

 next)
Signed-off-by: default avatarWill Deacon <willdeacon@google.com>
Bug: 178098380
Test: atest VirtualizationHostTestCases on an EL2-enabled device
Change-Id: Iea1c43f91edc32d176e351b80fd860d5f473fa19
parent b0671cd7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment