From nobody Thu Nov 20 14:12:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1763436175; cv=none; d=zohomail.com; s=zohoarc; b=F5GWw/OozOg1+9PBzeAWb8UZPQYQkqnnGd+MSz3TZWToGcx+K5cSRIwa5bQEFfx7hK+nO4hGM5j0h+MIes6vTwyhTofe/S2fyhu5PeX5PtOqlmaTBcluTCkfs4nBv/cnYXESJ6gYH4Ag7ueb8Amf7ZgpoEQDMGjA+19oGHg6j5g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763436175; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ahi9QdQNMkWUm9xlUOk+SNJNnOkN06AoIylYu7NQQPY=; b=VrH7L5QDyo7ZvUhBWMpGmWwq2rNfZWD92SxZem0DgE6FtNSE9fApRb1u3vmW6FKSueu6Kbp8yCxOl7VOviTKtRc/HuLh5Jbqc5aTTOGKCOASNnexzkq4qGWArHhD0dnmroY46ZPDsYNMp05O/AfsiP1e//4NnndOem9Wt/6yEK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1763436175761729.8014515116753; Mon, 17 Nov 2025 19:22:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vLCI3-00033B-NT; Mon, 17 Nov 2025 22:21:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLCHr-0002TU-PR for qemu-devel@nongnu.org; Mon, 17 Nov 2025 22:21:47 -0500 Received: from mgamail.intel.com ([192.198.163.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vLCHg-0004Cz-Lw for qemu-devel@nongnu.org; Mon, 17 Nov 2025 22:21:38 -0500 Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2025 19:21:17 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.39]) by fmviesa001.fm.intel.com with ESMTP; 17 Nov 2025 19:21:13 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763436097; x=1794972097; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Lnoh54IK1xdUE7ReHUApDtVaHR1nAbgq/jys15IExB8=; b=cu2ivq/oCFaaMEMv0+dhcbvozQ7qwV4cK8wnfvYABuT/aU88arbDd4oV 0pn+AL8gPfjSLsOFCbhvYciraGmt73DhMd3/Fn7TunOMz0uc/he/NS0Zv 1n6LSR0ImLRF3vY+rgCOYp5DUZv2kYanbzimRFscf+K20RZ5AqCRfl2kd jrYp1rEXm3EjLtQosP7izyKuREZJIiF08tMl6YSSwwbfU6DlcFcaX+KUg ybWMpILbErTHsT4YlUtS5ZR7n8p4Ce+FuHfZzRsrsqhACFTr1K1paajZc 9gdwFUDJS2npgs/Cs4nIAEDomP7Z3MVszIh37nqhOTv7QpaUz16hfBjmp Q==; X-CSE-ConnectionGUID: NpqbyXXLTMaMkPmekE21+Q== X-CSE-MsgGUID: +EmHwkvJTr6Wxo5bCgklUg== X-IronPort-AV: E=McAfee;i="6800,10657,11616"; a="68053905" X-IronPort-AV: E=Sophos;i="6.19,313,1754982000"; d="scan'208";a="68053905" X-CSE-ConnectionGUID: 2sxYWs5mSRKM+l9YBIWrPA== X-CSE-MsgGUID: ocOj5Iz7TNGxnJo70sxTfw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,313,1754982000"; d="scan'208";a="221537340" From: Zhao Liu To: Paolo Bonzini , Marcelo Tosatti Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Chao Gao , Xin Li , John Allen , Babu Moger , Mathias Krause , Dapeng Mi , Zide Chen , Xiaoyao Li , Chenyi Qiang , Farrah Chen , Zhao Liu Subject: [PATCH v4 17/23] i386/cpu: Migrate MSR_IA32_PL0_SSP for FRED and CET-SHSTK Date: Tue, 18 Nov 2025 11:42:25 +0800 Message-Id: <20251118034231.704240-18-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251118034231.704240-1-zhao1.liu@intel.com> References: <20251118034231.704240-1-zhao1.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.13; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1763436177222158500 Content-Type: text/plain; charset="utf-8" From: "Xin Li (Intel)" Both FRED and CET-SHSTK need MSR_IA32_PL0_SSP, so add the vmstate for this MSR. When CET-SHSTK is not supported, MSR_IA32_PL0_SSP keeps accessible, but its value doesn't take effect. Therefore, treat this vmstate as a subsection rather than a fix for the previous FRED vmstate. Tested-by: Farrah Chen Signed-off-by: Xin Li (Intel) Co-developed-by: Zhao Liu Signed-off-by: Zhao Liu --- Changes Since v3: - New commit. --- target/i386/machine.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/target/i386/machine.c b/target/i386/machine.c index 45b7cea80aa7..0a756573b6cd 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1668,6 +1668,31 @@ static const VMStateDescription vmstate_triple_fault= =3D { } }; =20 +static bool pl0_ssp_needed(void *opaque) +{ + X86CPU *cpu =3D opaque; + CPUX86State *env =3D &cpu->env; + +#ifdef TARGET_X86_64 + if (env->features[FEAT_7_1_EAX] & CPUID_7_1_EAX_FRED) { + return true; + } +#endif + + return !!(env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_CET_SHSTK); +} + +static const VMStateDescription vmstate_pl0_ssp =3D { + .name =3D "cpu/msr_pl0_ssp", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D pl0_ssp_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT64(env.pl0_ssp, X86CPU), + VMSTATE_END_OF_LIST() + } +}; + const VMStateDescription vmstate_x86_cpu =3D { .name =3D "cpu", .version_id =3D 12, @@ -1817,6 +1842,7 @@ const VMStateDescription vmstate_x86_cpu =3D { #endif &vmstate_arch_lbr, &vmstate_triple_fault, + &vmstate_pl0_ssp, NULL } }; --=20 2.34.1