Commit 031e6466 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Greg Kroah-Hartman
Browse files

x86/hyper-v: Check for VP_INVAL in hyperv_flush_tlb_others()

commit 110d2a7f upstream.

Commit 1268ed0c ("x86/hyper-v: Fix the circular dependency in IPI
 enlightenment") pre-filled hv_vp_index with VP_INVAL so it is now
(theoretically) possible to observe hv_cpu_number_to_vp_number()
returning VP_INVAL. We need to check for that in hyperv_flush_tlb_others().

Not checking for VP_INVAL on the first call site where we do

 if (hv_cpu_number_to_vp_number(cpumask_last(cpus)) >= 64)
                        goto do_ex_hypercall;

is OK, in case we're eligible for non-ex hypercall we'll catch the
issue later in for_each_cpu() cycle and in case we'll be doing ex-
hypercall cpumask_to_vpset() will fail.

It would be nice to change hv_cpu_number_to_vp_number() return
value's type to 'u32' but this will likely be a bigger change as
all call sites need to be checked first.

Fixes: 1268ed0c

 ("x86/hyper-v: Fix the circular dependency in IPI enlightenment")
Signed-off-by: default avatarVitaly Kuznetsov <>
Signed-off-by: default avatarThomas Gleixner <>
Reviewed-by: default avatarMichael Kelley <>
Cc: "K. Y. Srinivasan" <>
Cc: Haiyang Zhang <>
Cc: Stephen Hemminger <>
Cc: "Michael Kelley (EOSG)" <>
Cc: "H. Peter Anvin" <>

Signed-off-by: default avatarGreg Kroah-Hartman <>
parent fcaef4e2
......@@ -95,6 +95,11 @@ static void hyperv_flush_tlb_others(const struct cpumask *cpus,
} else {
for_each_cpu(cpu, cpus) {
vcpu = hv_cpu_number_to_vp_number(cpu);
if (vcpu == VP_INVAL) {
goto do_native;
if (vcpu >= 64)
goto do_native;
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