Merge commit 'upstream-x86-virt' into WIP.x86/mm
authorIngo Molnar <mingo@kernel.org>
Fri, 1 Dec 2017 09:34:04 +0000 (10:34 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 17 Dec 2017 12:50:01 +0000 (13:50 +0100)
Merge a minimal set of virt cleanups, for a base for the MM isolation patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
17 files changed:
arch/x86/hyperv/hv_init.c
arch/x86/include/asm/hypervisor.h
arch/x86/include/asm/x86_init.h
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/x2apic_uv_x.c
arch/x86/kernel/cpu/hypervisor.c
arch/x86/kernel/cpu/mshyperv.c
arch/x86/kernel/cpu/vmware.c
arch/x86/kernel/kvm.c
arch/x86/kernel/x86_init.c
arch/x86/mm/init.c
arch/x86/xen/enlighten_hvm.c
arch/x86/xen/enlighten_pv.c
drivers/hv/vmbus_drv.c
drivers/input/mouse/vmmouse.c
drivers/misc/vmw_balloon.c
include/linux/hypervisor.h

index a5db63f728a2f985bde0f1b98f87be4537913cdc..a0b86cf486e0adcf1e7d505bd003056a3e2a1b87 100644 (file)
@@ -113,7 +113,7 @@ void hyperv_init(void)
        u64 guest_id;
        union hv_x64_msr_hypercall_contents hypercall_msr;
 
-       if (x86_hyper != &x86_hyper_ms_hyperv)
+       if (x86_hyper_type != X86_HYPER_MS_HYPERV)
                return;
 
        /* Allocate percpu VP index */
index 0ead9dbb91301d0f7f8923dcf33f25515bd182b8..1b0a5abcd8aeb6e700013c5434aaeb0bba7a152f 100644 (file)
 #ifdef CONFIG_HYPERVISOR_GUEST
 
 #include <asm/kvm_para.h>
+#include <asm/x86_init.h>
 #include <asm/xen/hypervisor.h>
 
 /*
  * x86 hypervisor information
  */
+
+enum x86_hypervisor_type {
+       X86_HYPER_NATIVE = 0,
+       X86_HYPER_VMWARE,
+       X86_HYPER_MS_HYPERV,
+       X86_HYPER_XEN_PV,
+       X86_HYPER_XEN_HVM,
+       X86_HYPER_KVM,
+};
+
 struct hypervisor_x86 {
        /* Hypervisor name */
        const char      *name;
@@ -35,40 +46,19 @@ struct hypervisor_x86 {
        /* Detection routine */
        uint32_t        (*detect)(void);
 
-       /* Platform setup (run once per boot) */
-       void            (*init_platform)(void);
-
-       /* X2APIC detection (run once per boot) */
-       bool            (*x2apic_available)(void);
+       /* Hypervisor type */
+       enum x86_hypervisor_type type;
 
-       /* pin current vcpu to specified physical cpu (run rarely) */
-       void            (*pin_vcpu)(int);
+       /* init time callbacks */
+       struct x86_hyper_init init;
 
-       /* called during init_mem_mapping() to setup early mappings. */
-       void            (*init_mem_mapping)(void);
+       /* runtime callbacks */
+       struct x86_hyper_runtime runtime;
 };
 
-extern const struct hypervisor_x86 *x86_hyper;
-
-/* Recognized hypervisors */
-extern const struct hypervisor_x86 x86_hyper_vmware;
-extern const struct hypervisor_x86 x86_hyper_ms_hyperv;
-extern const struct hypervisor_x86 x86_hyper_xen_pv;
-extern const struct hypervisor_x86 x86_hyper_xen_hvm;
-extern const struct hypervisor_x86 x86_hyper_kvm;
-
+extern enum x86_hypervisor_type x86_hyper_type;
 extern void init_hypervisor_platform(void);
-extern bool hypervisor_x2apic_available(void);
-extern void hypervisor_pin_vcpu(int cpu);
-
-static inline void hypervisor_init_mem_mapping(void)
-{
-       if (x86_hyper && x86_hyper->init_mem_mapping)
-               x86_hyper->init_mem_mapping();
-}
 #else
 static inline void init_hypervisor_platform(void) { }
-static inline bool hypervisor_x2apic_available(void) { return false; }
-static inline void hypervisor_init_mem_mapping(void) { }
 #endif /* CONFIG_HYPERVISOR_GUEST */
 #endif /* _ASM_X86_HYPERVISOR_H */
index 8a1ebf9540ddf0822c3f80c2fa09340c339860f7..ad15a0fda917457a1b4363cbdd2fb56de7989f0b 100644 (file)
@@ -114,6 +114,18 @@ struct x86_init_pci {
        void (*fixup_irqs)(void);
 };
 
+/**
+ * struct x86_hyper_init - x86 hypervisor init functions
+ * @init_platform:             platform setup
+ * @x2apic_available:          X2APIC detection
+ * @init_mem_mapping:          setup early mappings during init_mem_mapping()
+ */
+struct x86_hyper_init {
+       void (*init_platform)(void);
+       bool (*x2apic_available)(void);
+       void (*init_mem_mapping)(void);
+};
+
 /**
  * struct x86_init_ops - functions for platform specific setup
  *
@@ -127,6 +139,7 @@ struct x86_init_ops {
        struct x86_init_timers          timers;
        struct x86_init_iommu           iommu;
        struct x86_init_pci             pci;
+       struct x86_hyper_init           hyper;
 };
 
 /**
@@ -199,6 +212,15 @@ struct x86_legacy_features {
        struct x86_legacy_devices devices;
 };
 
+/**
+ * struct x86_hyper_runtime - x86 hypervisor specific runtime callbacks
+ *
+ * @pin_vcpu:          pin current vcpu to specified physical cpu (run rarely)
+ */
+struct x86_hyper_runtime {
+       void (*pin_vcpu)(int cpu);
+};
+
 /**
  * struct x86_platform_ops - platform specific runtime functions
  * @calibrate_cpu:             calibrate CPU
@@ -218,6 +240,7 @@ struct x86_legacy_features {
  *                             possible in x86_early_init_platform_quirks() by
  *                             only using the current x86_hardware_subarch
  *                             semantics.
+ * @hyper:                     x86 hypervisor specific runtime callbacks
  */
 struct x86_platform_ops {
        unsigned long (*calibrate_cpu)(void);
@@ -233,6 +256,7 @@ struct x86_platform_ops {
        void (*apic_post_init)(void);
        struct x86_legacy_features legacy;
        void (*set_legacy_features)(void);
+       struct x86_hyper_runtime hyper;
 };
 
 struct pci_dev;
index ff891772c9f86492d7ca2721b66619b2be61ed9d..89c7c8569e5e75157d81ba40dd79c77f12d1f04f 100644 (file)
@@ -1645,7 +1645,7 @@ static __init void try_to_enable_x2apic(int remap_mode)
                 * under KVM
                 */
                if (max_physical_apicid > 255 ||
-                   !hypervisor_x2apic_available()) {
+                   !x86_init.hyper.x2apic_available()) {
                        pr_info("x2apic: IRQ remapping doesn't support X2APIC mode\n");
                        x2apic_disable();
                        return;
index 0d57bb9079c998173f31bc2f4b73032caf23331b..c0b694810ff45adaf54fb8db5211f65a1f89b876 100644 (file)
@@ -920,9 +920,8 @@ static __init void uv_rtc_init(void)
 /*
  * percpu heartbeat timer
  */
-static void uv_heartbeat(unsigned long ignored)
+static void uv_heartbeat(struct timer_list *timer)
 {
-       struct timer_list *timer = &uv_scir_info->timer;
        unsigned char bits = uv_scir_info->state;
 
        /* Flip heartbeat bit: */
@@ -947,7 +946,7 @@ static int uv_heartbeat_enable(unsigned int cpu)
                struct timer_list *timer = &uv_cpu_scir_info(cpu)->timer;
 
                uv_set_cpu_scir_bits(cpu, SCIR_CPU_HEARTBEAT|SCIR_CPU_ACTIVITY);
-               setup_pinned_timer(timer, uv_heartbeat, cpu);
+               timer_setup(timer, uv_heartbeat, TIMER_PINNED);
                timer->expires = jiffies + SCIR_CPU_HB_INTERVAL;
                add_timer_on(timer, cpu);
                uv_cpu_scir_info(cpu)->enabled = 1;
index 4fa90006ac68cbeade534020a689c4a07b4f0e60..bea8d3e24f508704ca80210e6b864bd07e51bfc5 100644 (file)
 #include <asm/processor.h>
 #include <asm/hypervisor.h>
 
+extern const struct hypervisor_x86 x86_hyper_vmware;
+extern const struct hypervisor_x86 x86_hyper_ms_hyperv;
+extern const struct hypervisor_x86 x86_hyper_xen_pv;
+extern const struct hypervisor_x86 x86_hyper_xen_hvm;
+extern const struct hypervisor_x86 x86_hyper_kvm;
+
 static const __initconst struct hypervisor_x86 * const hypervisors[] =
 {
 #ifdef CONFIG_XEN_PV
@@ -41,54 +47,52 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] =
 #endif
 };
 
-const struct hypervisor_x86 *x86_hyper;
-EXPORT_SYMBOL(x86_hyper);
+enum x86_hypervisor_type x86_hyper_type;
+EXPORT_SYMBOL(x86_hyper_type);
 
-static inline void __init
+static inline const struct hypervisor_x86 * __init
 detect_hypervisor_vendor(void)
 {
-       const struct hypervisor_x86 *h, * const *p;
+       const struct hypervisor_x86 *h = NULL, * const *p;
        uint32_t pri, max_pri = 0;
 
        for (p = hypervisors; p < hypervisors + ARRAY_SIZE(hypervisors); p++) {
-               h = *p;
-               pri = h->detect();
-               if (pri != 0 && pri > max_pri) {
+               pri = (*p)->detect();
+               if (pri > max_pri) {
                        max_pri = pri;
-                       x86_hyper = h;
+                       h = *p;
                }
        }
 
-       if (max_pri)
-               pr_info("Hypervisor detected: %s\n", x86_hyper->name);
+       if (h)
+               pr_info("Hypervisor detected: %s\n", h->name);
+
+       return h;
 }
 
-void __init init_hypervisor_platform(void)
+static void __init copy_array(const void *src, void *target, unsigned int size)
 {
+       unsigned int i, n = size / sizeof(void *);
+       const void * const *from = (const void * const *)src;
+       const void **to = (const void **)target;
 
-       detect_hypervisor_vendor();
-
-       if (!x86_hyper)
-               return;
-
-       if (x86_hyper->init_platform)
-               x86_hyper->init_platform();
+       for (i = 0; i < n; i++)
+               if (from[i])
+                       to[i] = from[i];
 }
 
-bool __init hypervisor_x2apic_available(void)
+void __init init_hypervisor_platform(void)
 {
-       return x86_hyper                   &&
-              x86_hyper->x2apic_available &&
-              x86_hyper->x2apic_available();
-}
+       const struct hypervisor_x86 *h;
 
-void hypervisor_pin_vcpu(int cpu)
-{
-       if (!x86_hyper)
+       h = detect_hypervisor_vendor();
+
+       if (!h)
                return;
 
-       if (x86_hyper->pin_vcpu)
-               x86_hyper->pin_vcpu(cpu);
-       else
-               WARN_ONCE(1, "vcpu pinning requested but not supported!\n");
+       copy_array(&h->init, &x86_init.hyper, sizeof(h->init));
+       copy_array(&h->runtime, &x86_platform.hyper, sizeof(h->runtime));
+
+       x86_hyper_type = h->type;
+       x86_init.hyper.init_platform();
 }
index 236324e83a3ae0755c4de2a087983759793c0add..85eb5fc180c8194f473529182237897386dd927a 100644 (file)
@@ -254,9 +254,9 @@ static void __init ms_hyperv_init_platform(void)
 #endif
 }
 
-const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
+const __initconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
        .name                   = "Microsoft Hyper-V",
        .detect                 = ms_hyperv_platform,
-       .init_platform          = ms_hyperv_init_platform,
+       .type                   = X86_HYPER_MS_HYPERV,
+       .init.init_platform     = ms_hyperv_init_platform,
 };
-EXPORT_SYMBOL(x86_hyper_ms_hyperv);
index 40ed26852ebd9a7fb61b6bc24b06426c4faf9f62..8e005329648b6b49d9afe671062368fe25db38e9 100644 (file)
@@ -205,10 +205,10 @@ static bool __init vmware_legacy_x2apic_available(void)
               (eax & (1 << VMWARE_PORT_CMD_LEGACY_X2APIC)) != 0;
 }
 
-const __refconst struct hypervisor_x86 x86_hyper_vmware = {
+const __initconst struct hypervisor_x86 x86_hyper_vmware = {
        .name                   = "VMware",
        .detect                 = vmware_platform,
-       .init_platform          = vmware_platform_setup,
-       .x2apic_available       = vmware_legacy_x2apic_available,
+       .type                   = X86_HYPER_VMWARE,
+       .init.init_platform     = vmware_platform_setup,
+       .init.x2apic_available  = vmware_legacy_x2apic_available,
 };
-EXPORT_SYMBOL(x86_hyper_vmware);
index 8bb9594d076166ee0f6bd4f70350fe3ecf8c3d8b..a94de09edbed25cf0571f002fa65fe67773c665c 100644 (file)
@@ -544,12 +544,12 @@ static uint32_t __init kvm_detect(void)
        return kvm_cpuid_base();
 }
 
-const struct hypervisor_x86 x86_hyper_kvm __refconst = {
+const __initconst struct hypervisor_x86 x86_hyper_kvm = {
        .name                   = "KVM",
        .detect                 = kvm_detect,
-       .x2apic_available       = kvm_para_available,
+       .type                   = X86_HYPER_KVM,
+       .init.x2apic_available  = kvm_para_available,
 };
-EXPORT_SYMBOL_GPL(x86_hyper_kvm);
 
 static __init int activate_jump_labels(void)
 {
index a088b2c47f7396dbfa9bd070ebc8f3c544a33d07..5b2d10c1973ab13cff47a9be663406a4c52171ed 100644 (file)
@@ -28,6 +28,8 @@ void x86_init_noop(void) { }
 void __init x86_init_uint_noop(unsigned int unused) { }
 int __init iommu_init_noop(void) { return 0; }
 void iommu_shutdown_noop(void) { }
+bool __init bool_x86_init_noop(void) { return false; }
+void x86_op_int_noop(int cpu) { }
 
 /*
  * The platform setup functions are preset with the default functions
@@ -81,6 +83,12 @@ struct x86_init_ops x86_init __initdata = {
                .init_irq               = x86_default_pci_init_irq,
                .fixup_irqs             = x86_default_pci_fixup_irqs,
        },
+
+       .hyper = {
+               .init_platform          = x86_init_noop,
+               .x2apic_available       = bool_x86_init_noop,
+               .init_mem_mapping       = x86_init_noop,
+       },
 };
 
 struct x86_cpuinit_ops x86_cpuinit = {
@@ -101,6 +109,7 @@ struct x86_platform_ops x86_platform __ro_after_init = {
        .get_nmi_reason                 = default_get_nmi_reason,
        .save_sched_clock_state         = tsc_save_sched_clock_state,
        .restore_sched_clock_state      = tsc_restore_sched_clock_state,
+       .hyper.pin_vcpu                 = x86_op_int_noop,
 };
 
 EXPORT_SYMBOL_GPL(x86_platform);
index af5c1ed21d43ac651ecbe02e7a58dc7baa884168..a22c2b95e5133919e839d3c7a7a33b82b17e629c 100644 (file)
@@ -671,7 +671,7 @@ void __init init_mem_mapping(void)
        load_cr3(swapper_pg_dir);
        __flush_tlb_all();
 
-       hypervisor_init_mem_mapping();
+       x86_init.hyper.init_mem_mapping();
 
        early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
 }
index de503c225ae1f194b10c71b44528ad2a2a7a4c0d..754d5391d9fa766b72c2a9c1b5ba4b6098f46d7b 100644 (file)
@@ -226,12 +226,12 @@ static uint32_t __init xen_platform_hvm(void)
        return xen_cpuid_base();
 }
 
-const struct hypervisor_x86 x86_hyper_xen_hvm = {
+const __initconst struct hypervisor_x86 x86_hyper_xen_hvm = {
        .name                   = "Xen HVM",
        .detect                 = xen_platform_hvm,
-       .init_platform          = xen_hvm_guest_init,
-       .pin_vcpu               = xen_pin_vcpu,
-       .x2apic_available       = xen_x2apic_para_available,
-       .init_mem_mapping       = xen_hvm_init_mem_mapping,
+       .type                   = X86_HYPER_XEN_HVM,
+       .init.init_platform     = xen_hvm_guest_init,
+       .init.x2apic_available  = xen_x2apic_para_available,
+       .init.init_mem_mapping  = xen_hvm_init_mem_mapping,
+       .runtime.pin_vcpu       = xen_pin_vcpu,
 };
-EXPORT_SYMBOL(x86_hyper_xen_hvm);
index e55d276afc709d6be1494c1a66adbb0ac00740d2..fbd054d6ac973d8402146c799c2fece6432e54e7 100644 (file)
@@ -1459,9 +1459,9 @@ static uint32_t __init xen_platform_pv(void)
        return 0;
 }
 
-const struct hypervisor_x86 x86_hyper_xen_pv = {
+const __initconst struct hypervisor_x86 x86_hyper_xen_pv = {
        .name                   = "Xen PV",
        .detect                 = xen_platform_pv,
-       .pin_vcpu               = xen_pin_vcpu,
+       .type                   = X86_HYPER_XEN_PV,
+       .runtime.pin_vcpu       = xen_pin_vcpu,
 };
-EXPORT_SYMBOL(x86_hyper_xen_pv);
index 937801ac2fe0eafb3d148072a604c4e50a159572..2cd134dd94d2140c0ee49a87d1b2ca7f89d56ddc 100644 (file)
@@ -1534,7 +1534,7 @@ static int __init hv_acpi_init(void)
 {
        int ret, t;
 
-       if (x86_hyper != &x86_hyper_ms_hyperv)
+       if (x86_hyper_type != X86_HYPER_MS_HYPERV)
                return -ENODEV;
 
        init_completion(&probe_event);
index 0f586780ceb4bee18a38428b889dba8d994ea4c7..1ae5c1ef3f5bbbc0c8cd0e4e35c24d37e493f703 100644 (file)
@@ -316,11 +316,9 @@ static int vmmouse_enable(struct psmouse *psmouse)
 /*
  * Array of supported hypervisors.
  */
-static const struct hypervisor_x86 *vmmouse_supported_hypervisors[] = {
-       &x86_hyper_vmware,
-#ifdef CONFIG_KVM_GUEST
-       &x86_hyper_kvm,
-#endif
+static enum x86_hypervisor_type vmmouse_supported_hypervisors[] = {
+       X86_HYPER_VMWARE,
+       X86_HYPER_KVM,
 };
 
 /**
@@ -331,7 +329,7 @@ static bool vmmouse_check_hypervisor(void)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(vmmouse_supported_hypervisors); i++)
-               if (vmmouse_supported_hypervisors[i] == x86_hyper)
+               if (vmmouse_supported_hypervisors[i] == x86_hyper_type)
                        return true;
 
        return false;
index 1e688bfec56728c3d00ebc353031c26fde29f187..9047c0a529b28221da8458668cd0673c0c5144d0 100644 (file)
@@ -1271,7 +1271,7 @@ static int __init vmballoon_init(void)
         * Check if we are running on VMware's hypervisor and bail out
         * if we are not.
         */
-       if (x86_hyper != &x86_hyper_vmware)
+       if (x86_hyper_type != X86_HYPER_VMWARE)
                return -ENODEV;
 
        for (is_2m_pages = 0; is_2m_pages < VMW_BALLOON_NUM_PAGE_SIZES;
index b4054fd5b6f66fc5695585b0f38b121462d02620..b19563f9a8ebb9c58e115b79fecde5a0167ba0e0 100644 (file)
@@ -7,8 +7,12 @@
  *             Juergen Gross <jgross@suse.com>
  */
 
-#ifdef CONFIG_HYPERVISOR_GUEST
-#include <asm/hypervisor.h>
+#ifdef CONFIG_X86
+#include <asm/x86_init.h>
+static inline void hypervisor_pin_vcpu(int cpu)
+{
+       x86_platform.hyper.pin_vcpu(cpu);
+}
 #else
 static inline void hypervisor_pin_vcpu(int cpu)
 {