From nobody Thu Oct 2 19:27:57 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BCFA2D24A9 for ; Fri, 12 Sep 2025 23:23:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757719426; cv=none; b=IaHNeTmf/4ttZcd/JHfZ2f2ZpT5fhdKFshvE+Uz8MrxTFa/LnOoOQ6n4HhtS7lGFOW5+6TxxLUmigDv8tQ9eBuezDq9NhQMs+VilL775THO/DnPgmgTHevoTWHxqZ9ENcdH84rLK2rZ74+XtsUmYFd7qQ+J5InzHkaZfio6gjog= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757719426; c=relaxed/simple; bh=e1JeRGkKaj9TgfxxMHwrDucQg8WoISztqz9SDCyYcKE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lLjl1/CRUM7PVpoJSH6PCFAg195gEZLEL8oaxdqRRGUFfMm6VLpb9eZvPGfc/qJnGoW5uMZPOTe35iHv5sdA9fzOjvxuXPSob1ag8Mh4NfmC/bJG1vBJ1YcVaUq8qaf3Lzr3wrhrCSl8RL/qZyoOmXR+vk6iY5rDZvQRKyJiR+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=F6Ba/LOh; arc=none smtp.client-ip=209.85.215.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="F6Ba/LOh" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b549a25ade1so3172775a12.3 for ; Fri, 12 Sep 2025 16:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1757719424; x=1758324224; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=4hD6RqHRhoBQyAEPebACVdMiw3nYWEKr1GVCYwgXxlE=; b=F6Ba/LOhxXFIE45TEJx6ZNROg5MTzlBb9wKdwfnMHgvikaykMxC2WsD8LF5Ex9HBfJ w/idEuUTlyCmI0rKaT4ojXpJUbFxRGFrskXBH+LgOBAbcFGIN01SBKFpnyw1ZjWfth0v /XCoW6uVXXUq0rMYIYNaUiNI69O2BQYmxmcbUtWtRccJzZemxnM0W+40Y05qNghfPv7h uvq2grjH0cAyhEhQspskFhksPOf+tqu2ecyCJad8yvmTKGsP7FHckmYsPZiHJJLBAFje tcQOn747iUc9EYCLgc+p27BURbvw1uqaRcI/gIPtPn7yF3SFRq9z3JlOYvmq6B/doMfd IMug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757719424; x=1758324224; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4hD6RqHRhoBQyAEPebACVdMiw3nYWEKr1GVCYwgXxlE=; b=EGugLxc4Sq3hzTJlCMLyFg/vSGiHoTjGXEmSI1fPt7f0as8LQ6VmbECOhQ21hAxXMT XhGUzcOjWhg6dOzYTEtHXaqCLRPKhqFeOxa0S6XamA+Iv6u+t4F/pLmu6LJxQdljf4/s p7Lt+/vK8KvfkHv1cwkwpcUkhEwr/wb6ySyWmi7QffzC+4gat72PmACCwzmltXpDnDYK A/H6mCrv5VAq1kiJvtiHkBlwEkLckKaiST7BLs8KfTn+leubileYmeO1D1dxUCfAXKCo 20X057GQyjb5Q5/qUAvZmetHJg0olNFrrPydqXmAzaKUNsYCegN2IYACATWEPJW5g3wv nX7g== X-Forwarded-Encrypted: i=1; AJvYcCXUHpsWLBDiTKLvdrIWC5gqBqMoydDgw05PNHHDcTKzoTtv6PYJtQwT2HgtR1LSSO3aewHrvuQubTUBD20=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3nmo3J+1TCLOKabU4SSsGxw1Z7Sf/pfqyrddaBndiy9Orbc3l lNgSHEi7EzCm/xwvNmVJhmPDIv3rmqtakPTPYkWZSBoviAHBPWJ2OkD+sX/cQ0QHFeMyi2jOcZ/ aHG98pg== X-Google-Smtp-Source: AGHT+IGWLwsQU+dLejivzjWhZVlfpjqnxSofRQrCbAJJqAIc4rCqQN32hHX4+j9WegaCO61lPFy9geyAemo= X-Received: from pjkk4.prod.google.com ([2002:a17:90b:57e4:b0:31f:b2f:aeed]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:32aa:b0:246:d43a:3877 with SMTP id adf61e73a8af0-2602a49da06mr5641736637.8.1757719424555; Fri, 12 Sep 2025 16:23:44 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 Sep 2025 16:22:49 -0700 In-Reply-To: <20250912232319.429659-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250912232319.429659-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250912232319.429659-12-seanjc@google.com> Subject: [PATCH v15 11/41] KVM: x86: Report KVM supported CET MSRs as to-be-saved From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Lendacky , Mathias Krause , John Allen , Rick Edgecombe , Chao Gao , Maxim Levitsky , Xiaoyao Li , Zhang Yi Z 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 Tested-by: Mathias Krause Tested-by: John Allen Tested-by: Rick Edgecombe Signed-off-by: Chao Gao Signed-off-by: Sean Christopherson Reviewed-by: Binbin Wu Reviewed-by: Xiaoyao Li --- 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 5653ddfe124e..2c9908bc8b32 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -344,6 +344,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 { @@ -7598,6 +7602,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.51.0.384.g4c02a37b29-goog