X86/Hyper-V: Consolidate the allocation of the hypercall input page

Consolidate the allocation of the hypercall input page.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Cc: olaf@aepfle.de
Cc: sthemmin@microsoft.com
Cc: gregkh@linuxfoundation.org
Cc: jasowang@redhat.com
Cc: Michael.H.Kelley@microsoft.com
Cc: hpa@zytor.com
Cc: apw@canonical.com
Cc: devel@linuxdriverproject.org
Cc: vkuznets@redhat.com
Link: https://lkml.kernel.org/r/20180516215334.6547-5-kys@linuxonhyperv.com

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 6bc90d68ac8b1beca68550666eba11f86fb9315a..4c431e1c1effc42ade651f9a69c3e06136827e17 100644 (file)
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -324,8 +324,6 @@ void __init hyperv_init(void)
        hypercall_msr.guest_physical_address = vmalloc_to_pfn(hv_hypercall_pg);
        wrmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
 
-       hyper_alloc_mmu();
-
        hv_apic_init();
 
        /*

diff --git a/arch/x86/hyperv/mmu.c b/arch/x86/hyperv/mmu.c
index c9cd28f0bae45291b3db338e993d9aaea858dbfa..5f053d7d1bd972425a2af829a82345c295ad6533 100644 (file)
--- a/arch/x86/hyperv/mmu.c
+++ b/arch/x86/hyperv/mmu.c
@@ -32,9 +32,6 @@ struct hv_flush_pcpu_ex {
 /* Each gva in gva_list encodes up to 4096 pages to flush */
 #define HV_TLB_FLUSH_UNIT (4096 * PAGE_SIZE)
 
-static struct hv_flush_pcpu __percpu **pcpu_flush;
-
-static struct hv_flush_pcpu_ex __percpu **pcpu_flush_ex;
 
 /*
  * Fills in gva_list starting from offset. Returns the number of items added.
@@ -77,7 +74,7 @@ static void hyperv_flush_tlb_others(const struct cpumask *cpus,
 
        trace_hyperv_mmu_flush_tlb_others(cpus, info);
 
-       if (!pcpu_flush || !hv_hypercall_pg)
+       if (!hv_hypercall_pg)
                goto do_native;
 
        if (cpumask_empty(cpus))
@@ -85,10 +82,8 @@ static void hyperv_flush_tlb_others(const struct cpumask *cpus,
 
        local_irq_save(flags);
 
-       flush_pcpu = this_cpu_ptr(pcpu_flush);
-
-       if (unlikely(!*flush_pcpu))
-               *flush_pcpu = page_address(alloc_page(GFP_ATOMIC));
+       flush_pcpu = (struct hv_flush_pcpu **)
+                    this_cpu_ptr(hyperv_pcpu_input_arg);
 
        flush = *flush_pcpu;
 
@@ -164,7 +159,7 @@ static void hyperv_flush_tlb_others_ex(const struct cpumask *cpus,
 
        trace_hyperv_mmu_flush_tlb_others(cpus, info);
 
-       if (!pcpu_flush_ex || !hv_hypercall_pg)
+       if (!hv_hypercall_pg)
                goto do_native;
 
        if (cpumask_empty(cpus))
@@ -172,10 +167,8 @@ static void hyperv_flush_tlb_others_ex(const struct cpumask *cpus,
 
        local_irq_save(flags);
 
-       flush_pcpu = this_cpu_ptr(pcpu_flush_ex);
-
-       if (unlikely(!*flush_pcpu))
-               *flush_pcpu = page_address(alloc_page(GFP_ATOMIC));
+       flush_pcpu = (struct hv_flush_pcpu_ex **)
+                    this_cpu_ptr(hyperv_pcpu_input_arg);
 
        flush = *flush_pcpu;
 
@@ -257,14 +250,3 @@ void hyperv_setup_mmu_ops(void)
                pv_mmu_ops.flush_tlb_others = hyperv_flush_tlb_others_ex;
        }
 }
-
-void hyper_alloc_mmu(void)
-{
-       if (!(ms_hyperv.hints & HV_X64_REMOTE_TLB_FLUSH_RECOMMENDED))
-               return;
-
-       if (!(ms_hyperv.hints & HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED))
-               pcpu_flush = alloc_percpu(struct hv_flush_pcpu *);
-       else
-               pcpu_flush_ex = alloc_percpu(struct hv_flush_pcpu_ex *);
-}

diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index 0ee82519957be13c109f99fade8eda74025fc0a5..9aaa493f57565fbec23bd006db6f1fa2303887fd 100644 (file)
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -294,7 +294,6 @@ static inline int cpumask_to_vpset(struct hv_vpset *vpset,
 
 void __init hyperv_init(void);
 void hyperv_setup_mmu_ops(void);
-void hyper_alloc_mmu(void);
 void hyperv_report_panic(struct pt_regs *regs, long err);
 bool hv_is_hyperv_initialized(void);
 void hyperv_cleanup(void);