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

Commit 7f54492f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PPC: e500: include linux/export.h
  KVM: PPC: fix kvmppc_start_thread() for CONFIG_SMP=N
  KVM: PPC: protect use of kvmppc_h_pr
  KVM: PPC: move compute_tlbie_rb to book3s_64 common header
  KVM: Don't automatically expose the TSC deadline timer in cpuid
  KVM: Device assignment permission checks
  KVM: Remove ability to assign a device without iommu support
  KVM: x86: Prevent starting PIT timers in the absence of irqchip support
parents 6fd8fb7f fae9dbb4

Documentation/virtual/kvm/api.txt

+16 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,15 @@ emulate them efficiently. The fields in each entry are defined as follows: 
   eax, ebx, ecx, edx: the values returned by the cpuid instruction for

         this function/index combination



The TSC deadline timer feature (CPUID leaf 1, ecx[24]) is always returned

as false, since the feature depends on KVM_CREATE_IRQCHIP for local APIC

support.  Instead it is reported via



  ioctl(KVM_CHECK_EXTENSION, KVM_CAP_TSC_DEADLINE_TIMER)



if that returns true and you use KVM_CREATE_IRQCHIP, or if you emulate the

feature in userspace, then you can enable the feature for KVM_SET_CPUID2.



4.47 KVM_PPC_GET_PVINFO



Capability: KVM_CAP_PPC_GET_PVINFO
@@ -1151,6 +1160,13 @@ following flags are specified: 
/* Depends on KVM_CAP_IOMMU */

#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)



The KVM_DEV_ASSIGN_ENABLE_IOMMU flag is a mandatory option to ensure

isolation of the device.  Usages not specifying this flag are deprecated.



Only PCI header type 0 devices with PCI BAR resources are supported by

device assignment.  The user requesting this ioctl must have read/write

access to the PCI sysfs resource files associated with the device.



4.49 KVM_DEASSIGN_PCI_DEVICE



Capability: KVM_CAP_DEVICE_DEASSIGNMENT

arch/powerpc/include/asm/kvm_book3s.h

+0 −33
Original line number Diff line number Diff line
@@ -381,39 +381,6 @@ static inline bool kvmppc_critical_section(struct kvm_vcpu *vcpu) 
}

#endif



static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,

					     unsigned long pte_index)

{

	unsigned long rb, va_low;



	rb = (v & ~0x7fUL) << 16;		/* AVA field */

	va_low = pte_index >> 3;

	if (v & HPTE_V_SECONDARY)

		va_low = ~va_low;

	/* xor vsid from AVA */

	if (!(v & HPTE_V_1TB_SEG))

		va_low ^= v >> 12;

	else

		va_low ^= v >> 24;

	va_low &= 0x7ff;

	if (v & HPTE_V_LARGE) {

		rb |= 1;			/* L field */

		if (cpu_has_feature(CPU_FTR_ARCH_206) &&

		    (r & 0xff000)) {

			/* non-16MB large page, must be 64k */

			/* (masks depend on page size) */

			rb |= 0x1000;		/* page encoding in LP field */

			rb |= (va_low & 0x7f) << 16; /* 7b of VA in AVA/LP field */

			rb |= (va_low & 0xfe);	/* AVAL field (P7 doesn't seem to care) */

		}

	} else {

		/* 4kB page */

		rb |= (va_low & 0x7ff) << 12;	/* remaining 11b of VA */

	}

	rb |= (v >> 54) & 0x300;		/* B field */

	return rb;

}



/* Magic register values loaded into r3 and r4 before the 'sc' assembly

 * instruction for the OSI hypercalls */

#define OSI_SC_MAGIC_R3			0x113724FA

arch/powerpc/include/asm/kvm_book3s_64.h

+33 −0
Original line number Diff line number Diff line
@@ -29,4 +29,37 @@ static inline struct kvmppc_book3s_shadow_vcpu *to_svcpu(struct kvm_vcpu *vcpu) 


#define SPAPR_TCE_SHIFT		12



static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,

					     unsigned long pte_index)

{

	unsigned long rb, va_low;



	rb = (v & ~0x7fUL) << 16;		/* AVA field */

	va_low = pte_index >> 3;

	if (v & HPTE_V_SECONDARY)

		va_low = ~va_low;

	/* xor vsid from AVA */

	if (!(v & HPTE_V_1TB_SEG))

		va_low ^= v >> 12;

	else

		va_low ^= v >> 24;

	va_low &= 0x7ff;

	if (v & HPTE_V_LARGE) {

		rb |= 1;			/* L field */

		if (cpu_has_feature(CPU_FTR_ARCH_206) &&

		    (r & 0xff000)) {

			/* non-16MB large page, must be 64k */

			/* (masks depend on page size) */

			rb |= 0x1000;		/* page encoding in LP field */

			rb |= (va_low & 0x7f) << 16; /* 7b of VA in AVA/LP field */

			rb |= (va_low & 0xfe);	/* AVAL field (P7 doesn't seem to care) */

		}

	} else {

		/* 4kB page */

		rb |= (va_low & 0x7ff) << 12;	/* remaining 11b of VA */

	}

	rb |= (v >> 54) & 0x300;		/* B field */

	return rb;

}



#endif /* __ASM_KVM_BOOK3S_64_H__ */

arch/powerpc/kvm/book3s_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static void kvmppc_start_thread(struct kvm_vcpu *vcpu) 
	tpaca->kvm_hstate.napping = 0;

	vcpu->cpu = vc->pcpu;

	smp_wmb();

#ifdef CONFIG_PPC_ICP_NATIVE

#if defined(CONFIG_PPC_ICP_NATIVE) && defined(CONFIG_SMP)

	if (vcpu->arch.ptid) {

		tpaca->cpu_start = 0x80;

		wmb();

arch/powerpc/kvm/book3s_pr.c

+2 −0
Original line number Diff line number Diff line
@@ -658,10 +658,12 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu, 
			ulong cmd = kvmppc_get_gpr(vcpu, 3);

			int i;



#ifdef CONFIG_KVM_BOOK3S_64_PR

			if (kvmppc_h_pr(vcpu, cmd) == EMULATE_DONE) {

				r = RESUME_GUEST;

				break;

			}

#endif



			run->papr_hcall.nr = cmd;

			for (i = 0; i < 9; ++i) {