From patchwork Fri Dec 18 15:03:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huaitong Han X-Patchwork-Id: 7886271 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 14268BEEE5 for ; Fri, 18 Dec 2015 15:05:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46B7F20480 for ; Fri, 18 Dec 2015 15:05:51 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E53420416 for ; Fri, 18 Dec 2015 15:05:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wZ0-0004PE-LD; Fri, 18 Dec 2015 15:03:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wZ0-0004P9-0W for xen-devel@lists.xen.org; Fri, 18 Dec 2015 15:03:22 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 6A/FD-24450-93024765; Fri, 18 Dec 2015 15:03:21 +0000 X-Env-Sender: huaitong.han@intel.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1450450997!11027679!1 X-Originating-IP: [192.55.52.120] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1699 invoked from network); 18 Dec 2015 15:03:18 -0000 Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by server-4.tower-27.messagelabs.com with SMTP; 18 Dec 2015 15:03:18 -0000 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP; 18 Dec 2015 07:03:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,446,1444719600"; d="scan'208";a="620211291" Received: from huaitong-desk.bj.intel.com ([10.255.30.245]) by FMSMGA003.fm.intel.com with ESMTP; 18 Dec 2015 07:03:15 -0800 From: Huaitong Han To: jbeulich@suse.com, andrew.cooper3@citrix.com, keir@xen.org Date: Fri, 18 Dec 2015 23:03:03 +0800 Message-Id: <1450450983-6095-1-git-send-email-huaitong.han@intel.com> X-Mailer: git-send-email 2.4.3 Cc: Huaitong Han , shuai.ruan@linux.intel.com, xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH V2] x86/xsaves: get_xsave_addr, check xsave header and support uncompressed format X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The check needs to be against the xsave header in the area, rather than Xen's maximum xfeature_mask. A guest might easily have a smaller xcr0 than the maximum Xen is willing to allow, causing the pointer below to be bogus. The get_xsave_addr() is modified to support uncompressed xstate areas. Signed-off-by: Huaitong Han Reviewed-by: Andrew Cooper --- xen/arch/x86/xstate.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index b65da38..4e87ab3 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -146,12 +146,15 @@ static void __init setup_xstate_comp(void) } } -static void *get_xsave_addr(void *xsave, unsigned int xfeature_idx) +static void *get_xsave_addr(struct xsave_struct *xsave, + unsigned int xfeature_idx) { - if ( !((1ul << xfeature_idx) & xfeature_mask) ) + if ( !((1ul << xfeature_idx) & xsave->xsave_hdr.xstate_bv) ) return NULL; - return xsave + xstate_comp_offsets[xfeature_idx]; + return (void *)xsave + (xsave_area_compressed(xsave) + ? xstate_comp_offsets + : xstate_offsets)[xfeature_idx]; } void expand_xsave_states(struct vcpu *v, void *dest, unsigned int size)