From owner-svn-src-projects@FreeBSD.ORG Sun Jan 12 12:31:14 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C926E98C; Sun, 12 Jan 2014 12:31:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B619C1E70; Sun, 12 Jan 2014 12:31:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CCVESq004142; Sun, 12 Jan 2014 12:31:14 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CCVEeL004140; Sun, 12 Jan 2014 12:31:14 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201401121231.s0CCVEeL004140@svn.freebsd.org> From: "Cherry G. Mathew" Date: Sun, 12 Jan 2014 12:31:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260561 - in projects/amd64_xen_pv/sys/amd64: 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.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jan 2014 12:31:14 -0000 Author: cherry Date: Sun Jan 12 12:31:14 2014 New Revision: 260561 URL: http://svnweb.freebsd.org/changeset/base/260561 Log: Disable the kernel's use of 'xsave' under XEN pv Approved by: gibbs@ (implicit) Modified: projects/amd64_xen_pv/sys/amd64/amd64/fpu.c projects/amd64_xen_pv/sys/amd64/xen/machdep.c Modified: projects/amd64_xen_pv/sys/amd64/amd64/fpu.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/amd64/fpu.c Sun Jan 12 12:14:38 2014 (r260560) +++ projects/amd64_xen_pv/sys/amd64/amd64/fpu.c Sun Jan 12 12:31:14 2014 (r260561) @@ -172,10 +172,12 @@ fpuinit_bsp1(void) u_int cp[4]; uint64_t xsave_mask_user; +#ifndef XEN /* XEN pv doesn't support xsave yet */ if ((cpu_feature2 & CPUID2_XSAVE) != 0) { use_xsave = 1; TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); } +#endif if (!use_xsave) return; Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/machdep.c Sun Jan 12 12:14:38 2014 (r260560) +++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c Sun Jan 12 12:31:14 2014 (r260561) @@ -586,10 +586,10 @@ initxen(struct start_info *si) /* Enable write permissions for code patching */ static vm_offset_t xsave_cpage; xsave_cpage = (vm_offset_t) ctx_switch_xsave & ~PAGE_MASK; - PT_SET_MA(xsave_cpage, phystomach(VTOP(xsave_cpage)) | PG_V | PG_U | PG_RW); + if (use_xsave) + PT_SET_MA(xsave_cpage, phystomach(VTOP(xsave_cpage)) | PG_V | PG_U | PG_RW); fpuinit(); - PT_SET_MA(xsave_cpage, phystomach(VTOP(xsave_cpage)) | PG_V | PG_U); - + if (use_xsave) PT_SET_MA(xsave_cpage, phystomach(VTOP(xsave_cpage)) | PG_V | PG_U); /* * Set up thread0 pcb after fpuinit calculated pcb + fpu save