From: Sheng Yang Subject: [RFC][PATCH 06/10] xen/hybrid: Add shared_info page for xen Date: Wed, 16 Sep 2009 16:42:27 +0800 Message-ID: <1253090551-7969-7-git-send-email-sheng@linux.intel.com> References: <1253090551-7969-1-git-send-email-sheng@linux.intel.com> Return-path: In-Reply-To: <1253090551-7969-1-git-send-email-sheng@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: Keir Fraser , Jeremy Fitzhardinge Cc: Jun Nakajima , Eddie Dong , linux-kernel@vger.kernel.org, xen-devel , Sheng Yang List-Id: xen-devel@lists.xenproject.org Reserved shared_info page in xen-head.S, as hypercall page Notice that we would modify the shared_info page, so put it in the data section. Signed-off-by: Sheng Yang --- arch/x86/xen/enlighten.c | 25 +++++++++++++++++++++++++ arch/x86/xen/xen-head.S | 6 ++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index b95c696..b6751ed 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -1112,6 +1113,28 @@ static int init_hybrid_info(void) return 0; } +extern struct shared_info shared_info_page; + +static int __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]; + + return 0; +} + void __init xen_start_hybrid(void) { int r; @@ -1124,5 +1147,7 @@ void __init xen_start_hybrid(void) return; xen_hybrid_init_irq_ops(); + + init_shared_info(); } 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") -- 1.5.4.5