Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755926Ab0BBIUw (ORCPT ); Tue, 2 Feb 2010 03:20:52 -0500 Received: from mga03.intel.com ([143.182.124.21]:16564 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755399Ab0BBIUm (ORCPT ); Tue, 2 Feb 2010 03:20:42 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,316,1257148800"; d="scan'208";a="239406845" From: Sheng Yang To: Jeremy Fitzhardinge , Keir Fraser Cc: xen-devel , linux-kernel@vger.kernel.org, Sheng Yang , "Yaozu (Eddie) Dong" Subject: [PATCH 3/6] xen/hybrid: Xen Hybrid Extension initialization Date: Tue, 2 Feb 2010 16:19:04 +0800 Message-Id: <1265098747-10117-4-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265098747-10117-1-git-send-email-sheng@linux.intel.com> References: <1265098747-10117-1-git-send-email-sheng@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8159 Lines: 285 The Hybrid Extension is started from real mode like HVM guest, but also with a component based PV feature selection(e.g. PV halt, PV timer, event channel, then PV drivers). So guest with Hybrid extension feature can takes the advantages of both H/W virtualization and Para-Virtualization. This patch introduced the Hybrid Extension guest initialization. Guest would detect Hybrid capability using CPUID 0x40000002.edx, then call HVMOP_enable_hybrid hypercall to enable hybrid support in hypervisor. Signed-off-by: Sheng Yang Signed-off-by: Yaozu (Eddie) Dong --- arch/x86/include/asm/xen/cpuid.h | 5 ++ arch/x86/xen/enlighten.c | 118 ++++++++++++++++++++++++++++++++++++ arch/x86/xen/irq.c | 21 ++++++ arch/x86/xen/xen-head.S | 6 ++ arch/x86/xen/xen-ops.h | 1 + include/xen/interface/hvm/hvm_op.h | 7 ++ include/xen/xen.h | 9 +++ 7 files changed, 167 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/xen/cpuid.h b/arch/x86/include/asm/xen/cpuid.h index 8787f03..b66fee2 100644 --- a/arch/x86/include/asm/xen/cpuid.h +++ b/arch/x86/include/asm/xen/cpuid.h @@ -65,4 +65,9 @@ #define _XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD 0 #define XEN_CPUID_FEAT1_MMU_PT_UPDATE_PRESERVE_AD (1u<<0) +#define _XEN_CPUID_FEAT2_HYBRID 0 +#define XEN_CPUID_FEAT2_HYBRID (1u<<0) +#define _XEN_CPUID_FEAT2_HYBRID_EVTCHN 1 +#define XEN_CPUID_FEAT2_HYBRID_EVTCHN (1u<<1) + #endif /* __XEN_PUBLIC_ARCH_X86_CPUID_H__ */ diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 2b26dd5..2f1a3df 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -34,6 +34,8 @@ #include #include #include +#include +#include #include #include #include @@ -43,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -1194,3 +1197,118 @@ asmlinkage void __init xen_start_kernel(void) x86_64_start_reservations((char *)__pa_symbol(&boot_params)); #endif } + +static void __init xen_hybrid_banner(void) +{ + unsigned version = HYPERVISOR_xen_version(XENVER_version, NULL); + struct xen_extraversion extra; + HYPERVISOR_xen_version(XENVER_extraversion, &extra); + + printk(KERN_INFO "Booting hybrid kernel on %s\n", pv_info.name); + printk(KERN_INFO "Xen version: %d.%d%s\n", + version >> 16, version & 0xffff, extra.extraversion); +} + +static int xen_para_available(void) +{ + uint32_t eax, ebx, ecx, edx; + cpuid(XEN_CPUID_LEAF(0), &eax, &ebx, &ecx, &edx); + + if (ebx == XEN_CPUID_SIGNATURE_EBX && + ecx == XEN_CPUID_SIGNATURE_ECX && + edx == XEN_CPUID_SIGNATURE_EDX && + ((eax - XEN_CPUID_LEAF(0)) >= 2)) + return 1; + + return 0; +} + +u32 xen_hybrid_status; +EXPORT_SYMBOL_GPL(xen_hybrid_status); + +static int enable_hybrid(u64 flags) +{ + struct xen_hvm_hybrid_type a; + + a.domid = DOMID_SELF; + a.flags = flags; + return HYPERVISOR_hvm_op(HVMOP_enable_hybrid, &a); +} + +static int init_hybrid_info(void) +{ + uint32_t ecx, edx, pages, msr; + u64 pfn; + u32 flags = 0; + + if (!xen_para_available()) + return -EINVAL; + + cpuid(XEN_CPUID_LEAF(2), &pages, &msr, &ecx, &edx); + + /* Check if hybrid mode is supported */ + if (!(edx & XEN_CPUID_FEAT2_HYBRID)) + return -ENODEV; + + xen_hybrid_status = XEN_HYBRID_ENABLED; + + /* We only support 1 page of hypercall for now */ + if (pages != 1) + return -ENOMEM; + + pfn = __pa(hypercall_page); + wrmsrl(msr, pfn); + + xen_setup_features(); + + if (enable_hybrid(flags)) + return -EINVAL; + + x86_init.oem.banner = xen_hybrid_banner; + pv_info = xen_info; + pv_info.kernel_rpl = 0; + + return 0; +} + +extern struct shared_info shared_info_page; + +static void __init init_shared_info(void) +{ + struct xen_add_to_physmap xatp; + + xatp.domid = DOMID_SELF; + xatp.idx = 0; + xatp.space = XENMAPSPACE_shared_info; + xatp.gpfn = __pa(&shared_info_page) >> PAGE_SHIFT; + if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp)) + BUG(); + + HYPERVISOR_shared_info = (struct shared_info *)&shared_info_page; + + /* Don't do the full vcpu_info placement stuff until we have a + possible map and a non-dummy shared_info. */ + per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0]; +} + +void __init xen_hybrid_init(void) +{ +#ifdef CONFIG_X86_32 + return; +#else + int r; + + /* Ensure the we won't confused with PV */ + if (xen_domain_type == XEN_PV_DOMAIN) + return; + + r = init_hybrid_info(); + if (r < 0) + return; + + init_shared_info(); + + xen_hybrid_init_irq_ops(); +#endif +} + diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c index 9d30105..da4faf4 100644 --- a/arch/x86/xen/irq.c +++ b/arch/x86/xen/irq.c @@ -131,3 +131,24 @@ void __init xen_init_irq_ops() pv_irq_ops = xen_irq_ops; x86_init.irqs.intr_init = xen_init_IRQ; } + +static void xen_hybrid_safe_halt(void) +{ + /* Do local_irq_enable() explicitly in hybrid guest */ + local_irq_enable(); + xen_safe_halt(); +} + +static void xen_hybrid_halt(void) +{ + if (irqs_disabled()) + HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); + else + xen_hybrid_safe_halt(); +} + +void __init xen_hybrid_init_irq_ops(void) +{ + pv_irq_ops.safe_halt = xen_hybrid_safe_halt; + pv_irq_ops.halt = xen_hybrid_halt; +} diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 1a5ff24..26041ce 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -33,6 +33,12 @@ ENTRY(hypercall_page) .skip PAGE_SIZE_asm .popsection +.pushsection .data + .align PAGE_SIZE_asm +ENTRY(shared_info_page) + .skip PAGE_SIZE_asm +.popsection + ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6") ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0") diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index f9153a3..89e38ba 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h @@ -41,6 +41,7 @@ void xen_vcpu_restore(void); void __init xen_build_dynamic_phys_to_machine(void); void xen_init_irq_ops(void); +void xen_hybrid_init_irq_ops(void); void xen_setup_timer(int cpu); void xen_setup_runstate_info(int cpu); void xen_teardown_timer(int cpu); diff --git a/include/xen/interface/hvm/hvm_op.h b/include/xen/interface/hvm/hvm_op.h index 7c74ba4..fac6e82 100644 --- a/include/xen/interface/hvm/hvm_op.h +++ b/include/xen/interface/hvm/hvm_op.h @@ -69,4 +69,11 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_hvm_set_pci_link_route); /* Flushes all VCPU TLBs: @arg must be NULL. */ #define HVMOP_flush_tlbs 5 +#define HVMOP_enable_hybrid 9 +struct xen_hvm_hybrid_type { + domid_t domid; + uint32_t flags; +#define HVM_HYBRID_EVTCHN (1ull<<1) +}; + #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */ diff --git a/include/xen/xen.h b/include/xen/xen.h index a164024..aace9cc 100644 --- a/include/xen/xen.h +++ b/include/xen/xen.h @@ -9,6 +9,7 @@ enum xen_domain_type { #ifdef CONFIG_XEN extern enum xen_domain_type xen_domain_type; +extern void xen_hybrid_init(void); #else #define xen_domain_type XEN_NATIVE #endif @@ -19,6 +20,14 @@ extern enum xen_domain_type xen_domain_type; #define xen_hvm_domain() (xen_domain() && \ xen_domain_type == XEN_HVM_DOMAIN) +#define XEN_HYBRID_ENABLED (1u << 0) +#define XEN_HYBRID_EVTCHN_ENABLED (1u << 1) +extern u32 xen_hybrid_status; + +#define xen_hybrid_enabled() (xen_hybrid_status & XEN_HYBRID_ENABLED) +#define xen_hybrid_evtchn_enabled() \ + (xen_hybrid_status & XEN_HYBRID_EVTCHN_ENABLED) + #ifdef CONFIG_XEN_DOM0 #include #include -- 1.5.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/