Commit 8a511e7e 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:

   - Fix EL2 Stage-1 MMIO mappings where a random address was used

   - Fix SMCCC function number comparison when the SVE hint is set

  RISC-V:

   - Fix KVM_GET_REG_LIST API for ISA_EXT registers

   - Fix reading ISA_EXT register of a missing extension

   - Fix ISA_EXT register handling in get-reg-list test

   - Fix filtering of AIA registers in get-reg-list test

  x86:

   - Fixes for TSC_AUX virtualization

   - Stop zapping page tables asynchronously, since we don't zap them as
     often as before"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: Do not use user return MSR support for virtualized TSC_AUX
  KVM: SVM: Fix TSC_AUX virtualization setup
  KVM: SVM: INTERCEPT_RDTSCP is never intercepted anyway
  KVM: x86/mmu: Stop zapping invalidated TDP MMU roots asynchronously
  KVM: x86/mmu: Do not filter address spaces in for_each_tdp_mmu_root_yield_safe()
  KVM: x86/mmu: Open code leaf invalidation from mmu_notifier
  KVM: riscv: selftests: Selectively filter-out AIA registers
  KVM: riscv: selftests: Fix ISA_EXT register handling in get-reg-list
  RISC-V: KVM: Fix riscv_vcpu_get_isa_ext_single() for missing extensions
  RISC-V: KVM: Fix KVM_GET_REG_LIST API for ISA_EXT registers
  KVM: selftests: Assert that vasprintf() is successful
  KVM: arm64: nvhe: Ignore SVE hint in SMCCC function ID
  KVM: arm64: Properly return allocated EL2 VA from hyp_alloc_private_va_range()
parents 5edc6bb3 5804c19b

arch/arm64/include/asm/kvm_hyp.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void deactivate_traps_vhe_put(struct kvm_vcpu *vcpu); 


u64 __guest_enter(struct kvm_vcpu *vcpu);



bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt);

bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt, u32 func_id);



#ifdef __KVM_NVHE_HYPERVISOR__

void __noreturn __hyp_do_panic(struct kvm_cpu_context *host_ctxt, u64 spsr,

arch/arm64/kvm/hyp/include/nvhe/ffa.h

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ 
#define FFA_MAX_FUNC_NUM 0x7F



int hyp_ffa_init(void *pages);

bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt);

bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id);



#endif /* __KVM_HYP_FFA_H */

arch/arm64/kvm/hyp/nvhe/ffa.c

+1 −2
Original line number Diff line number Diff line
@@ -634,9 +634,8 @@ static bool do_ffa_features(struct arm_smccc_res *res, 
	return true;

}



bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt)

bool kvm_host_ffa_handler(struct kvm_cpu_context *host_ctxt, u32 func_id)

{

	DECLARE_REG(u64, func_id, host_ctxt, 0);

	struct arm_smccc_res res;



	/*

arch/arm64/kvm/hyp/nvhe/hyp-init.S

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ __do_hyp_init: 
	cmp	x0, #HVC_STUB_HCALL_NR

	b.lo	__kvm_handle_stub_hvc



	bic	x0, x0, #ARM_SMCCC_CALL_HINTS

	mov	x3, #KVM_HOST_SMCCC_FUNC(__kvm_hyp_init)

	cmp	x0, x3

	b.eq	1f

arch/arm64/kvm/hyp/nvhe/hyp-main.c

+6 −2
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ static void handle_host_hcall(struct kvm_cpu_context *host_ctxt) 
	if (static_branch_unlikely(&kvm_protected_mode_initialized))

		hcall_min = __KVM_HOST_SMCCC_FUNC___pkvm_prot_finalize;



	id &= ~ARM_SMCCC_CALL_HINTS;

	id -= KVM_HOST_SMCCC_ID(0);



	if (unlikely(id < hcall_min || id >= ARRAY_SIZE(host_hcall)))
@@ -392,11 +393,14 @@ static void default_host_smc_handler(struct kvm_cpu_context *host_ctxt) 


static void handle_host_smc(struct kvm_cpu_context *host_ctxt)

{

	DECLARE_REG(u64, func_id, host_ctxt, 0);

	bool handled;



	handled = kvm_host_psci_handler(host_ctxt);

	func_id &= ~ARM_SMCCC_CALL_HINTS;



	handled = kvm_host_psci_handler(host_ctxt, func_id);

	if (!handled)

		handled = kvm_host_ffa_handler(host_ctxt);

		handled = kvm_host_ffa_handler(host_ctxt, func_id);

	if (!handled)

		default_host_smc_handler(host_ctxt);