Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 333bce5a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-3.19-take2' of... 

Merge tag 'kvm-arm-for-3.19-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Second round of changes for KVM for arm/arm64 for v3.19; fixes reboot
problems, clarifies VCPU init, and fixes a regression concerning the
VGIC init flow.

Conflicts:
	arch/ia64/kvm/kvm-ia64.c [deleted in HEAD and modified in kvmarm]
parents ab646f54 05971120

Documentation/virtual/kvm/api.txt

+16 −1
Original line number Diff line number Diff line
@@ -2478,9 +2478,15 @@ return ENOEXEC for that vcpu. 
Note that because some registers reflect machine topology, all vcpus

should be created before this ioctl is invoked.



Userspace can call this function multiple times for a given vcpu, including

after the vcpu has been run. This will reset the vcpu to its initial

state. All calls to this function after the initial call must use the same

target and same set of feature flags, otherwise EINVAL will be returned.



Possible features:

	- KVM_ARM_VCPU_POWER_OFF: Starts the CPU in a power-off state.

	  Depends on KVM_CAP_ARM_PSCI.

	  Depends on KVM_CAP_ARM_PSCI.  If not set, the CPU will be powered on

	  and execute guest code when KVM_RUN is called.

	- KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode.

	  Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only).

	- KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 for the CPU.
@@ -2976,6 +2982,15 @@ HVC instruction based PSCI call from the vcpu. The 'type' field describes 
the system-level event type. The 'flags' field describes architecture

specific flags for the system-level event.



Valid values for 'type' are:

  KVM_SYSTEM_EVENT_SHUTDOWN -- the guest has requested a shutdown of the

   VM. Userspace is not obliged to honour this, and if it does honour

   this does not need to destroy the VM synchronously (ie it may call

   KVM_RUN again before shutdown finally occurs).

  KVM_SYSTEM_EVENT_RESET -- the guest has requested a reset of the VM.

   As with SHUTDOWN, userspace can choose to ignore the request, or

   to schedule the reset to occur in the future and may call KVM_RUN again.



		/* Fix the size of the union. */

		char padding[256];

	};

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu); 
void kvm_inject_dabt(struct kvm_vcpu *vcpu, unsigned long addr);

void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr);



static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)

{

	vcpu->arch.hcr = HCR_GUEST_MASK;

}



static inline bool vcpu_mode_is_32bit(struct kvm_vcpu *vcpu)

{

	return 1;

arch/arm/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ struct kvm_vcpu_stat { 
	u32 halt_wakeup;

};



int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,

			const struct kvm_vcpu_init *init);

int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);

unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);

int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);

arch/arm/include/asm/kvm_mmu.h

+4 −2
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ int create_hyp_io_mappings(void *from, void *to, phys_addr_t); 
void free_boot_hyp_pgd(void);

void free_hyp_pgds(void);



void stage2_unmap_vm(struct kvm *kvm);

int kvm_alloc_stage2_pgd(struct kvm *kvm);

void kvm_free_stage2_pgd(struct kvm *kvm);

int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,
@@ -161,9 +162,10 @@ static inline bool vcpu_has_cache_enabled(struct kvm_vcpu *vcpu) 
}



static inline void coherent_cache_guest_page(struct kvm_vcpu *vcpu, hva_t hva,

					     unsigned long size)

					     unsigned long size,

					     bool ipa_uncached)

{

	if (!vcpu_has_cache_enabled(vcpu))

	if (!vcpu_has_cache_enabled(vcpu) || ipa_uncached)

		kvm_flush_dcache_to_poc((void *)hva, size);

	

	/*

arch/arm/kvm/arm.c

+73 −5
Original line number Diff line number Diff line
@@ -213,6 +213,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
	int err;

	struct kvm_vcpu *vcpu;



	if (irqchip_in_kernel(kvm) && vgic_initialized(kvm)) {

		err = -EBUSY;

		goto out;

	}



	vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);

	if (!vcpu) {

		err = -ENOMEM;
@@ -263,6 +268,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
{

	/* Force users to call KVM_ARM_VCPU_INIT */

	vcpu->arch.target = -1;

	bitmap_zero(vcpu->arch.features, KVM_VCPU_MAX_FEATURES);



	/* Set up the timer */

	kvm_timer_vcpu_init(vcpu);
@@ -419,6 +425,7 @@ static void update_vttbr(struct kvm *kvm) 


static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = vcpu->kvm;

	int ret;



	if (likely(vcpu->arch.has_run_once))
@@ -427,15 +434,23 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) 
	vcpu->arch.has_run_once = true;



	/*

	 * Initialize the VGIC before running a vcpu the first time on

	 * this VM.

	 * Map the VGIC hardware resources before running a vcpu the first

	 * time on this VM.

	 */

	if (unlikely(!vgic_initialized(vcpu->kvm))) {

		ret = kvm_vgic_init(vcpu->kvm);

	if (unlikely(!vgic_ready(kvm))) {

		ret = kvm_vgic_map_resources(kvm);

		if (ret)

			return ret;

	}



	/*

	 * Enable the arch timers only if we have an in-kernel VGIC

	 * and it has been properly initialized, since we cannot handle

	 * interrupts from the virtual timer with a userspace gic.

	 */

	if (irqchip_in_kernel(kvm) && vgic_initialized(kvm))

		kvm_timer_enable(kvm);



	return 0;

}
@@ -649,6 +664,48 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, 
	return -EINVAL;

}



static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,

			       const struct kvm_vcpu_init *init)

{

	unsigned int i;

	int phys_target = kvm_target_cpu();



	if (init->target != phys_target)

		return -EINVAL;



	/*

	 * Secondary and subsequent calls to KVM_ARM_VCPU_INIT must

	 * use the same target.

	 */

	if (vcpu->arch.target != -1 && vcpu->arch.target != init->target)

		return -EINVAL;



	/* -ENOENT for unknown features, -EINVAL for invalid combinations. */

	for (i = 0; i < sizeof(init->features) * 8; i++) {

		bool set = (init->features[i / 32] & (1 << (i % 32)));



		if (set && i >= KVM_VCPU_MAX_FEATURES)

			return -ENOENT;



		/*

		 * Secondary and subsequent calls to KVM_ARM_VCPU_INIT must

		 * use the same feature set.

		 */

		if (vcpu->arch.target != -1 && i < KVM_VCPU_MAX_FEATURES &&

		    test_bit(i, vcpu->arch.features) != set)

			return -EINVAL;



		if (set)

			set_bit(i, vcpu->arch.features);

	}



	vcpu->arch.target = phys_target;



	/* Now we know what it is, we can reset it. */

	return kvm_reset_vcpu(vcpu);

}





static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu,

					 struct kvm_vcpu_init *init)

{
@@ -658,11 +715,22 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu, 
	if (ret)

		return ret;



	/*

	 * Ensure a rebooted VM will fault in RAM pages and detect if the

	 * guest MMU is turned off and flush the caches as needed.

	 */

	if (vcpu->arch.has_run_once)

		stage2_unmap_vm(vcpu->kvm);



	vcpu_reset_hcr(vcpu);



	/*

	 * Handle the "start in power-off" case by marking the VCPU as paused.

	 */

	if (__test_and_clear_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features))

	if (test_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features))

		vcpu->arch.pause = true;

	else

		vcpu->arch.pause = false;



	return 0;

}