From patchwork Thu Sep 14 03:23:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang, Weijiang" X-Patchwork-Id: 139707 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp489041vqi; Thu, 14 Sep 2023 10:00:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXHVTI5Aua9orW8lirgqYGhj98RJ7exCUij0XNgc3kuarPE0on7ARH0NMTaDQ7TZ/Ecy53 X-Received: by 2002:a05:6a00:3091:b0:68a:42d0:6b9b with SMTP id bh17-20020a056a00309100b0068a42d06b9bmr6279708pfb.3.1694710799891; Thu, 14 Sep 2023 09:59:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694710799; cv=none; d=google.com; s=arc-20160816; b=C60YiqtBegAKcDvj/ssU19R3tNd2igZMVfO1VvLIP1zAPjkRdCgFLiaqBTlLScysWS wxv+hb3Wq04CXgFzF3hs27yqepz5dhsLELiidUjsj/RT5710Kp6OTdZZCMYyoUpQvY6I yyNOTL9UL2DG8vKYG6y1kbFmQL/n6nx0eCWMf2SriEBDgfWM690VSdSEByDfcMgLa4cT 5UB2lyRDSjak8Nzb4F2zdUzWYE1FdfONAJQoO0g5e6xWrAHYZ9OutbXMfSds8N5XbJC1 jspePwKvAoBm0+Bf8ua/R2tNT3QuCN7RjC0E98n9BWVvjpbEVaO0iLAlmegVs6ugXtjw icYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4cCg4cl0sgNB+0Scy33zONxGQc7yEzBlhwxNEWru1t8=; fh=VKDky7JI6Mwho+jW2kjyYjgneGFqVaPlgJX6sIBNvQM=; b=kqI8UEss6YU6UReO/9cDU88I/uJqOzm/zG/kncRO5F5NRo19OsCpU1yoxN7XsUNyU/ vcNmLInTXNsPGRhyP91JeIxCIgwoBmt21DBkaKP78wy/8CfJeq91XJrv43IbXah8oR/6 NLIVK69LZaZl1ONzYZqzzTfy4l18WwdZ2i0RadAe74KAk9olsymryp/Iui/15Z1mpQTQ S2XbN6O6XHUI7OVVhEykYEV9gST7vpQ2GKtWYqCyH0VnF/68WemqYtWtSfFsX5D0DS52 xfyBgSjdwhL18R38LQ2Vuv18wAistyJVv9V5CFjvqiTFeBbPD9Wh6gzxbjrROIcaQCBk EsFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dyyBO5i0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id fo24-20020a056a00601800b00690158064aasi1867906pfb.118.2023.09.14.09.59.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 09:59:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dyyBO5i0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 32F9E81E9A40; Wed, 13 Sep 2023 23:29:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235507AbjING3B (ORCPT + 35 others); Thu, 14 Sep 2023 02:29:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235411AbjING2s (ORCPT ); Thu, 14 Sep 2023 02:28:48 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FCEBF9; Wed, 13 Sep 2023 23:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694672924; x=1726208924; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kg4jzy9ndQH5j3Qk6jXnrqWtPLjorVO+dQ5iT2oQlDE=; b=dyyBO5i0YubFNjkr5xUeIVfW/RTxmsNv+smF/gQFoyXYvGjquQ8ikW9c lu8Wo4JX09VUdX7N+9MWZNCdgHD9BQ0DnMif7eQ1JdFtyRGxfLRKexkz5 E91+0Gp9qT/pSRuRh7Qz1Rl1qy0Q6/gKAld6FFMz9l3SDBIAQXiDqrj1R 41cXPfUEQQWwK8F4oyFRMmvBqoD2GmUCob+jz/FEmLH3S2TXketA/oe9x REkkJ4VhwI1sklm8oFIT5BGCE72MO6nUsTLVzU50LMRbI7UJGMjYQc0Fd YRKiw4UwKwJ6PHlJtuObvhGpgSLTbpUTwgoL73ZWljnuC5mIvbnPZ8Y2N w==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="382672467" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="382672467" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 23:28:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="809937993" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="809937993" Received: from embargo.jf.intel.com ([10.165.9.183]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 23:28:43 -0700 From: Yang Weijiang To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: dave.hansen@intel.com, tglx@linutronix.de, peterz@infradead.org, seanjc@google.com, pbonzini@redhat.com, rick.p.edgecombe@intel.com, kvm@vger.kernel.org, yang.zhong@intel.com, jing2.liu@intel.com, chao.gao@intel.com, Yang Weijiang Subject: [RFC PATCH 6/8] x86/fpu/xstate: Opt-in kernel dynamic bits when calculate guest xstate size Date: Wed, 13 Sep 2023 23:23:32 -0400 Message-Id: <20230914032334.75212-7-weijiang.yang@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230914032334.75212-1-weijiang.yang@intel.com> References: <20230914032334.75212-1-weijiang.yang@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 23:29:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777033072064235474 X-GMAIL-MSGID: 1777033072064235474 When user space requests guest xstate permits, the sufficient xstate size is calculated from permitted mask. Currently the max guest permits are set to fpu_kernel_cfg.default_features, and the latter doesn't include kernel dynamic xfeatures, so add them back for correct guest fpstate size. If guest dynamic xfeatures are enabled, KVM re-allocates guest fpstate area with above resulting size before launches VM. Signed-off-by: Yang Weijiang --- arch/x86/kernel/fpu/xstate.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 4753c677e2e1..c5d903b4df4d 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -1636,9 +1636,17 @@ static int __xstate_request_perm(u64 permitted, u64 requested, bool guest) /* Calculate the resulting kernel state size */ mask = permitted | requested; - /* Take supervisor states into account on the host */ + /* + * Take supervisor states into account on the host. And add + * kernel dynamic xfeatures to guest since guest kernel may + * enable corresponding CPU feaures and the xstate registers + * need to be saved/restored properly. + */ if (!guest) mask |= xfeatures_mask_supervisor(); + else + mask |= fpu_kernel_dynamic_xfeatures; + ksize = xstate_calculate_size(mask, compacted); /* Calculate the resulting user state size */