Commit f72e38e8 authored by Juergen Gross's avatar Juergen Gross Committed by Ingo Molnar

x86/virt, x86/platform: Merge 'struct x86_hyper' into 'struct x86_platform' and 'struct x86_init'

Instead of x86_hyper being either NULL on bare metal or a pointer to a
struct hypervisor_x86 in case of the kernel running as a guest merge
the struct into x86_platform and x86_init.

This will remove the need for wrappers making it hard to find out what
is being called. With dummy functions added for all callbacks testing
for a NULL function pointer can be removed, too.
Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: akataria@vmware.com
Cc: boris.ostrovsky@oracle.com
Cc: devel@linuxdriverproject.org
Cc: haiyangz@microsoft.com
Cc: kvm@vger.kernel.org
Cc: kys@microsoft.com
Cc: pbonzini@redhat.com
Cc: rkrcmar@redhat.com
Cc: rusty@rustcorp.com.au
Cc: sthemmin@microsoft.com
Cc: virtualization@lists.linux-foundation.org
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/20171109132739.23465-2-jgross@suse.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b5cd3b51
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#ifdef CONFIG_HYPERVISOR_GUEST #ifdef CONFIG_HYPERVISOR_GUEST
#include <asm/kvm_para.h> #include <asm/kvm_para.h>
#include <asm/x86_init.h>
#include <asm/xen/hypervisor.h> #include <asm/xen/hypervisor.h>
/* /*
...@@ -35,17 +36,11 @@ struct hypervisor_x86 { ...@@ -35,17 +36,11 @@ struct hypervisor_x86 {
/* Detection routine */ /* Detection routine */
uint32_t (*detect)(void); uint32_t (*detect)(void);
/* Platform setup (run once per boot) */ /* init time callbacks */
void (*init_platform)(void); struct x86_hyper_init init;
/* X2APIC detection (run once per boot) */ /* runtime callbacks */
bool (*x2apic_available)(void); struct x86_hyper_runtime runtime;
/* pin current vcpu to specified physical cpu (run rarely) */
void (*pin_vcpu)(int);
/* called during init_mem_mapping() to setup early mappings. */
void (*init_mem_mapping)(void);
}; };
extern const struct hypervisor_x86 *x86_hyper; extern const struct hypervisor_x86 *x86_hyper;
...@@ -58,17 +53,7 @@ extern const struct hypervisor_x86 x86_hyper_xen_hvm; ...@@ -58,17 +53,7 @@ extern const struct hypervisor_x86 x86_hyper_xen_hvm;
extern const struct hypervisor_x86 x86_hyper_kvm; extern const struct hypervisor_x86 x86_hyper_kvm;
extern void init_hypervisor_platform(void); 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 #else
static inline void init_hypervisor_platform(void) { } 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 /* CONFIG_HYPERVISOR_GUEST */
#endif /* _ASM_X86_HYPERVISOR_H */ #endif /* _ASM_X86_HYPERVISOR_H */
...@@ -114,6 +114,18 @@ struct x86_init_pci { ...@@ -114,6 +114,18 @@ struct x86_init_pci {
void (*fixup_irqs)(void); 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 * struct x86_init_ops - functions for platform specific setup
* *
...@@ -127,6 +139,7 @@ struct x86_init_ops { ...@@ -127,6 +139,7 @@ struct x86_init_ops {
struct x86_init_timers timers; struct x86_init_timers timers;
struct x86_init_iommu iommu; struct x86_init_iommu iommu;
struct x86_init_pci pci; struct x86_init_pci pci;
struct x86_hyper_init hyper;
}; };
/** /**
...@@ -199,6 +212,15 @@ struct x86_legacy_features { ...@@ -199,6 +212,15 @@ struct x86_legacy_features {
struct x86_legacy_devices devices; 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 * struct x86_platform_ops - platform specific runtime functions
* @calibrate_cpu: calibrate CPU * @calibrate_cpu: calibrate CPU
...@@ -218,6 +240,7 @@ struct x86_legacy_features { ...@@ -218,6 +240,7 @@ struct x86_legacy_features {
* possible in x86_early_init_platform_quirks() by * possible in x86_early_init_platform_quirks() by
* only using the current x86_hardware_subarch * only using the current x86_hardware_subarch
* semantics. * semantics.
* @hyper: x86 hypervisor specific runtime callbacks
*/ */
struct x86_platform_ops { struct x86_platform_ops {
unsigned long (*calibrate_cpu)(void); unsigned long (*calibrate_cpu)(void);
...@@ -233,6 +256,7 @@ struct x86_platform_ops { ...@@ -233,6 +256,7 @@ struct x86_platform_ops {
void (*apic_post_init)(void); void (*apic_post_init)(void);
struct x86_legacy_features legacy; struct x86_legacy_features legacy;
void (*set_legacy_features)(void); void (*set_legacy_features)(void);
struct x86_hyper_runtime hyper;
}; };
struct pci_dev; struct pci_dev;
......
...@@ -1645,7 +1645,7 @@ static __init void try_to_enable_x2apic(int remap_mode) ...@@ -1645,7 +1645,7 @@ static __init void try_to_enable_x2apic(int remap_mode)
* under KVM * under KVM
*/ */
if (max_physical_apicid > 255 || if (max_physical_apicid > 255 ||
!hypervisor_x2apic_available()) { !x86_init.hyper.x2apic_available()) {
pr_info("x2apic: IRQ remapping doesn't support X2APIC mode\n"); pr_info("x2apic: IRQ remapping doesn't support X2APIC mode\n");
x2apic_disable(); x2apic_disable();
return; return;
......
...@@ -44,51 +44,49 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] = ...@@ -44,51 +44,49 @@ static const __initconst struct hypervisor_x86 * const hypervisors[] =
const struct hypervisor_x86 *x86_hyper; const struct hypervisor_x86 *x86_hyper;
EXPORT_SYMBOL(x86_hyper); EXPORT_SYMBOL(x86_hyper);
static inline void __init static inline const struct hypervisor_x86 * __init
detect_hypervisor_vendor(void) 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; uint32_t pri, max_pri = 0;
for (p = hypervisors; p < hypervisors + ARRAY_SIZE(hypervisors); p++) { for (p = hypervisors; p < hypervisors + ARRAY_SIZE(hypervisors); p++) {
h = *p; pri = (*p)->detect();
pri = h->detect(); if (pri > max_pri) {
if (pri != 0 && pri > max_pri) {
max_pri = pri; max_pri = pri;
x86_hyper = h; h = *p;
} }
} }
if (max_pri) if (h)
pr_info("Hypervisor detected: %s\n", x86_hyper->name); 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(); for (i = 0; i < n; i++)
if (from[i])
if (!x86_hyper) to[i] = from[i];
return;
if (x86_hyper->init_platform)
x86_hyper->init_platform();
} }
bool __init hypervisor_x2apic_available(void) void __init init_hypervisor_platform(void)
{ {
return x86_hyper && const struct hypervisor_x86 *h;
x86_hyper->x2apic_available &&
x86_hyper->x2apic_available();
}
void hypervisor_pin_vcpu(int cpu) h = detect_hypervisor_vendor();
{
if (!x86_hyper) if (!h)
return; return;
if (x86_hyper->pin_vcpu) copy_array(&h->init, &x86_init.hyper, sizeof(h->init));
x86_hyper->pin_vcpu(cpu); copy_array(&h->runtime, &x86_platform.hyper, sizeof(h->runtime));
else
WARN_ONCE(1, "vcpu pinning requested but not supported!\n"); x86_hyper = h;
x86_init.hyper.init_platform();
} }
...@@ -257,6 +257,6 @@ static void __init ms_hyperv_init_platform(void) ...@@ -257,6 +257,6 @@ static void __init ms_hyperv_init_platform(void)
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = { const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
.name = "Microsoft Hyper-V", .name = "Microsoft Hyper-V",
.detect = ms_hyperv_platform, .detect = ms_hyperv_platform,
.init_platform = ms_hyperv_init_platform, .init.init_platform = ms_hyperv_init_platform,
}; };
EXPORT_SYMBOL(x86_hyper_ms_hyperv); EXPORT_SYMBOL(x86_hyper_ms_hyperv);
...@@ -208,7 +208,7 @@ static bool __init vmware_legacy_x2apic_available(void) ...@@ -208,7 +208,7 @@ static bool __init vmware_legacy_x2apic_available(void)
const __refconst struct hypervisor_x86 x86_hyper_vmware = { const __refconst struct hypervisor_x86 x86_hyper_vmware = {
.name = "VMware", .name = "VMware",
.detect = vmware_platform, .detect = vmware_platform,
.init_platform = vmware_platform_setup, .init.init_platform = vmware_platform_setup,
.x2apic_available = vmware_legacy_x2apic_available, .init.x2apic_available = vmware_legacy_x2apic_available,
}; };
EXPORT_SYMBOL(x86_hyper_vmware); EXPORT_SYMBOL(x86_hyper_vmware);
...@@ -547,7 +547,7 @@ static uint32_t __init kvm_detect(void) ...@@ -547,7 +547,7 @@ static uint32_t __init kvm_detect(void)
const struct hypervisor_x86 x86_hyper_kvm __refconst = { const struct hypervisor_x86 x86_hyper_kvm __refconst = {
.name = "KVM", .name = "KVM",
.detect = kvm_detect, .detect = kvm_detect,
.x2apic_available = kvm_para_available, .init.x2apic_available = kvm_para_available,
}; };
EXPORT_SYMBOL_GPL(x86_hyper_kvm); EXPORT_SYMBOL_GPL(x86_hyper_kvm);
......
...@@ -28,6 +28,8 @@ void x86_init_noop(void) { } ...@@ -28,6 +28,8 @@ void x86_init_noop(void) { }
void __init x86_init_uint_noop(unsigned int unused) { } void __init x86_init_uint_noop(unsigned int unused) { }
int __init iommu_init_noop(void) { return 0; } int __init iommu_init_noop(void) { return 0; }
void iommu_shutdown_noop(void) { } 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 * The platform setup functions are preset with the default functions
...@@ -81,6 +83,12 @@ struct x86_init_ops x86_init __initdata = { ...@@ -81,6 +83,12 @@ struct x86_init_ops x86_init __initdata = {
.init_irq = x86_default_pci_init_irq, .init_irq = x86_default_pci_init_irq,
.fixup_irqs = x86_default_pci_fixup_irqs, .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 = { struct x86_cpuinit_ops x86_cpuinit = {
...@@ -101,6 +109,7 @@ struct x86_platform_ops x86_platform __ro_after_init = { ...@@ -101,6 +109,7 @@ struct x86_platform_ops x86_platform __ro_after_init = {
.get_nmi_reason = default_get_nmi_reason, .get_nmi_reason = default_get_nmi_reason,
.save_sched_clock_state = tsc_save_sched_clock_state, .save_sched_clock_state = tsc_save_sched_clock_state,
.restore_sched_clock_state = tsc_restore_sched_clock_state, .restore_sched_clock_state = tsc_restore_sched_clock_state,
.hyper.pin_vcpu = x86_op_int_noop,
}; };
EXPORT_SYMBOL_GPL(x86_platform); EXPORT_SYMBOL_GPL(x86_platform);
......
...@@ -671,7 +671,7 @@ void __init init_mem_mapping(void) ...@@ -671,7 +671,7 @@ void __init init_mem_mapping(void)
load_cr3(swapper_pg_dir); load_cr3(swapper_pg_dir);
__flush_tlb_all(); __flush_tlb_all();
hypervisor_init_mem_mapping(); x86_init.hyper.init_mem_mapping();
early_memtest(0, max_pfn_mapped << PAGE_SHIFT); early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
} }
......
...@@ -229,9 +229,9 @@ static uint32_t __init xen_platform_hvm(void) ...@@ -229,9 +229,9 @@ static uint32_t __init xen_platform_hvm(void)
const struct hypervisor_x86 x86_hyper_xen_hvm = { const struct hypervisor_x86 x86_hyper_xen_hvm = {
.name = "Xen HVM", .name = "Xen HVM",
.detect = xen_platform_hvm, .detect = xen_platform_hvm,
.init_platform = xen_hvm_guest_init, .init.init_platform = xen_hvm_guest_init,
.pin_vcpu = xen_pin_vcpu, .init.x2apic_available = xen_x2apic_para_available,
.x2apic_available = xen_x2apic_para_available, .init.init_mem_mapping = xen_hvm_init_mem_mapping,
.init_mem_mapping = xen_hvm_init_mem_mapping, .runtime.pin_vcpu = xen_pin_vcpu,
}; };
EXPORT_SYMBOL(x86_hyper_xen_hvm); EXPORT_SYMBOL(x86_hyper_xen_hvm);
...@@ -1463,6 +1463,6 @@ static uint32_t __init xen_platform_pv(void) ...@@ -1463,6 +1463,6 @@ static uint32_t __init xen_platform_pv(void)
const struct hypervisor_x86 x86_hyper_xen_pv = { const struct hypervisor_x86 x86_hyper_xen_pv = {
.name = "Xen PV", .name = "Xen PV",
.detect = xen_platform_pv, .detect = xen_platform_pv,
.pin_vcpu = xen_pin_vcpu, .runtime.pin_vcpu = xen_pin_vcpu,
}; };
EXPORT_SYMBOL(x86_hyper_xen_pv); EXPORT_SYMBOL(x86_hyper_xen_pv);
...@@ -7,8 +7,12 @@ ...@@ -7,8 +7,12 @@
* Juergen Gross <jgross@suse.com> * Juergen Gross <jgross@suse.com>
*/ */
#ifdef CONFIG_HYPERVISOR_GUEST #ifdef CONFIG_X86
#include <asm/hypervisor.h> #include <asm/x86_init.h>
static inline void hypervisor_pin_vcpu(int cpu)
{
x86_platform.hyper.pin_vcpu(cpu);
}
#else #else
static inline void hypervisor_pin_vcpu(int cpu) static inline void hypervisor_pin_vcpu(int cpu)
{ {
......
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