From nobody Sun Sep 7 12:20:25 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 C2722C41513 for ; Mon, 16 Oct 2023 16:27:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234148AbjJPQ1C (ORCPT ); Mon, 16 Oct 2023 12:27:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234031AbjJPQ0f (ORCPT ); Mon, 16 Oct 2023 12:26:35 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0AE210D2; Mon, 16 Oct 2023 09:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697473083; x=1729009083; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j8HguG2TjH29g/Wok0EsXBMyZ9vYrKe4chKD+R6EQ2c=; b=jgM1t+opxDX3JtTN5u5nfqvTlHTvm52fZtHWTDSbsDDlkLe+MXhWJBYM MYTOZO6gpT+vrmBdlWWi5qOV9r+QUnPvd8PwqO1XBihZKaFA79wN394Z0 /wmWuybP6yNzBI9C8zsn/JKnhiMBQAQakx7gsEP78Km17ilgYcc/rGBK2 VOdG4zdAGczky573L0cL+UJ8cBx7Whk5dVWZ2SJ1ZyElTxRruR+wtWV7I A5PrLZIYabVlA3Hpv8SlvCTXjSNNj9Phe8sk/zCsbywT70uglwmRAsvb3 OOGIQFEoZwyQ95M65EjUxPmVt79OwH5GJe4nuJId55Bk181c+kJvwHGiF w==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="364921903" X-IronPort-AV: E=Sophos;i="6.03,229,1694761200"; d="scan'208";a="364921903" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 09:15:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="846448215" X-IronPort-AV: E=Sophos;i="6.03,229,1694761200"; d="scan'208";a="846448215" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 09:15:53 -0700 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 , Kai Huang , Zhi Wang , chen.bo@intel.com, hang.yuan@intel.com, tina.zhang@intel.com Subject: [PATCH v16 070/116] KVM: TDX: restore debug store when TD exit Date: Mon, 16 Oct 2023 09:14:22 -0700 Message-Id: <98ef065d15d4ab59e9b92932cb197b98f03bb8df.1697471314.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 eb8dd8b8a1e8..58e86b726436 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -2428,3 +2428,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 e29df39630e8..a4401ae851d4 100644 --- a/arch/x86/kvm/vmx/tdx.c +++ b/arch/x86/kvm/vmx/tdx.c @@ -639,6 +639,7 @@ fastpath_t tdx_vcpu_run(struct kvm_vcpu *vcpu) tdx_vcpu_enter_exit(tdx); =20 tdx_user_return_update_cache(vcpu); + perf_restore_debug_store(); tdx_restore_host_xsave_state(vcpu); tdx->host_state_need_restore =3D true; =20 --=20 2.25.1