Commit 12ed1fae authored Dec 13, 2016 by James Hogan

KVM: MIPS: Allow multiple VCPUs to be created



Increase the maximum number of MIPS KVM VCPUs to 8, and implement the
KVM_CAP_NR_VCPUS and KVM_CAP_MAX_CPUS capabilities which expose the
recommended and maximum number of VCPUs to userland. The previous
maximum of 1 didn't allow for any form of SMP guests.

We calculate the values similarly to ARM, recommending as many VCPUs as
there are CPUs online in the system. This will allow userland to know
how many VCPUs it is possible to create.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org

parent ad58d4d4

arch/mips/include/asm/kvm_host.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@
		#define KVM_REG_MIPS_CP0_KSCRATCH6 MIPS_CP0_64(31, 7)


		#define KVM_MAX_VCPUS 1
		#define KVM_MAX_VCPUS 8
		#define KVM_USER_MEM_SLOTS 8
		/* memory slots that does not exposed to userspace */
		#define KVM_PRIVATE_MEM_SLOTS 0

arch/mips/kvm/mips.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1026,6 +1026,12 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
		case KVM_CAP_COALESCED_MMIO:
		r = KVM_COALESCED_MMIO_PAGE_OFFSET;
		break;
		case KVM_CAP_NR_VCPUS:
		r = num_online_cpus();
		break;
		case KVM_CAP_MAX_VCPUS:
		r = KVM_MAX_VCPUS;
		break;
		case KVM_CAP_MIPS_FPU:
		/* We don't handle systems with inconsistent cpu_has_fpu */
		r = !!raw_cpu_has_fpu;

Admin message