mbox series

[0/6] KVM/arm64: Minor/trivial fixes from pKVM mega-patch

Message ID 20220609121223.2551-1-will@kernel.org (mailing list archive)
Headers show
Series KVM/arm64: Minor/trivial fixes from pKVM mega-patch | expand

Message

Will Deacon June 9, 2022, 12:12 p.m. UTC 
Hi folks,

These six KVM/arm64 patches are very minor fixes (including "fixes" to
comments) which were previously posted as part of the pKVM mega-patch
but which can be merged independently of the rest of that. Marc -- I'm
not sure whether it's even worth taking these for 5.19, but here they
are so you can have a look and decide yourself.

Series based on 5.19-rc1.

Cheers,

Will

Cc: Marc Zyngier <maz@kernel.org>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>
Cc: kernel-team@android.com
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-arm-kernel@lists.infradead.org

--->8

Marc Zyngier (2):
  KVM: arm64: Handle all ID registers trapped for a protected VM
  KVM: arm64: Drop stale comment

Will Deacon (4):
  KVM: arm64: Return error from kvm_arch_init_vm() on allocation failure
  KVM: arm64: Ignore 'kvm-arm.mode=protected' when using VHE
  KVM: arm64: Extend comment in has_vhe()
  KVM: arm64: Remove redundant hyp_assert_lock_held() assertions

 .../admin-guide/kernel-parameters.txt         |  1 -
 arch/arm64/include/asm/kvm_host.h             |  5 ---
 arch/arm64/include/asm/virt.h                 |  3 ++
 arch/arm64/kernel/cpufeature.c                | 10 +----
 arch/arm64/kvm/arm.c                          | 10 ++++-
 arch/arm64/kvm/hyp/nvhe/mem_protect.c         |  4 --
 arch/arm64/kvm/hyp/nvhe/sys_regs.c            | 42 +++++++++++++++----
 7 files changed, 46 insertions(+), 29 deletions(-)

Comments

Marc Zyngier June 9, 2022, 12:19 p.m. UTC | #1 
On Thu, 09 Jun 2022 13:12:17 +0100,
Will Deacon <will@kernel.org> wrote:
> 
> Hi folks,
> 
> These six KVM/arm64 patches are very minor fixes (including "fixes" to
> comments) which were previously posted as part of the pKVM mega-patch
> but which can be merged independently of the rest of that. Marc -- I'm
> not sure whether it's even worth taking these for 5.19, but here they
> are so you can have a look and decide yourself.

They are all tragically simple, and patch 2 actually qualifies as a
fix (a legitimate guest would fail to run correctly).

Also, the pKVM series could do with a bit of diet, so I'm inclined to
take these in right now.

	M.
Marc Zyngier June 9, 2022, 12:26 p.m. UTC | #2 
On Thu, 9 Jun 2022 13:12:17 +0100, Will Deacon wrote:
> These six KVM/arm64 patches are very minor fixes (including "fixes" to
> comments) which were previously posted as part of the pKVM mega-patch
> but which can be merged independently of the rest of that. Marc -- I'm
> not sure whether it's even worth taking these for 5.19, but here they
> are so you can have a look and decide yourself.
> 
> Series based on 5.19-rc1.
> 
> [...]

Applied to fixes, thanks!

[1/6] KVM: arm64: Return error from kvm_arch_init_vm() on allocation failure
      commit: ae187fec75aa670a551d9662f83e3947d3f02a69
[2/6] KVM: arm64: Handle all ID registers trapped for a protected VM
      commit: fa7a17214488ef7df347dcd1a5594f69ea17f4dc
[3/6] KVM: arm64: Ignore 'kvm-arm.mode=protected' when using VHE
      commit: cde5042adf11b0a30a6ce0ec3d071afcf8d2efaf
[4/6] KVM: arm64: Extend comment in has_vhe()
      commit: 112f3bab41113dc53b4f35e9034b2208245bc002
[5/6] KVM: arm64: Remove redundant hyp_assert_lock_held() assertions
      commit: 5879c97f37022ff22a3f13174c24fcf2807fdbc0
[6/6] KVM: arm64: Drop stale comment
      commit: bcbfb588cf323929ac46767dd14e392016bbce04

Cheers,

	M.