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

Commit 3230bb47 authored by Zachary Amsden's avatar Zachary Amsden Committed by Avi Kivity
Browse files

KVM: Fix hotplug of CPUs 



Both VMX and SVM require per-cpu memory allocation, which is done at module
init time, for only online cpus.

Backend was not allocating enough structure for all possible CPUs, so
new CPUs coming online could not be hardware enabled.

Signed-off-by: default avatarZachary Amsden <zamsden@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent e6732a5a

arch/x86/kvm/svm.c

+2 −2
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static __init int svm_hardware_setup(void) 
		kvm_enable_efer_bits(EFER_SVME);

	}



	for_each_online_cpu(cpu) {

	for_each_possible_cpu(cpu) {

		r = svm_cpu_init(cpu);

		if (r)

			goto err;
@@ -516,7 +516,7 @@ static __exit void svm_hardware_unsetup(void) 
{

	int cpu;



	for_each_online_cpu(cpu)

	for_each_possible_cpu(cpu)

		svm_cpu_uninit(cpu);



	__free_pages(pfn_to_page(iopm_base >> PAGE_SHIFT), IOPM_ALLOC_ORDER);

arch/x86/kvm/vmx.c

+4 −2
Original line number Diff line number Diff line
@@ -1350,15 +1350,17 @@ static void free_kvm_area(void) 
{

	int cpu;



	for_each_online_cpu(cpu)

	for_each_possible_cpu(cpu) {

		free_vmcs(per_cpu(vmxarea, cpu));

		per_cpu(vmxarea, cpu) = NULL;

	}

}



static __init int alloc_kvm_area(void)

{

	int cpu;



	for_each_online_cpu(cpu) {

	for_each_possible_cpu(cpu) {

		struct vmcs *vmcs;



		vmcs = alloc_vmcs_cpu(cpu);