Commit 774206bc authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-5.11-1' of... 

Merge tag 'kvmarm-fixes-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 5.11, take #1

- VM init cleanups
- PSCI relay cleanups
- Kill CONFIG_KVM_ARM_PMU
- Fixup __init annotations
- Fixup reg_to_encoding()
- Fix spurious PMCR_EL0 access
parents 647daca2 45ba7b19

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

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
@@ -2558,7 +2558,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();

}

arch/arm64/kvm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -49,14 +49,6 @@ if KVM 


source "virt/kvm/Kconfig"



config KVM_ARM_PMU

	bool "Virtual Performance Monitoring Unit (PMU) support"

	depends on HW_PERF_EVENTS

	default y

	help

	  Adds support for a virtual Performance Monitoring Unit (PMU) in

	  virtual machines.



endif # KVM



endif # VIRTUALIZATION