Commit 949d0a46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "Arm:

   - 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... [his words, not mine]

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

   - Fix slightly abusive const-ification in vgic_set_kvm_info()

  Generic:

   - Remove internal Kconfigs that are now set on all architectures

   - Remove per-architecture code to enable KVM_CAP_SYNC_MMU, all
     architectures finally enable it in Linux 7.0"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: always define KVM_CAP_SYNC_MMU
  KVM: remove CONFIG_KVM_GENERIC_MMU_NOTIFIER
  KVM: arm64: Deduplicate ASID retrieval code
  irqchip/gic-v5: Fix inversion of IRS_IDR0.virt flag
  KVM: arm64: Revert accidental drop of kvm_uninit_stage2_mmu() for non-NV VMs
  KVM: arm64: Fix protected mode handling of pages larger than 4kB
  KVM: arm64: vgic: Handle const qualifier from gic_kvm_info allocation type
  KVM: arm64: Remove redundant kern_hyp_va() in unpin_host_sve_state()
  KVM: arm64: Fix ID register initialization for non-protected pKVM guests
  KVM: arm64: Optimise away S1POE handling when not supported by host
  KVM: arm64: Hide S1POE from guests when not supported by the host
parents e2bd1b13 55365ab8

Documentation/virt/kvm/api.rst

+4 −6
Original line number Diff line number Diff line
@@ -1396,7 +1396,10 @@ or its flags may be modified, but it may not be resized. 
Memory for the region is taken starting at the address denoted by the

field userspace_addr, which must point at user addressable memory for

the entire memory slot size.  Any object may back this memory, including

anonymous memory, ordinary files, and hugetlbfs.

anonymous memory, ordinary files, and hugetlbfs.  Changes in the backing

of the memory region are automatically reflected into the guest.

For example, an mmap() that affects the region will be made visible

immediately.  Another example is madvise(MADV_DROP).



On architectures that support a form of address tagging, userspace_addr must

be an untagged address.
@@ -1412,11 +1415,6 @@ use it. The latter can be set, if KVM_CAP_READONLY_MEM capability allows it, 
to make a new slot read-only.  In this case, writes to this memory will be

posted to userspace as KVM_EXIT_MMIO exits.



When the KVM_CAP_SYNC_MMU capability is available, changes in the backing of

the memory region are automatically reflected into the guest.  For example, an

mmap() that affects the region will be made visible immediately.  Another

example is madvise(MADV_DROP).



For TDX guest, deleting/moving memory region loses guest memory contents.

Read only region isn't supported.  Only as-id 0 is supported.

arch/arm64/include/asm/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -1616,7 +1616,8 @@ void kvm_set_vm_id_reg(struct kvm *kvm, u32 reg, u64 val); 
	(kvm_has_feat((k), ID_AA64MMFR3_EL1, S1PIE, IMP))



#define kvm_has_s1poe(k)				\

	(kvm_has_feat((k), ID_AA64MMFR3_EL1, S1POE, IMP))

	(system_supports_poe() &&			\

	 kvm_has_feat((k), ID_AA64MMFR3_EL1, S1POE, IMP))



#define kvm_has_ras(k)					\

	(kvm_has_feat((k), ID_AA64PFR0_EL1, RAS, IMP))

arch/arm64/include/asm/kvm_nested.h

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,8 @@ int kvm_vcpu_allocate_vncr_tlb(struct kvm_vcpu *vcpu); 
int kvm_handle_vncr_abort(struct kvm_vcpu *vcpu);

void kvm_handle_s1e2_tlbi(struct kvm_vcpu *vcpu, u32 inst, u64 val);



u16 get_asid_by_regime(struct kvm_vcpu *vcpu, enum trans_regime regime);



#define vncr_fixmap(c)						\

	({							\

		u32 __c = (c);					\

arch/arm64/kvm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ menuconfig KVM 
	bool "Kernel-based Virtual Machine (KVM) support"

	select KVM_COMMON

	select KVM_GENERIC_HARDWARE_ENABLING

	select KVM_GENERIC_MMU_NOTIFIER

	select HAVE_KVM_CPU_RELAX_INTERCEPT

	select KVM_MMIO

	select KVM_GENERIC_DIRTYLOG_READ_PROTECT

arch/arm64/kvm/arm.c

+0 −1
Original line number Diff line number Diff line
@@ -358,7 +358,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		break;

	case KVM_CAP_IOEVENTFD:

	case KVM_CAP_USER_MEMORY:

	case KVM_CAP_SYNC_MMU:

	case KVM_CAP_DESTROY_MEMORY_REGION_WORKS:

	case KVM_CAP_ONE_REG:

	case KVM_CAP_ARM_PSCI: