From nobody Wed Oct 8 00:45:53 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 440622868A9; Fri, 4 Jul 2025 08:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751619048; cv=none; b=S6dbL/+VHjDlty0pgsONJRuAmgpYOfibugSC/Sw71JkxAW6xtxjJ8yFVn7Ugo0ZtznZ4LHZfM9IMkzNl8RvhP0jgtr/vytpKZwk35+ctru9KlFIo+IkURJWL38npjEQvkX7FppmNRPzX2+ixZq40ahzXliwwJPz0awj76s0vuvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751619048; c=relaxed/simple; bh=b2I7a1FRbvWHUGUH0GBOzQ8oZAF81PLR0jtnelp/+yg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y5wb2fKyFUblkQa7GMzce8XJ8/oi6VCBHh9ir35eBWhb0rtHpntg4tO+O0zQ/Hv09cJgfwQ3xPk7vs8Pgj/PPM1CPvGC6exNFcxpMwg3UivusCkQ3osFLDV7MR3mdJIW7RcMTylMrvtY2sZ/G35dZy7vQm40DoPH+psrBvWEutU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=OV0a5m8F; arc=none smtp.client-ip=192.198.163.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="OV0a5m8F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1751619046; x=1783155046; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=b2I7a1FRbvWHUGUH0GBOzQ8oZAF81PLR0jtnelp/+yg=; b=OV0a5m8FlHg+Mfwi5N/omNht6489OqA36S9pl2CYyrsUY7zain/66Rnz oGfeGozft9pzf83kqzBkUAV4MPSA1LAHJ2EAeAgcaOuOELJ0EpTRg/hyU TpsH1GgnHiJPGtolJyGL2vnGs2njWijqd/iGNAuocFjvcQOVLSUQBVQwd T/l0hSME+xdBrKAhZWe7bxq29q5u5MpKruP9Plj/f6XKq2/2ohROamK3g 7E6gftsOhVomNlqqe1ydnw4errLfZnkxV0uncv2WzAGSxn43M3TIF5vs+ mnILUybEA/Mo4+LTIjC1wXlHLnJ9vuOTE9XsSnBSqcoZBXFfZidTU8/yf g==; X-CSE-ConnectionGUID: e6J/lDVPR4uRHYW+lR8ZTQ== X-CSE-MsgGUID: oPmF/kwOQLWntMOWtbXHfQ== X-IronPort-AV: E=McAfee;i="6800,10657,11483"; a="79391669" X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="79391669" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2025 01:50:40 -0700 X-CSE-ConnectionGUID: f6++7z7NR7qVZhnqGbWDIw== X-CSE-MsgGUID: RHECQlxkSI+fMz+oTD/yeA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="154721980" Received: from 984fee019967.jf.intel.com ([10.165.54.94]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jul 2025 01:50:40 -0700 From: Chao Gao To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, seanjc@google.com, pbonzini@redhat.com, dave.hansen@intel.com Cc: rick.p.edgecombe@intel.com, mlevitsk@redhat.com, john.allen@amd.com, weijiang.yang@intel.com, minipli@grsecurity.net, xin@zytor.com, Chao Gao , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH v11 11/23] KVM: x86: Report KVM supported CET MSRs as to-be-saved Date: Fri, 4 Jul 2025 01:49:42 -0700 Message-ID: <20250704085027.182163-12-chao.gao@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250704085027.182163-1-chao.gao@intel.com> References: <20250704085027.182163-1-chao.gao@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Yang Weijiang Add CET MSRs to the list of MSRs reported to userspace if the feature, i.e. IBT or SHSTK, associated with the MSRs is supported by KVM. Suggested-by: Chao Gao Signed-off-by: Yang Weijiang Signed-off-by: Chao Gao --- arch/x86/kvm/x86.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 260368ba3134..f6cf371ee16a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -338,6 +338,10 @@ static const u32 msrs_to_save_base[] =3D { MSR_IA32_UMWAIT_CONTROL, =20 MSR_IA32_XFD, MSR_IA32_XFD_ERR, MSR_IA32_XSS, + + MSR_IA32_U_CET, MSR_IA32_S_CET, + MSR_IA32_PL0_SSP, MSR_IA32_PL1_SSP, MSR_IA32_PL2_SSP, + MSR_IA32_PL3_SSP, MSR_IA32_INT_SSP_TAB, }; =20 static const u32 msrs_to_save_pmu[] =3D { @@ -7619,6 +7623,20 @@ static void kvm_probe_msr_to_save(u32 msr_index) if (!kvm_caps.supported_xss) return; break; + case MSR_IA32_U_CET: + case MSR_IA32_S_CET: + if (!kvm_cpu_cap_has(X86_FEATURE_SHSTK) && + !kvm_cpu_cap_has(X86_FEATURE_IBT)) + return; + break; + case MSR_IA32_INT_SSP_TAB: + if (!kvm_cpu_cap_has(X86_FEATURE_LM)) + return; + fallthrough; + case MSR_IA32_PL0_SSP ... MSR_IA32_PL3_SSP: + if (!kvm_cpu_cap_has(X86_FEATURE_SHSTK)) + return; + break; default: break; } --=20 2.47.1