From nobody Mon Sep 15 11:31:31 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55B96C61DB3 for ; Thu, 12 Jan 2023 16:37:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239809AbjALQhi (ORCPT ); Thu, 12 Jan 2023 11:37:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236950AbjALQhL (ORCPT ); Thu, 12 Jan 2023 11:37:11 -0500 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 145FDB6E; Thu, 12 Jan 2023 08:33:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673541215; x=1705077215; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8/V4BgpLzSgkWZJUgjDmvpjhBQV16Mu1qbJcvXOz8bg=; b=BXELdDClOLwklXZboRX5SSlIh+HDKhrwnA8Vei4dmR5NIa8xALD05Z6P C5kMW3Gvx2k0avJj5CixUR0u/u6AXnpQCE709xJNVBF7q7Vzyg05HSPCT oqCtB2/+XXXsyWSy1PdbnX05RmnOjt22EXUL8oo8hQhLJr+FdaPHXAhK+ 0WjHKexacnm/ccSvOzA/Jqh/DRT2SegzsPneJ8teZLvLBhVglTz/rE3TB ZeOM6vHSmdMy+H49aaGz0fee8uV3hiPG/d1XFVorOEGrUZ+7gpV95XLr+ 0swy45tsxHrDmwQ2B2lRu5cLbNVx00Vp2D2FrFd1ZMLzPsCHPYMJ3yF+D Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="386089620" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="386089620" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:33:33 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="726372473" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="726372473" Received: from ls.sc.intel.com (HELO localhost) ([143.183.96.54]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:33:32 -0800 From: isaku.yamahata@intel.com To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: isaku.yamahata@intel.com, isaku.yamahata@gmail.com, Paolo Bonzini , erdemaktas@google.com, Sean Christopherson , Sagi Shahar , David Matlack Subject: [PATCH v11 072/113] KVM: TDX: restore debug store when TD exit Date: Thu, 12 Jan 2023 08:32:20 -0800 Message-Id: <78eae567df2fc21be2fd9e93b79367c31c583ad7.1673539699.git.isaku.yamahata@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Isaku Yamahata Because debug store is clobbered, restore it on TD exit. Signed-off-by: Isaku Yamahata Reviewed-by: Paolo Bonzini --- arch/x86/events/intel/ds.c | 1 + arch/x86/kvm/vmx/tdx.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c index 88e58b6ee73c..4989b35161b6 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -2350,3 +2350,4 @@ void perf_restore_debug_store(void) =20 wrmsrl(MSR_IA32_DS_AREA, (unsigned long)ds); } +EXPORT_SYMBOL_GPL(perf_restore_debug_store); diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c index 40546e692222..f2b92c8bc081 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -531,6 +531,7 @@ fastpath_t tdx_vcpu_run(struct kvm_vcpu *vcpu) tdx_vcpu_enter_exit(vcpu, tdx); =20 tdx_user_return_update_cache(); + perf_restore_debug_store(); tdx_restore_host_xsave_state(vcpu); tdx->host_state_need_restore =3D true; =20 --=20 2.25.1