From nobody Sat Feb 7 07:26:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1619102756; cv=none; d=zohomail.com; s=zohoarc; b=oEdP8b0pzT9vcKf2tyob+RtL84CmTgeu+cRKUb3VMqRhhY5bbQ0kByWWiUoMtnO8vvOZYXsmYYlfN+qOF9lc9ZEk0P2vfX4zn/JT7RA/UWBxgZ/+A6u+czxQfbtsGBc6i79e+HaGibdDz7cWm90Cs1h170qpucfBMMYumeP5OEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619102756; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YTf7yEdgV9RjTpaGYCRR3T6Rl7rw+jl6IuRZaeG5MhQ=; b=ElKWyBZG6DmV0zTAcIU8wMYrNy4/uP/7BKg5+wkv175KCQ+iKnfBnbV+xf3qDzxz5IvdoIVlWXzrSSzyFeT7eoubkQ7zFmrGxl5UmMIfyLgja2oWVVrtyQxp7IdsNY1vKxtAsRTtR9WP1gTbs1YREtrRD9g4RXH49fu8RBSJhr0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 161910275677827.660323473348285; Thu, 22 Apr 2021 07:45:56 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.115472.220320 (Exim 4.92) (envelope-from ) id 1lZaaD-0003VS-ML; Thu, 22 Apr 2021 14:45:33 +0000 Received: by outflank-mailman (output) from mailman id 115472.220320; Thu, 22 Apr 2021 14:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZaaD-0003VK-J0; Thu, 22 Apr 2021 14:45:33 +0000 Received: by outflank-mailman (input) for mailman id 115472; Thu, 22 Apr 2021 14:45:32 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lZaaC-0003Uc-DZ for xen-devel@lists.xenproject.org; Thu, 22 Apr 2021 14:45:32 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c82a5c0c-1aac-421f-a9af-49f2287862ba; Thu, 22 Apr 2021 14:45:27 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D1D60ABB1; Thu, 22 Apr 2021 14:45:26 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c82a5c0c-1aac-421f-a9af-49f2287862ba X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1619102726; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YTf7yEdgV9RjTpaGYCRR3T6Rl7rw+jl6IuRZaeG5MhQ=; b=ZqMrAy6T00gH0krJlMdW+ccEdJmDHv/RsnxZcJ81EiVvSOcb+Tf2dkAlYMMw9kV+6wptDS M5WZQXUeoYdWyjl1HF+VY2uQZw3CQfE1DgT+l5OSNK0YoV9WcPsEtikz+T3U/p8Px90m15 DEv4cUS3wmphTfpNm78PzmKYvCyAecg= Subject: [PATCH v3 04/22] x86/xstate: re-use valid_xcr0() for boot-time checks From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <322de6db-e01f-0b57-5777-5d94a13c441a@suse.com> Message-ID: <77b149c5-e7b8-6335-dd86-745c6cc69a06@suse.com> Date: Thu, 22 Apr 2021 16:45:27 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <322de6db-e01f-0b57-5777-5d94a13c441a@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Instead of (just partially) open-coding it, re-use the function after suitably moving it up. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -609,6 +609,34 @@ unsigned int xstate_ctxt_size(u64 xcr0) return _xstate_ctxt_size(xcr0); } =20 +static bool valid_xcr0(uint64_t xcr0) +{ + /* FP must be unconditionally set. */ + if ( !(xcr0 & X86_XCR0_FP) ) + return false; + + /* YMM depends on SSE. */ + if ( (xcr0 & X86_XCR0_YMM) && !(xcr0 & X86_XCR0_SSE) ) + return false; + + if ( xcr0 & (X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM) ) + { + /* OPMASK, ZMM, and HI_ZMM require YMM. */ + if ( !(xcr0 & X86_XCR0_YMM) ) + return false; + + /* OPMASK, ZMM, and HI_ZMM must be the same. */ + if ( ~xcr0 & (X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM) ) + return false; + } + + /* BNDREGS and BNDCSR must be the same. */ + if ( !(xcr0 & X86_XCR0_BNDREGS) !=3D !(xcr0 & X86_XCR0_BNDCSR) ) + return false; + + return true; +} + /* Collect the information of processor's extended state */ void xstate_init(struct cpuinfo_x86 *c) { @@ -644,10 +672,9 @@ void xstate_init(struct cpuinfo_x86 *c) } =20 cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx); - - BUG_ON((eax & XSTATE_FP_SSE) !=3D XSTATE_FP_SSE); - BUG_ON((eax & X86_XCR0_YMM) && !(eax & X86_XCR0_SSE)); feature_mask =3D (((u64)edx << 32) | eax) & XCNTXT_MASK; + BUG_ON(!valid_xcr0(feature_mask)); + BUG_ON(!(feature_mask & X86_XCR0_SSE)); =20 /* * Set CR4_OSXSAVE and run "cpuid" to get xsave_cntxt_size. @@ -677,31 +704,6 @@ void xstate_init(struct cpuinfo_x86 *c) BUG(); } =20 -static bool valid_xcr0(u64 xcr0) -{ - /* FP must be unconditionally set. */ - if ( !(xcr0 & X86_XCR0_FP) ) - return false; - - /* YMM depends on SSE. */ - if ( (xcr0 & X86_XCR0_YMM) && !(xcr0 & X86_XCR0_SSE) ) - return false; - - if ( xcr0 & (X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM) ) - { - /* OPMASK, ZMM, and HI_ZMM require YMM. */ - if ( !(xcr0 & X86_XCR0_YMM) ) - return false; - - /* OPMASK, ZMM, and HI_ZMM must be the same. */ - if ( ~xcr0 & (X86_XCR0_OPMASK | X86_XCR0_ZMM | X86_XCR0_HI_ZMM) ) - return false; - } - - /* BNDREGS and BNDCSR must be the same. */ - return !(xcr0 & X86_XCR0_BNDREGS) =3D=3D !(xcr0 & X86_XCR0_BNDCSR); -} - int validate_xstate(const struct domain *d, uint64_t xcr0, uint64_t xcr0_a= ccum, const struct xsave_hdr *hdr) {