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 037782ECD29; Fri, 4 Jul 2025 08:50:48 +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=1751619051; cv=none; b=ujKgxJEzsCgoyITMNFNaAIiCmR0y5RrQlVJaWmfRjkS9o/kwq48pwCcvpd8P25hviT2MHxPMM3IKjsOcjRcLr8tbmLefoc6KllQEzdL1Irwvo80qrZ9nN424FooytVubYcGjb1jzOIsG8sXansEP9c5nO9c6TGeJdzBOANkeuk0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751619051; c=relaxed/simple; bh=Eo7F9XoCKx1QaogXzCqgYP6ISobgs+nbW5rnxjJi2jQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oqhKQ07mF0uWDBKZx+aN/0DO91i0bR/INJU8DlGY68aUCwrtIyNbRdM/dp+AuK9ZZo2TQoyGqDv3SGSzOhqopcQgrm6XGGvY9fMPJ55Qms1XItEeHt4Sj/T7f9VoDN42cs32ss0CV9VTsQt2V/6nM7NTDJY4WV4tGDEoLinyEmk= 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=meRDZwoM; 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="meRDZwoM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1751619049; x=1783155049; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Eo7F9XoCKx1QaogXzCqgYP6ISobgs+nbW5rnxjJi2jQ=; b=meRDZwoMuRLCDFRVQ9BxQnX5Oi1p6DoafN2n1uTYbj8oN42wTfP282t1 hAF/k/7t3Ffgx1uXZ0/7YeWtdhObsi9zhmdEaPCO5S/KW/ieBHr8espgn ySy7HqBMtHg2xqP0i6b9WZgK2rH6pbplpv35gD6f7E2JmJopfAj4yIwZi 3G6Mea8knLJNWfDwuvkUXPeF1lyNgf9m6V2K7diGejuA4IORi1icrIk8C beA3zNLwhahuMLEJHiHbvGciebDDQ2RauB+BCtvV8Vj8YyJykDv2kFGWb 7x09pQk6nbm8GONtd1N9abMOa2M2NigKNt0UA1ZgyfdTbpJ8s3cGUwDQe Q==; X-CSE-ConnectionGUID: 4qImMPO2QIqACIAT/5q5HA== X-CSE-MsgGUID: 00B61+unS+CCGbkV9i9ySQ== X-IronPort-AV: E=McAfee;i="6800,10657,11483"; a="79391708" X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="79391708" 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:42 -0700 X-CSE-ConnectionGUID: y1D81KEgRga19qj6imF5Fw== X-CSE-MsgGUID: PsAgcMlYSAeqmmI1Z0w+Ww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,286,1744095600"; d="scan'208";a="154721997" 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:42 -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 15/23] KVM: x86: Save and reload SSP to/from SMRAM Date: Fri, 4 Jul 2025 01:49:46 -0700 Message-ID: <20250704085027.182163-16-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 Save CET SSP to SMRAM on SMI and reload it on RSM. KVM emulates HW arch behavior when guest enters/leaves SMM mode,i.e., save registers to SMRAM at the entry of SMM and reload them at the exit to SMM. Per SDM, SSP is one of such registers on 64-bit Arch, and add the support for SSP. Suggested-by: Sean Christopherson Signed-off-by: Yang Weijiang Signed-off-by: Chao Gao --- v11: 1)Synthesize triple-fault if KVM fails to kvm_msr_{write,read} guest SSP. 2)Do nothing for SSP for 32-bit guests when entering/exiting SMM. --- arch/x86/kvm/smm.c | 8 ++++++++ arch/x86/kvm/smm.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/smm.c b/arch/x86/kvm/smm.c index 51d0646622ef..de1fce62ecd2 100644 --- a/arch/x86/kvm/smm.c +++ b/arch/x86/kvm/smm.c @@ -269,6 +269,10 @@ static void enter_smm_save_state_64(struct kvm_vcpu *v= cpu, enter_smm_save_seg_64(vcpu, &smram->gs, VCPU_SREG_GS); =20 smram->int_shadow =3D kvm_x86_call(get_interrupt_shadow)(vcpu); + + if (guest_cpu_cap_has(vcpu, X86_FEATURE_SHSTK) && + kvm_msr_read(vcpu, MSR_KVM_INTERNAL_GUEST_SSP, &smram->ssp)) + kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu); } #endif =20 @@ -558,6 +562,10 @@ static int rsm_load_state_64(struct x86_emulate_ctxt *= ctxt, kvm_x86_call(set_interrupt_shadow)(vcpu, 0); ctxt->interruptibility =3D (u8)smstate->int_shadow; =20 + if (guest_cpu_cap_has(vcpu, X86_FEATURE_SHSTK) && + kvm_msr_write(vcpu, MSR_KVM_INTERNAL_GUEST_SSP, smstate->ssp)) + return X86EMUL_UNHANDLEABLE; + return X86EMUL_CONTINUE; } #endif diff --git a/arch/x86/kvm/smm.h b/arch/x86/kvm/smm.h index 551703fbe200..db3c88f16138 100644 --- a/arch/x86/kvm/smm.h +++ b/arch/x86/kvm/smm.h @@ -116,8 +116,8 @@ struct kvm_smram_state_64 { u32 smbase; u32 reserved4[5]; =20 - /* ssp and svm_* fields below are not implemented by KVM */ u64 ssp; + /* svm_* fields below are not implemented by KVM */ u64 svm_guest_pat; u64 svm_host_efer; u64 svm_host_cr4; --=20 2.47.1