x86/hyperv: allocate output arg pages if required

[linux-2.6-microblaze.git] / arch / x86 / hyperv / hv_init.c

diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 6375967..a73f4db 100644 (file)
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -10,6 +10,7 @@
 #include <linux/acpi.h>
 #include <linux/efi.h>
 #include <linux/types.h>
+#include <linux/bitfield.h>
 #include <asm/apic.h>
 #include <asm/desc.h>
 #include <asm/hypervisor.h>
@@ -44,6 +45,9 @@ EXPORT_SYMBOL_GPL(hv_vp_assist_page);
 void  __percpu **hyperv_pcpu_input_arg;
 EXPORT_SYMBOL_GPL(hyperv_pcpu_input_arg);
 
+void  __percpu **hyperv_pcpu_output_arg;
+EXPORT_SYMBOL_GPL(hyperv_pcpu_output_arg);
+
 u32 hv_max_vp_index;
 EXPORT_SYMBOL_GPL(hv_max_vp_index);
 
@@ -76,12 +80,19 @@ static int hv_cpu_init(unsigned int cpu)
        void **input_arg;
        struct page *pg;
 
-       input_arg = (void **)this_cpu_ptr(hyperv_pcpu_input_arg);
        /* hv_cpu_init() can be called with IRQs disabled from hv_resume() */
-       pg = alloc_page(irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL);
+       pg = alloc_pages(irqs_disabled() ? GFP_ATOMIC : GFP_KERNEL, hv_root_partition ? 1 : 0);
        if (unlikely(!pg))
                return -ENOMEM;
+
+       input_arg = (void **)this_cpu_ptr(hyperv_pcpu_input_arg);
        *input_arg = page_address(pg);
+       if (hv_root_partition) {
+               void **output_arg;
+
+               output_arg = (void **)this_cpu_ptr(hyperv_pcpu_output_arg);
+               *output_arg = page_address(pg + 1);
+       }
 
        hv_get_vp_index(msr_vp_index);
 
@@ -208,14 +219,23 @@ static int hv_cpu_die(unsigned int cpu)
        unsigned int new_cpu;
        unsigned long flags;
        void **input_arg;
-       void *input_pg = NULL;
+       void *pg;
 
        local_irq_save(flags);
        input_arg = (void **)this_cpu_ptr(hyperv_pcpu_input_arg);
-       input_pg = *input_arg;
+       pg = *input_arg;
        *input_arg = NULL;
+
+       if (hv_root_partition) {
+               void **output_arg;
+
+               output_arg = (void **)this_cpu_ptr(hyperv_pcpu_output_arg);
+               *output_arg = NULL;
+       }
+
        local_irq_restore(flags);
-       free_page((unsigned long)input_pg);
+
+       free_pages((unsigned long)pg, hv_root_partition ? 1 : 0);
 
        if (hv_vp_assist_page && hv_vp_assist_page[cpu])
                wrmsrl(HV_X64_MSR_VP_ASSIST_PAGE, 0);
@@ -368,6 +388,12 @@ void __init hyperv_init(void)
 
        BUG_ON(hyperv_pcpu_input_arg == NULL);
 
+       /* Allocate the per-CPU state for output arg for root */
+       if (hv_root_partition) {
+               hyperv_pcpu_output_arg = alloc_percpu(void *);
+               BUG_ON(hyperv_pcpu_output_arg == NULL);
+       }
+
        /* Allocate percpu VP index */
        hv_vp_index = kmalloc_array(num_possible_cpus(), sizeof(*hv_vp_index),
                                    GFP_KERNEL);
@@ -555,3 +581,17 @@ bool hv_is_hibernation_supported(void)
        return acpi_sleep_state_supported(ACPI_STATE_S4);
 }
 EXPORT_SYMBOL_GPL(hv_is_hibernation_supported);
+
+enum hv_isolation_type hv_get_isolation_type(void)
+{
+       if (!(ms_hyperv.features_b & HV_ISOLATION))
+               return HV_ISOLATION_TYPE_NONE;
+       return FIELD_GET(HV_ISOLATION_TYPE, ms_hyperv.isolation_config_b);
+}
+EXPORT_SYMBOL_GPL(hv_get_isolation_type);
+
+bool hv_is_isolation_supported(void)
+{
+       return hv_get_isolation_type() != HV_ISOLATION_TYPE_NONE;
+}
+EXPORT_SYMBOL_GPL(hv_is_isolation_supported);