Commit 2a190b22 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:
 "x86:
   - Fixes for the new scalable MMU
   - Fixes for migration of nested hypervisors on AMD
   - Fix for clang integrated assembler
   - Fix for left shift by 64 (UBSAN)
   - Small cleanups
   - Straggler SEV-ES patch

  ARM:
   - VM init cleanups
   - PSCI relay cleanups
   - Kill CONFIG_KVM_ARM_PMU
   - Fixup __init annotations
   - Fixup reg_to_encoding()
   - Fix spurious PMCR_EL0 access

  Misc:
   - selftests cleanups"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (38 commits)
  KVM: x86: __kvm_vcpu_halt can be static
  KVM: SVM: Add support for booting APs in an SEV-ES guest
  KVM: nSVM: cancel KVM_REQ_GET_NESTED_STATE_PAGES on nested vmexit
  KVM: nSVM: mark vmcb as dirty when forcingly leaving the guest mode
  KVM: nSVM: correctly restore nested_run_pending on migration
  KVM: x86/mmu: Clarify TDP MMU page list invariants
  KVM: x86/mmu: Ensure TDP MMU roots are freed after yield
  kvm: check tlbs_dirty directly
  KVM: x86: change in pv_eoi_get_pending() to make code more readable
  MAINTAINERS: Really update email address for Sean Christopherson
  KVM: x86: fix shift out of bounds reported by UBSAN
  KVM: selftests: Implement perf_test_util more conventionally
  KVM: selftests: Use vm_create_with_vcpus in create_vm
  KVM: selftests: Factor out guest mode code
  KVM/SVM: Remove leftover __svm_vcpu_run prototype from svm.c
  KVM: SVM: Add register operand to vmsave call in sev_es_vcpu_load
  KVM: x86/mmu: Optimize not-present/MMIO SPTE check in get_mmio_spte()
  KVM: x86/mmu: Use raw level to index into MMIO walks' sptes array
  KVM: x86/mmu: Get root level from walkers when retrieving MMIO SPTE
  KVM: x86/mmu: Use -1 to flag an undefined spte in get_mmio_spte()
  ...
parents 3e2a590a 872f36eb

Documentation/virt/kvm/api.rst

+7 −2
Original line number Diff line number Diff line
@@ -392,9 +392,14 @@ This ioctl is obsolete and has been removed. 


Errors:



  =====      =============================

  =======    ==============================================================

  EINTR      an unmasked signal is pending

  =====      =============================

  ENOEXEC    the vcpu hasn't been initialized or the guest tried to execute

             instructions from device memory (arm64)

  ENOSYS     data abort outside memslots with no syndrome info and

             KVM_CAP_ARM_NISV_TO_USER not enabled (arm64)

  EPERM      SVE feature set but not finalized (arm64)

  =======    ==============================================================



This ioctl is used to run a guest virtual cpu.  While there are no

explicit parameters, there is an implicit parameter block that can be

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -9776,7 +9776,7 @@ F: tools/testing/selftests/kvm/s390x/ 








KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)









M:	Paolo Bonzini <pbonzini@redhat.com>









R:	Sean Christopherson <sean.j.christopherson@intel.com>









R:	Sean Christopherson <seanjc@google.com>









R:	Vitaly Kuznetsov <vkuznets@redhat.com>









R:	Wanpeng Li <wanpengli@tencent.com>









R:	Jim Mattson <jmattson@google.com>
































arch/arm64/include/asm/kvm_host.h



+23
−0






























Original line number
Diff line number
Diff line







@@ -17,6 +17,7 @@







#include <linux/jump_label.h>









#include <linux/kvm_types.h>









#include <linux/percpu.h>









#include <linux/psci.h>









#include <asm/arch_gicv3.h>









#include <asm/barrier.h>









#include <asm/cpufeature.h>








@@ -240,6 +241,28 @@ struct kvm_host_data {







	struct kvm_pmu_events pmu_events;









};



















struct kvm_host_psci_config {









	/* PSCI version used by host. */









	u32 version;



















	/* Function IDs used by host if version is v0.1. */









	struct psci_0_1_function_ids function_ids_0_1;



















	bool psci_0_1_cpu_suspend_implemented;









	bool psci_0_1_cpu_on_implemented;









	bool psci_0_1_cpu_off_implemented;









	bool psci_0_1_migrate_implemented;









};



















extern struct kvm_host_psci_config kvm_nvhe_sym(kvm_host_psci_config);









#define kvm_host_psci_config CHOOSE_NVHE_SYM(kvm_host_psci_config)



















extern s64 kvm_nvhe_sym(hyp_physvirt_offset);









#define hyp_physvirt_offset CHOOSE_NVHE_SYM(hyp_physvirt_offset)



















extern u64 kvm_nvhe_sym(hyp_cpu_logical_map)[NR_CPUS];









#define hyp_cpu_logical_map CHOOSE_NVHE_SYM(hyp_cpu_logical_map)



















struct vcpu_reset_state {









	unsigned long	pc;









	unsigned long	r0;
































arch/arm64/kernel/cpufeature.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2568,7 +2568,7 @@ static void verify_hyp_capabilities(void)







	int parange, ipa_max;









	unsigned int safe_vmid_bits, vmid_bits;



















	if (!IS_ENABLED(CONFIG_KVM) || !IS_ENABLED(CONFIG_KVM_ARM_HOST))









	if (!IS_ENABLED(CONFIG_KVM))









		return;



















	safe_mmfr1 = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1);
































arch/arm64/kernel/smp.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -434,7 +434,7 @@ static void __init hyp_mode_check(void)







			   "CPU: CPUs started in inconsistent modes");









	else









		pr_info("CPU: All CPU(s) started at EL1\n");









	if (IS_ENABLED(CONFIG_KVM))









	if (IS_ENABLED(CONFIG_KVM) && !is_kernel_in_hyp_mode())









		kvm_compute_layout();









}