Skip to content

Commit

Permalink
x86/kvm: handle the failure of __pv_cpu_mask allocation
Browse files Browse the repository at this point in the history
Fallback to native ipis/tlb flush if fails to allocate __pv_cpu_mask.

Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
  • Loading branch information
Wanpeng Li authored and intel-lab-lkp committed Apr 22, 2022
1 parent e852be8 commit 329f0c8
Showing 1 changed file with 24 additions and 2 deletions.
26 changes: 24 additions & 2 deletions arch/x86/kernel/kvm.c
Expand Up @@ -46,6 +46,7 @@

DEFINE_STATIC_KEY_FALSE(kvm_async_pf_enabled);

static struct apic orig_apic;
static int kvmapf = 1;

static int __init parse_no_kvmapf(char *arg)
Expand Down Expand Up @@ -543,6 +544,11 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector)

static void kvm_send_ipi_mask(const struct cpumask *mask, int vector)
{
if (unlikely(!this_cpu_cpumask_var_ptr(__pv_cpu_mask))) {
orig_apic.send_IPI_mask(mask, vector);
return;
}

__send_ipi_mask(mask, vector);
}

Expand All @@ -552,6 +558,11 @@ static void kvm_send_ipi_mask_allbutself(const struct cpumask *mask, int vector)
struct cpumask *new_mask = this_cpu_cpumask_var_ptr(__pv_cpu_mask);
const struct cpumask *local_mask;

if (unlikely(!new_mask)) {
orig_apic.send_IPI_mask_allbutself(mask, vector);
return;
}

cpumask_copy(new_mask, mask);
cpumask_clear_cpu(this_cpu, new_mask);
local_mask = new_mask;
Expand Down Expand Up @@ -612,6 +623,7 @@ late_initcall(setup_efi_kvm_sev_migration);
*/
static void kvm_setup_pv_ipi(void)
{
orig_apic = *apic;
apic->send_IPI_mask = kvm_send_ipi_mask;
apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
pr_info("setup PV IPIs\n");
Expand Down Expand Up @@ -640,6 +652,11 @@ static void kvm_flush_tlb_multi(const struct cpumask *cpumask,
struct kvm_steal_time *src;
struct cpumask *flushmask = this_cpu_cpumask_var_ptr(__pv_cpu_mask);

if (unlikely(!flushmask)) {
native_flush_tlb_multi(cpumask, info);
return;
}

cpumask_copy(flushmask, cpumask);
/*
* We have to call flush only on online vCPUs. And
Expand Down Expand Up @@ -672,11 +689,16 @@ static __init int kvm_alloc_cpumask(void)

if (pv_tlb_flush_supported() || pv_ipi_supported())
for_each_possible_cpu(cpu) {
zalloc_cpumask_var_node(per_cpu_ptr(&__pv_cpu_mask, cpu),
GFP_KERNEL, cpu_to_node(cpu));
if (!zalloc_cpumask_var_node(&per_cpu(__pv_cpu_mask, cpu),
GFP_KERNEL, cpu_to_node(cpu)))
goto err_out;
}

return 0;
err_out:
for_each_possible_cpu(cpu)
free_cpumask_var(per_cpu(__pv_cpu_mask, cpu));
return -ENOMEM;
}
arch_initcall(kvm_alloc_cpumask);

Expand Down

0 comments on commit 329f0c8

Please sign in to comment.