[GIT PULL] KVM/arm64 fixes for 7.0, take #1

[GIT PULL] KVM/arm64 fixes for 7.0, take #1

[Marc Zyngier]

Paolo,

Here's the first set of KVM/arm64 fixes for 7.0. Most of it affects
pKVM (feature set, MMU), but we also have a GICv5 fix and a couple of
small cleanups. Details in the tag below.

Note that there is a very minor conflict with Linus' tree due to Kees'
patch having been applied to both trees. Whatever is in Linus' tree is
the right thing.

Please pull,

	M.

The following changes since commit 6316366129d2885fae07c2774f4b7ae0a45fb55d:

  Merge branch kvm-arm64/misc-6.20 into kvmarm-master/next (2026-02-05 09:17:58 +0000)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvmarm-fixes-7.0-1

for you to fetch changes up to 54e367cb94d6bef941bbc1132d9959dc73bd4b6f:

  KVM: arm64: Deduplicate ASID retrieval code (2026-02-25 12:19:33 +0000)

----------------------------------------------------------------
KVM/arm64 fixes for 7.0, take #1

- Make sure we don't leak any S1POE state from guest to guest when
  the feature is supported on the HW, but not enabled on the host

- Propagate the ID registers from the host into non-protected VMs
  managed by pKVM, ensuring that the guest sees the intended feature set

- Drop double kern_hyp_va() from unpin_host_sve_state(), which could
  bite us if we were to change kern_hyp_va() to not being idempotent

- Don't leak stage-2 mappings in protected mode

- Correctly align the faulting address when dealing with single page
  stage-2 mappings for PAGE_SIZE > 4kB

- Fix detection of virtualisation-capable GICv5 IRS, due to the
  maintainer being obviously fat fingered...

- Remove duplication of code retrieving the ASID for the purpose of
  S1 PT handling

- Fix slightly abusive const-ification in vgic_set_kvm_info()

----------------------------------------------------------------
Fuad Tabba (5):
      KVM: arm64: Hide S1POE from guests when not supported by the host
      KVM: arm64: Optimise away S1POE handling when not supported by host
      KVM: arm64: Fix ID register initialization for non-protected pKVM guests
      KVM: arm64: Remove redundant kern_hyp_va() in unpin_host_sve_state()
      KVM: arm64: Revert accidental drop of kvm_uninit_stage2_mmu() for non-NV VMs

Kees Cook (1):
      KVM: arm64: vgic: Handle const qualifier from gic_kvm_info allocation type

Marc Zyngier (2):
      KVM: arm64: Fix protected mode handling of pages larger than 4kB
      KVM: arm64: Deduplicate ASID retrieval code

Sascha Bischoff (1):
      irqchip/gic-v5: Fix inversion of IRS_IDR0.virt flag

 arch/arm64/include/asm/kvm_host.h   |  3 +-
 arch/arm64/include/asm/kvm_nested.h |  2 ++
 arch/arm64/kvm/at.c                 | 27 ++--------------
 arch/arm64/kvm/hyp/nvhe/pkvm.c      | 37 ++++++++++++++++++++--
 arch/arm64/kvm/mmu.c                | 12 +++----
 arch/arm64/kvm/nested.c             | 63 ++++++++++++++++++-------------------
 arch/arm64/kvm/sys_regs.c           |  3 ++
 arch/arm64/kvm/vgic/vgic-init.c     |  2 +-
 drivers/irqchip/irq-gic-v5-irs.c    |  2 +-
 9 files changed, 81 insertions(+), 70 deletions(-)

Re: [GIT PULL] KVM/arm64 fixes for 7.0, take #1

[Paolo Bonzini]

On Thu, Feb 26, 2026 at 11:51 AM Marc Zyngier <maz@kernel.org> wrote:
>
> Paolo,
>
> Here's the first set of KVM/arm64 fixes for 7.0. Most of it affects
> pKVM (feature set, MMU), but we also have a GICv5 fix and a couple of
> small cleanups. Details in the tag below.
>
> Note that there is a very minor conflict with Linus' tree due to Kees'
> patch having been applied to both trees. Whatever is in Linus' tree is
> the right thing.
>
> Please pull,

Pulled, thanks.

Paolo

>         M.
>
> The following changes since commit 6316366129d2885fae07c2774f4b7ae0a45fb55d:
>
>   Merge branch kvm-arm64/misc-6.20 into kvmarm-master/next (2026-02-05 09:17:58 +0000)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvmarm-fixes-7.0-1
>
> for you to fetch changes up to 54e367cb94d6bef941bbc1132d9959dc73bd4b6f:
>
>   KVM: arm64: Deduplicate ASID retrieval code (2026-02-25 12:19:33 +0000)
>
> ----------------------------------------------------------------
> KVM/arm64 fixes for 7.0, take #1
>
> - Make sure we don't leak any S1POE state from guest to guest when
>   the feature is supported on the HW, but not enabled on the host
>
> - Propagate the ID registers from the host into non-protected VMs
>   managed by pKVM, ensuring that the guest sees the intended feature set
>
> - Drop double kern_hyp_va() from unpin_host_sve_state(), which could
>   bite us if we were to change kern_hyp_va() to not being idempotent
>
> - Don't leak stage-2 mappings in protected mode
>
> - Correctly align the faulting address when dealing with single page
>   stage-2 mappings for PAGE_SIZE > 4kB
>
> - Fix detection of virtualisation-capable GICv5 IRS, due to the
>   maintainer being obviously fat fingered...
>
> - Remove duplication of code retrieving the ASID for the purpose of
>   S1 PT handling
>
> - Fix slightly abusive const-ification in vgic_set_kvm_info()
>
> ----------------------------------------------------------------
> Fuad Tabba (5):
>       KVM: arm64: Hide S1POE from guests when not supported by the host
>       KVM: arm64: Optimise away S1POE handling when not supported by host
>       KVM: arm64: Fix ID register initialization for non-protected pKVM guests
>       KVM: arm64: Remove redundant kern_hyp_va() in unpin_host_sve_state()
>       KVM: arm64: Revert accidental drop of kvm_uninit_stage2_mmu() for non-NV VMs
>
> Kees Cook (1):
>       KVM: arm64: vgic: Handle const qualifier from gic_kvm_info allocation type
>
> Marc Zyngier (2):
>       KVM: arm64: Fix protected mode handling of pages larger than 4kB
>       KVM: arm64: Deduplicate ASID retrieval code
>
> Sascha Bischoff (1):
>       irqchip/gic-v5: Fix inversion of IRS_IDR0.virt flag
>
>  arch/arm64/include/asm/kvm_host.h   |  3 +-
>  arch/arm64/include/asm/kvm_nested.h |  2 ++
>  arch/arm64/kvm/at.c                 | 27 ++--------------
>  arch/arm64/kvm/hyp/nvhe/pkvm.c      | 37 ++++++++++++++++++++--
>  arch/arm64/kvm/mmu.c                | 12 +++----
>  arch/arm64/kvm/nested.c             | 63 ++++++++++++++++++-------------------
>  arch/arm64/kvm/sys_regs.c           |  3 ++
>  arch/arm64/kvm/vgic/vgic-init.c     |  2 +-
>  drivers/irqchip/irq-gic-v5-irs.c    |  2 +-
>  9 files changed, 81 insertions(+), 70 deletions(-)
>