Commit 0f990222 authored by Haiwei Li's avatar Haiwei Li Committed by Paolo Bonzini

KVM: Check the allocation of pv cpu mask

check the allocation of per-cpu __pv_cpu_mask. Initialize ops only when
successful.
Signed-off-by: default avatarHaiwei Li <lihaiwei@tencent.com>
Message-Id: <d59f05df-e6d3-3d31-a036-cc25a2b2f33f@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 43fea4e4
...@@ -654,7 +654,6 @@ static void __init kvm_guest_init(void) ...@@ -654,7 +654,6 @@ static void __init kvm_guest_init(void)
} }
if (pv_tlb_flush_supported()) { if (pv_tlb_flush_supported()) {
pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
pv_ops.mmu.tlb_remove_table = tlb_remove_table; pv_ops.mmu.tlb_remove_table = tlb_remove_table;
pr_info("KVM setup pv remote TLB flush\n"); pr_info("KVM setup pv remote TLB flush\n");
} }
...@@ -767,6 +766,14 @@ static __init int activate_jump_labels(void) ...@@ -767,6 +766,14 @@ static __init int activate_jump_labels(void)
} }
arch_initcall(activate_jump_labels); arch_initcall(activate_jump_labels);
static void kvm_free_pv_cpu_mask(void)
{
unsigned int cpu;
for_each_possible_cpu(cpu)
free_cpumask_var(per_cpu(__pv_cpu_mask, cpu));
}
static __init int kvm_alloc_cpumask(void) static __init int kvm_alloc_cpumask(void)
{ {
int cpu; int cpu;
...@@ -785,11 +792,20 @@ static __init int kvm_alloc_cpumask(void) ...@@ -785,11 +792,20 @@ static __init int kvm_alloc_cpumask(void)
if (alloc) if (alloc)
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
zalloc_cpumask_var_node(per_cpu_ptr(&__pv_cpu_mask, cpu), if (!zalloc_cpumask_var_node(
GFP_KERNEL, cpu_to_node(cpu)); per_cpu_ptr(&__pv_cpu_mask, cpu),
GFP_KERNEL, cpu_to_node(cpu))) {
goto zalloc_cpumask_fail;
}
} }
apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
pv_ops.mmu.flush_tlb_others = kvm_flush_tlb_others;
return 0; return 0;
zalloc_cpumask_fail:
kvm_free_pv_cpu_mask();
return -ENOMEM;
} }
arch_initcall(kvm_alloc_cpumask); arch_initcall(kvm_alloc_cpumask);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment