Commit efe4d36a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-4.3-rc2-2' of... 

Merge tag 'kvm-arm-for-4.3-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

Second set of KVM/ARM changes for 4.3-rc2

- Workaround for a Cortex-A57 erratum
- Bug fix for the debugging infrastructure
- Fix for 32bit guests with more than 4GB of address space
  on a 32bit host
- A number of fixes for the (unusual) case when we don't use
  the in-kernel GIC emulation
- Removal of ThumbEE handling on arm64, since these have been
  dropped from the architecture before anyone actually ever
  built a CPU
- Remove the KVM_ARM_MAX_VCPUS limitation which has become
  fairly pointless
parents 9bf9fde2 ef748917

arch/arm/include/asm/kvm_host.h

+2 −6
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ 


#define __KVM_HAVE_ARCH_INTC_INITIALIZED



#if defined(CONFIG_KVM_ARM_MAX_VCPUS)

#define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS

#else

#define KVM_MAX_VCPUS 0

#endif



#define KVM_USER_MEM_SLOTS 32

#define KVM_PRIVATE_MEM_SLOTS 4

#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
@@ -44,6 +38,8 @@ 


#include <kvm/arm_vgic.h>



#define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS



u32 *kvm_vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num, u32 mode);

int __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);

arch/arm/kvm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -45,15 +45,4 @@ config KVM_ARM_HOST 
	---help---

	  Provides host support for ARM processors.



config KVM_ARM_MAX_VCPUS

	int "Number maximum supported virtual CPUs per VM"

	depends on KVM_ARM_HOST

	default 4

	help

	  Static number of max supported virtual CPUs per VM.



	  If you choose a high number, the vcpu structures will be quite

	  large, so only choose a reasonable number that you expect to

	  actually use.



endif # VIRTUALIZATION

arch/arm/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) 
	 * Map the VGIC hardware resources before running a vcpu the first

	 * time on this VM.

	 */

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

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

		ret = kvm_vgic_map_resources(kvm);

		if (ret)

			return ret;

arch/arm/kvm/interrupts_head.S

+4 −2
Original line number Diff line number Diff line
@@ -515,8 +515,7 @@ ARM_BE8(rev r6, r6 ) 


	mrc	p15, 0, r2, c14, c3, 1	@ CNTV_CTL

	str	r2, [vcpu, #VCPU_TIMER_CNTV_CTL]

	bic	r2, #1			@ Clear ENABLE

	mcr	p15, 0, r2, c14, c3, 1	@ CNTV_CTL



	isb



	mrrc	p15, 3, rr_lo_hi(r2, r3), c14	@ CNTV_CVAL
@@ -529,6 +528,9 @@ ARM_BE8(rev r6, r6 ) 
	mcrr	p15, 4, r2, r2, c14	@ CNTVOFF



1:

	mov	r2, #0			@ Clear ENABLE

	mcr	p15, 0, r2, c14, c3, 1	@ CNTV_CTL



	@ Allow physical timer/counter access for the host

	mrc	p15, 4, r2, c14, c1, 0	@ CNTHCTL

	orr	r2, r2, #(CNTHCTL_PL1PCEN | CNTHCTL_PL1PCTEN)

arch/arm/kvm/mmu.c

+4 −2
Original line number Diff line number Diff line
@@ -1792,8 +1792,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
		if (vma->vm_flags & VM_PFNMAP) {

			gpa_t gpa = mem->guest_phys_addr +

				    (vm_start - mem->userspace_addr);

			phys_addr_t pa = (vma->vm_pgoff << PAGE_SHIFT) +

					 vm_start - vma->vm_start;

			phys_addr_t pa;



			pa = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT;

			pa += vm_start - vma->vm_start;



			/* IO region dirty page logging not allowed */

			if (memslot->flags & KVM_MEM_LOG_DIRTY_PAGES)

CRA Git | Maintained and supported by SUSTech CRA and CCSE