From owner-svn-src-projects@FreeBSD.ORG Wed Oct 31 21:27:15 2012 Return-Path: <owner-svn-src-projects@FreeBSD.ORG> Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EDA6F470; Wed, 31 Oct 2012 21:27:15 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D56CB8FC08; Wed, 31 Oct 2012 21:27:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9VLRFmv034756; Wed, 31 Oct 2012 21:27:15 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9VLRFqe034754; Wed, 31 Oct 2012 21:27:15 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201210312127.q9VLRFqe034754@svn.freebsd.org> From: "Cherry G. Mathew" <cherry@FreeBSD.org> Date: Wed, 31 Oct 2012 21:27:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242415 - projects/amd64_xen_pv/sys/amd64/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" <svn-src-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects> List-Post: <mailto:svn-src-projects@freebsd.org> List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, <mailto:svn-src-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 31 Oct 2012 21:27:16 -0000 Author: cherry Date: Wed Oct 31 21:27:15 2012 New Revision: 242415 URL: http://svn.freebsd.org/changeset/base/242415 Log: Align the kernel stack to 16 bytes, and notify Xen of our kernel %rsp Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/machdep.c Wed Oct 31 21:24:31 2012 (r242414) +++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c Wed Oct 31 21:27:15 2012 (r242415) @@ -534,13 +534,16 @@ initxen(struct start_info *si) PCPU_SET(rsp0, (vm_offset_t) thread0.td_pcb & ~0xFul /* 16 byte aligned */); PCPU_SET(curpcb, thread0.td_pcb); + HYPERVISOR_stack_switch(GSEL(GDATA_SEL, SEL_KPL), + (unsigned long) PCPU_GET(rsp0)); /* Tell xen about the kernel stack */ + /* setup user mode selector glue */ _ucodesel = GSEL(GUCODE_SEL, SEL_UPL); _udatasel = GSEL(GUDATA_SEL, SEL_UPL); _ufssel = GSEL(GUFS32_SEL, SEL_UPL); _ugssel = GSEL(GUGS32_SEL, SEL_UPL); - return (u_int64_t) thread0.td_pcb; + return (u_int64_t) thread0.td_pcb & ~0xFul /* 16 byte aligned */; } /*