[GIT PULL] KVM/arm64 fixes for 6.14, take #3

[Paolo Bonzini]

On Thu, Feb 20, 2025 at 6:44 PM Marc Zyngier <maz at kernel.org> wrote:
>
> Paolo,
>
> Another week, another set of fixes.
>
> This time around, we have a focus on MMU bugs, with one bug affecting
> hVHE EL2 stage-1 and picking the ASID from the wrong register, while
> the other affects VHE and allows it to run with a stale VMID value.
>
> Either way, this is ugly.
>
> Please pull,

Pulled, thanks.

Paolo

>         M.
>
> The following changes since commit 0ad2507d5d93f39619fc42372c347d6006b64319:
>
>   Linux 6.14-rc3 (2025-02-16 14:02:44 -0800)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvmarm-fixes-6.14-3
>
> for you to fetch changes up to fa808ed4e199ed17d878eb75b110bda30dd52434:
>
>   KVM: arm64: Ensure a VMID is allocated before programming VTTBR_EL2 (2025-02-20 16:29:28 +0000)
>
> ----------------------------------------------------------------
> KVM/arm64 fixes for 6.14, take #3
>
> - Fix TCR_EL2 configuration to not use the ASID in TTBR1_EL2
>   and not mess-up T1SZ/PS by using the HCR_EL2.E2H==0 layout.
>
> - Bring back the VMID allocation to the vcpu_load phase, ensuring
>   that we only setup VTTBR_EL2 once on VHE. This cures an ugly
>   race that would lead to running with an unallocated VMID.
>
> ----------------------------------------------------------------
> Oliver Upton (1):
>       KVM: arm64: Ensure a VMID is allocated before programming VTTBR_EL2
>
> Will Deacon (1):
>       KVM: arm64: Fix tcr_el2 initialisation in hVHE mode
>
>  arch/arm64/include/asm/kvm_arm.h  |  2 +-
>  arch/arm64/include/asm/kvm_host.h |  2 +-
>  arch/arm64/kvm/arm.c              | 37 +++++++++++++++++--------------------
>  arch/arm64/kvm/vmid.c             | 11 +++--------
>  4 files changed, 22 insertions(+), 30 deletions(-)
>