Commit 24625f7d 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:
 "While last week's pull request contained miscellaneous fixes for x86,
  this one covers other architectures, selftests changes, and a bigger
  series for APIC virtualization bugs that were discovered during 5.20
  development. The idea is to base 5.20 development for KVM on top of
  this tag.

  ARM64:

   - Properly reset the SVE/SME flags on vcpu load

   - Fix a vgic-v2 regression regarding accessing the pending state of a
     HW interrupt from userspace (and make the code common with vgic-v3)

   - Fix access to the idreg range for protected guests

   - Ignore 'kvm-arm.mode=protected' when using VHE

   - Return an error from kvm_arch_init_vm() on allocation failure

   - A bunch of small cleanups (comments, annotations, indentation)

  RISC-V:

   - Typo fix in arch/riscv/kvm/vmid.c

   - Remove broken reference pattern from MAINTAINERS entry

  x86-64:

   - Fix error in page tables with MKTME enabled

   - Dirty page tracking performance test extended to running a nested
     guest

   - Disable APICv/AVIC in cases that it cannot implement correctly"

[ This merge also fixes a misplaced end parenthesis bug introduced in
  commit 3743c2f0 ("KVM: x86: inhibit APICv/AVIC on changes to APIC
  ID or APIC base") pointed out by Sean Christopherson ]

Link: https://lore.kernel.org/all/20220610191813.371682-1-seanjc@google.com/

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (34 commits)
  KVM: selftests: Restrict test region to 48-bit physical addresses when using nested
  KVM: selftests: Add option to run dirty_log_perf_test vCPUs in L2
  KVM: selftests: Clean up LIBKVM files in Makefile
  KVM: selftests: Link selftests directly with lib object files
  KVM: selftests: Drop unnecessary rule for STATIC_LIBS
  KVM: selftests: Add a helper to check EPT/VPID capabilities
  KVM: selftests: Move VMX_EPT_VPID_CAP_AD_BITS to vmx.h
  KVM: selftests: Refactor nested_map() to specify target level
  KVM: selftests: Drop stale function parameter comment for nested_map()
  KVM: selftests: Add option to create 2M and 1G EPT mappings
  KVM: selftests: Replace x86_page_size with PG_LEVEL_XX
  KVM: x86: SVM: fix nested PAUSE filtering when L0 intercepts PAUSE
  KVM: x86: SVM: drop preempt-safe wrappers for avic_vcpu_load/put
  KVM: x86: disable preemption around the call to kvm_arch_vcpu_{un|}blocking
  KVM: x86: disable preemption while updating apicv inhibition
  KVM: x86: SVM: fix avic_kick_target_vcpus_fast
  KVM: x86: SVM: remove avic's broken code that updated APIC ID
  KVM: x86: inhibit APICv/AVIC on changes to APIC ID or APIC base
  KVM: x86: document AVIC/APICv inhibit reasons
  KVM: x86/mmu: Set memory encryption "value", not "mask", in shadow PDPTRs
  ...
parents 8e8afafb e0f3f46e

Documentation/admin-guide/kernel-parameters.txt

+0 −1
Original line number Diff line number Diff line
@@ -2469,7 +2469,6 @@ 


			protected: nVHE-based mode with support for guests whose

				   state is kept private from the host.

				   Not valid if the kernel is running in EL2.



			Defaults to VHE/nVHE based on hardware support. Setting

			mode to "protected" will disable kexec and hibernation

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -10872,7 +10872,6 @@ F: arch/riscv/include/asm/kvm* 
F:	arch/riscv/include/uapi/asm/kvm*

F:	arch/riscv/kvm/

F:	tools/testing/selftests/kvm/*/riscv/

F:	tools/testing/selftests/kvm/riscv/









KERNEL VIRTUAL MACHINE for s390 (KVM/s390)









M:	Christian Borntraeger <borntraeger@linux.ibm.com>
































arch/arm64/include/asm/kvm_host.h



+0
−5






























Original line number
Diff line number
Diff line







@@ -362,11 +362,6 @@ struct kvm_vcpu_arch {







	struct arch_timer_cpu timer_cpu;









	struct kvm_pmu pmu;



















	/*









	 * Anything that is not used directly from assembly code goes









	 * here.









	 */



















	/*









	 * Guest registers we preserve during guest debugging.









	 *
































arch/arm64/include/asm/virt.h



+3
−0






























Original line number
Diff line number
Diff line







@@ -113,6 +113,9 @@ static __always_inline bool has_vhe(void)







	/*









	 * Code only run in VHE/NVHE hyp context can assume VHE is present or









	 * absent. Otherwise fall back to caps.









	 * This allows the compiler to discard VHE-specific code from the









	 * nVHE object, reducing the number of external symbol references









	 * needed to link.









	 */









	if (is_vhe_hyp_code())









		return true;
































arch/arm64/kernel/cpufeature.c



+1
−9






























Original line number
Diff line number
Diff line







@@ -1974,15 +1974,7 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap)







#ifdef CONFIG_KVM









static bool is_kvm_protected_mode(const struct arm64_cpu_capabilities *entry, int __unused)









{









	if (kvm_get_mode() != KVM_MODE_PROTECTED)









		return false;



















	if (is_kernel_in_hyp_mode()) {









		pr_warn("Protected KVM not available with VHE\n");









		return false;









	}



















	return true;









	return kvm_get_mode() == KVM_MODE_PROTECTED;









}









#endif /* CONFIG_KVM */