From nobody Mon Feb 9 09:28:49 2026 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 EFB76EB64DD for ; Tue, 25 Jul 2023 22:26:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232815AbjGYW0C (ORCPT ); Tue, 25 Jul 2023 18:26:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233234AbjGYWXk (ORCPT ); Tue, 25 Jul 2023 18:23:40 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C00E51FE2; Tue, 25 Jul 2023 15:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690323544; x=1721859544; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nmGQUIRYutZ8GYkQpZch+sNrtHiOxg6NOGiFVVLF1qk=; b=UoU/UNBF4o4K9ahP7sLMz6SA3wk4IM/yKXArdpCPLhfYx6vkwXSPZvBF /OKl2GWiIb7QCaq4UuJwQcc1r8RBIfht3YD8VWxlF045lncOkVb0vfIWl k6bWQnjvr5Ed994LqvILinoeyBqyiAULpXXGs8bUFOwCJ2gnHoq7IjhnU 41JVJUM2EMzGXFq/TX+7Jy9/NqpeoCWMKKbvRRrsgmdki7LMR7uNVSwf6 M1NNF4qr6fRPGSFC+VKGpmuGGtWsWA3v1Z3tKH3XrZnsqY/ZW87wY04j9 DMTQCshr6Ey8+xZkaWlixIyEWSiILGr87H/zz+EGFkB5wpZMPv8dxy+Bm A==; X-IronPort-AV: E=McAfee;i="6600,9927,10782"; a="367882764" X-IronPort-AV: E=Sophos;i="6.01,231,1684825200"; d="scan'208";a="367882764" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2023 15:16:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10782"; a="840001952" X-IronPort-AV: E=Sophos;i="6.01,231,1684825200"; d="scan'208";a="840001952" Received: from ls.sc.intel.com (HELO localhost) ([172.25.112.31]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2023 15:16:08 -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 v15 106/115] KVM: TDX: Add methods to ignore VMX preemption timer Date: Tue, 25 Jul 2023 15:14:57 -0700 Message-Id: <08069b5e67f5ad24a3c4dd3c5cbf7cca6850b469.1690322424.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 TDX doesn't support VMX preemption timer. Implement access methods for VMM to ignore VMX preemption timer. Signed-off-by: Isaku Yamahata --- arch/x86/kvm/vmx/main.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c index 38a782c28b72..c2ad9c734376 100644 --- a/arch/x86/kvm/vmx/main.c +++ b/arch/x86/kvm/vmx/main.c @@ -835,6 +835,27 @@ static void vt_update_cpu_dirty_logging(struct kvm_vcp= u *vcpu) vmx_update_cpu_dirty_logging(vcpu); } =20 +#ifdef CONFIG_X86_64 +static int vt_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc, + bool *expired) +{ + /* VMX-preemption timer isn't available for TDX. */ + if (is_td_vcpu(vcpu)) + return -EINVAL; + + return vmx_set_hv_timer(vcpu, guest_deadline_tsc, expired); +} + +static void vt_cancel_hv_timer(struct kvm_vcpu *vcpu) +{ + /* VMX-preemption timer can't be set. See vt_set_hv_timer(). */ + if (KVM_BUG_ON(is_td_vcpu(vcpu), vcpu->kvm)) + return; + + vmx_cancel_hv_timer(vcpu); +} +#endif + static int vt_mem_enc_ioctl(struct kvm *kvm, void __user *argp) { if (!is_td(kvm)) @@ -985,8 +1006,8 @@ struct kvm_x86_ops vt_x86_ops __initdata =3D { .pi_start_assignment =3D vmx_pi_start_assignment, =20 #ifdef CONFIG_X86_64 - .set_hv_timer =3D vmx_set_hv_timer, - .cancel_hv_timer =3D vmx_cancel_hv_timer, + .set_hv_timer =3D vt_set_hv_timer, + .cancel_hv_timer =3D vt_cancel_hv_timer, #endif =20 .setup_mce =3D vmx_setup_mce, --=20 2.25.1