From nobody Mon Feb 9 13:37:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1652326259; cv=none; d=zohomail.com; s=zohoarc; b=OYzFuHfVAkVkueBqIJSoPW/dfuAx/QA8s/0E+P4rOtwcLk4NYZAvVSmAFzITtNQvHr6faQECTBIjiLvq9f5gayH5EOfYXD2jUlQbl3jdDJdXlFChvHDRW92zlJTdZCT2ACiKtbCyc1kt8YPVgTYeMCl3bOaNLlA5qPcoT9IPBA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652326259; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lXJ9x10VhO8NTnvvJd0j+KMSDCxwXfs/EvonWHdzY3g=; b=IzIcdaPfPRsSTNmIZeIkrtuw663mckFLNyW7WYjmLfJ2MfnAdS66WGcO5i7lsMunGEYHKTjN+Gt4tO0RlWBJhejCDmFC6TxaQjVGEXQvbf4w17otmIlkFG7wmASE/kSVR0QjIlX+UODBpsJEE14WXLnvW/ZVBKzaH4S7iAl2OHo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652326259115280.98102544356334; Wed, 11 May 2022 20:30:59 -0700 (PDT) Received: from localhost ([::1]:46928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nozXW-0005r1-3p for importer@patchew.org; Wed, 11 May 2022 23:30:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nozMH-0002yD-46 for qemu-devel@nongnu.org; Wed, 11 May 2022 23:19:22 -0400 Received: from mga12.intel.com ([192.55.52.136]:56096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nozMF-0002s1-CX for qemu-devel@nongnu.org; Wed, 11 May 2022 23:19:20 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2022 20:19:18 -0700 Received: from lxy-dell.sh.intel.com ([10.239.159.55]) by orsmga008.jf.intel.com with ESMTP; 11 May 2022 20:19:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652325559; x=1683861559; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=g0arAYqX7qyUTtrTHk+CfMx8l5NPyKI+u1IWkEt9Y3I=; b=Tjqos6NBK8M1qU3HA7SHRfbMyMESIccmP9KX4sHkS5T62FrqCHdcbLdJ NhHmUnf6n3vtMMfv6gs7G6IlwIfpI1CCP47xTlTgVLdhIhXUylkijMfxw 6C2TmB/hKpx2LorspOE8rgIfrygSKvjx2AFjuV78zo0F27aVT6A2YIQii 0kyqPbYAYTIrhliVmhyKJG9dlze3+Qu54jOrhrktohnp1CMT4GnvPkgvR 3dYwASixRnbquuIctWC0civJqv4N2CHXxzpjoSZID5yYtkcoxeMezyjyn +CfqzFWkXCjB4mzdix/oCMxKGGmMT/j4UPf+nfGvdYZAd+xBj19rl7gi7 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10344"; a="249770435" X-IronPort-AV: E=Sophos;i="5.91,218,1647327600"; d="scan'208";a="249770435" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,218,1647327600"; d="scan'208";a="594455812" From: Xiaoyao Li To: Paolo Bonzini , Isaku Yamahata , isaku.yamahata@intel.com, Gerd Hoffmann , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , "Michael S . Tsirkin" , Marcel Apfelbaum , Cornelia Huck , Marcelo Tosatti , Laszlo Ersek , Eric Blake Cc: Connor Kuehl , erdemaktas@google.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, seanjc@google.com, xiaoyao.li@intel.com Subject: [RFC PATCH v4 14/36] i386/tdx: Implement user specified tsc frequency Date: Thu, 12 May 2022 11:17:41 +0800 Message-Id: <20220512031803.3315890-15-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220512031803.3315890-1-xiaoyao.li@intel.com> References: <20220512031803.3315890-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.136; envelope-from=xiaoyao.li@intel.com; helo=mga12.intel.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.998, HK_RANDOM_FROM=0.998, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1652326260591100001 Content-Type: text/plain; charset="utf-8" Reuse "-cpu,tsc-frequency=3D" to get user wanted tsc frequency and pass it to KVM_TDX_INIT_VM. Besides, sanity check the tsc frequency to be in the legal range and legal granularity (required by TDX module). Signed-off-by: Xiaoyao Li Acked-by: Gerd Hoffmann --- target/i386/kvm/kvm.c | 8 ++++++++ target/i386/kvm/tdx.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index f2d7c3cf59ac..c51125ab200f 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -818,6 +818,14 @@ static int kvm_arch_set_tsc_khz(CPUState *cs) int r, cur_freq; bool set_ioctl =3D false; =20 + /* + * TD guest's TSC is immutable, it cannot be set/changed via + * KVM_SET_TSC_KHZ, but only be initialized via KVM_TDX_INIT_VM + */ + if (is_tdx_vm()) { + return 0; + } + if (!env->tsc_khz) { return 0; } diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 9f2cdf640b5c..622efc409438 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -35,6 +35,9 @@ #define TDX_TD_ATTRIBUTES_PKS BIT_ULL(30) #define TDX_TD_ATTRIBUTES_PERFMON BIT_ULL(63) =20 +#define TDX_MIN_TSC_FREQUENCY_KHZ (100 * 1000) +#define TDX_MAX_TSC_FREQUENCY_KHZ (10 * 1000 * 1000) + static TdxGuest *tdx_guest; =20 /* It's valid after kvm_confidential_guest_init()->kvm_tdx_init() */ @@ -211,6 +214,20 @@ int tdx_pre_create_vcpu(CPUState *cpu) goto out; } =20 + r =3D -EINVAL; + if (env->tsc_khz && (env->tsc_khz < TDX_MIN_TSC_FREQUENCY_KHZ || + env->tsc_khz > TDX_MAX_TSC_FREQUENCY_KHZ)) { + error_report("Invalid TSC %ld KHz, must specify cpu_frequency betw= een [%d, %d] kHz", + env->tsc_khz, TDX_MIN_TSC_FREQUENCY_KHZ, + TDX_MAX_TSC_FREQUENCY_KHZ); + goto out; + } + + if (env->tsc_khz % (25 * 1000)) { + error_report("Invalid TSC %ld KHz, it must be multiple of 25MHz", = env->tsc_khz); + goto out; + } + r =3D setup_td_guest_attributes(x86cpu); if (r) { goto out; @@ -221,6 +238,7 @@ int tdx_pre_create_vcpu(CPUState *cpu) =20 init_vm.attributes =3D tdx_guest->attributes; init_vm.max_vcpus =3D ms->smp.cpus; + init_vm.tsc_khz =3D env->tsc_khz; =20 r =3D tdx_vm_ioctl(KVM_TDX_INIT_VM, 0, &init_vm); if (r < 0) { --=20 2.27.0