1 files changed, 9 insertions, 66 deletions

diff --git a/arch/x86/hyperv/mmu.c b/arch/x86/hyperv/mmu.c
index 56c9ebac946f..5f053d7d1bd9 100644
--- a/arch/x86/hyperv/mmu.c
+++ b/arch/x86/hyperv/mmu.c
@@ -25,20 +25,13 @@ struct hv_flush_pcpu {
 struct hv_flush_pcpu_ex {
         u64 address_space;
         u64 flags;
-        struct {
-                u64 format;
-                u64 valid_bank_mask;
-                u64 bank_contents[];
-        } hv_vp_set;
+        struct hv_vpset hv_vp_set;
         u64 gva_list[];
 };
 
 /* 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.
@@ -70,41 +63,6 @@ static inline int fill_gva_list(u64 gva_list[], int offset,
         return gva_n - offset;
 }
 
-/* Return the number of banks in the resulting vp_set */
-static inline int cpumask_to_vp_set(struct hv_flush_pcpu_ex *flush,
-                                    const struct cpumask *cpus)
-{
-        int cpu, vcpu, vcpu_bank, vcpu_offset, nr_bank = 1;
-
-        /* valid_bank_mask can represent up to 64 banks */
-        if (hv_max_vp_index / 64 >= 64)
-                return 0;
-
-        /*
-         * Clear all banks up to the maximum possible bank as hv_flush_pcpu_ex
-         * structs are not cleared between calls, we risk flushing unneeded
-         * vCPUs otherwise.
-         */
-        for (vcpu_bank = 0; vcpu_bank <= hv_max_vp_index / 64; vcpu_bank++)
-                flush->hv_vp_set.bank_contents[vcpu_bank] = 0;
-
-        /*
-         * Some banks may end up being empty but this is acceptable.
-         */
-        for_each_cpu(cpu, cpus) {
-                vcpu = hv_cpu_number_to_vp_number(cpu);
-                vcpu_bank = vcpu / 64;
-                vcpu_offset = vcpu % 64;
-                __set_bit(vcpu_offset, (unsigned long *)
-                          &flush->hv_vp_set.bank_contents[vcpu_bank]);
-                if (vcpu_bank >= nr_bank)
-                        nr_bank = vcpu_bank + 1;
-        }
-        flush->hv_vp_set.valid_bank_mask = GENMASK_ULL(nr_bank - 1, 0);
-
-        return nr_bank;
-}
-
 static void hyperv_flush_tlb_others(const struct cpumask *cpus,
                                     const struct flush_tlb_info *info)
 {
@@ -116,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))
@@ -124,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;
 
@@ -203,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))
@@ -211,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;
 
@@ -239,8 +193,8 @@ static void hyperv_flush_tlb_others_ex(const struct cpumask *cpus,
         flush->hv_vp_set.valid_bank_mask = 0;
 
         if (!cpumask_equal(cpus, cpu_present_mask)) {
-                flush->hv_vp_set.format = HV_GENERIC_SET_SPARCE_4K;
-                nr_bank = cpumask_to_vp_set(flush, cpus);
+                flush->hv_vp_set.format = HV_GENERIC_SET_SPARSE_4K;
+                nr_bank = cpumask_to_vpset(&(flush->hv_vp_set), cpus);
         }
 
         if (!nr_bank) {
@@ -296,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 *);
-}