From nobody Sat Nov 15 19:42:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1748589863; cv=none; d=zohomail.com; s=zohoarc; b=HY/oGw6df0nHU1NNI0oU/8LUCH1SAArQXZ0H7fPc3rcni80sAWDxWm8ErBVQ6oyW0GegIYw5Qiq0/engP/hfpjKc28KWRrLfBwPU2OLxLQy6HZw573xiRHAX6T+v6Mzf7i5FSjZEy7rR2wq4e03beQBBN4mA3PXX0LW4z75Jivw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748589863; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mByca/kl/qtKwO3VEhr3sZUJFwHtbTSeBV8OSE/EBu8=; b=IRtaU6t8Wg5SxyI5TKjT8Wh5HyqeTnHP9EdyAPSn1mjdfiKz/+d9gVqolzsiYsgH/XqRYzcQUmBKAMBMy5hZBeux7uqTQDehYQQl3twh/HW/7M9KO3cxdqWJlFI8LVSGrf58vaVUqYAhB+E67Wonz032IavN4QJE7cUk/P7sToc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 174858986326689.12105457156656; Fri, 30 May 2025 00:24:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKtzv-0007yr-6F; Fri, 30 May 2025 03:17:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtxh-00042N-25 for qemu-devel@nongnu.org; Fri, 30 May 2025 03:15:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKtxf-0007Ex-Hx for qemu-devel@nongnu.org; Fri, 30 May 2025 03:15:28 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-MOt1iu12Pemjif9vHd8Hvg-1; Fri, 30 May 2025 03:15:25 -0400 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-604e837c1deso1447650a12.1 for ; Fri, 30 May 2025 00:15:25 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-60567142775sm1177266a12.55.2025.05.30.00.15.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 00:15:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748589326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mByca/kl/qtKwO3VEhr3sZUJFwHtbTSeBV8OSE/EBu8=; b=FmOnUDc0c964QnbxAYw4ZdEebxmzKILITeJ1jzdKWPiD1RIU+BtxppnfVqvC8YrsX1NM+m IzAd5sWM70OGlK9+1dvcHv9aQAsyGvBru2lNvUO/BJ7/qQ+6Obxmmpi8y4vPj/AlPrWwsv 9ehWwQJScjHM+JhlxsVktIikGK4hOMo= X-MC-Unique: MOt1iu12Pemjif9vHd8Hvg-1 X-Mimecast-MFC-AGG-ID: MOt1iu12Pemjif9vHd8Hvg_1748589324 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748589324; x=1749194124; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mByca/kl/qtKwO3VEhr3sZUJFwHtbTSeBV8OSE/EBu8=; b=DOX4BeC9B7yEqLIFF5og6XKVKkpklQvdZJAZAp7ecxYAvc+HVb6yxS/zP/u2KOZLhJ FvE8s/TpoL6AvVDVmuVd8gsTloFT9vMHK4RnQzl4KVZQgIrlIxcZKUWoW/tQY0EHzFVt bpcJ+jRcM3mpv5PVZUhDIoBcfXs+YUOMA74Y5Fv5AMifjZz9U5g27n7nipvC/LJJ3stH IM4fn3GAI1DeqfJN/9nmJPSyDvBprn0lZZPDsahDfKvJbEfJBpl4yMejrUt7/85GoT7W GkD6ABDmiOatZfM5t6jUb5zKq6AD0WBS76bgB1WIbxWMr+LibjAVv6oikS0rGKmN+FSi u0sA== X-Gm-Message-State: AOJu0Yyh7gM+oDndiGv12uSwh+PTXSoCDBqxNEf8jL8VmvhMsJxC0hhj mnh3U8iPejNn8KLuUQ1zRAsEA1P6JzJiuVEX81vLgQxV01+beT5v5BMSQMTjHWjMgqBD+sP5KP1 geYYpAl+qtnXA79rk4dGfTJ81xsvJl0vtGuU5kDDvutqUqyH5w7dx4Y+QN9mPKCoMrEAZhm4wvM uFsEXaJkRfTEontawDxK4bt2CKqnn1Xm4rLlB5mvMa X-Gm-Gg: ASbGncsYEYc6IXz3IVwl6itjRBhDnupPMNmjIGfisqO4mn6iJS06TDZjWWreyBR3zt/ /XWCbctprjlBL1i9EH+Ldmvtl3e5PDkrCQR7K3DYPZKyOOrWUzS5SAwqVuxtKjHwvWK2WvLYNXL C27eyL7gOd+FkBt9gfSCR7AYQ4CdCnVarQB8USOBvyfBt5joDbBCmhKDKO0CR7zVupU6pL0Xdj0 iKxhu+oJ6sO9fpVxGW05FtCrk4ls0PfhNfyDuTEqFZVGRpJRcGo1jjuCoS9I8QCNBjzQO7ep9UW GJhCsCrDKXsdRg== X-Received: by 2002:a05:6402:5207:b0:5fc:4045:7d74 with SMTP id 4fb4d7f45d1cf-6056dd36426mr1612220a12.9.1748589323878; Fri, 30 May 2025 00:15:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF28dpBupBemBN7mgNpHqoHcnIq4ktJU2L+G5XsO3Bi3/fI8hHFj3cjxmNJofFuaeXrZ6nCxg== X-Received: by 2002:a05:6402:5207:b0:5fc:4045:7d74 with SMTP id 4fb4d7f45d1cf-6056dd36426mr1612200a12.9.1748589323408; Fri, 30 May 2025 00:15:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Xiaoyao Li , Zhao Liu Subject: [PULL 60/77] i386/tdx: Add XFD to supported bit of TDX Date: Fri, 30 May 2025 09:12:30 +0200 Message-ID: <20250530071250.2050910-61-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530071250.2050910-1-pbonzini@redhat.com> References: <20250530071250.2050910-1-pbonzini@redhat.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=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1748589865229116600 Content-Type: text/plain; charset="utf-8" From: Xiaoyao Li Just mark XFD as always supported for TDX. This simple solution relies on the fact KVM will report XFD as 0 when it's not supported by the hardware. Signed-off-by: Xiaoyao Li Reviewed-by: Zhao Liu Link: https://lore.kernel.org/r/20250508150002.689633-49-xiaoyao.li@intel.c= om Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 1 + target/i386/kvm/tdx.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index b38e691f1af..8a4b4217d02 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1122,6 +1122,7 @@ uint64_t x86_cpu_get_supported_feature_word(X86CPU *c= pu, FeatureWord w); #define CPUID_XSAVE_XSAVEC (1U << 1) #define CPUID_XSAVE_XGETBV1 (1U << 2) #define CPUID_XSAVE_XSAVES (1U << 3) +#define CPUID_XSAVE_XFD (1U << 4) =20 #define CPUID_6_EAX_ARAT (1U << 2) =20 diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 188c2242d53..0f7f47c6da8 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -621,6 +621,12 @@ static void tdx_add_supported_cpuid_by_xfam(void) e->edx |=3D (tdx_caps->supported_xfam & CPUID_XSTATE_XCR0_MASK) >> 32; =20 e =3D find_in_supported_entry(0xd, 1); + /* + * Mark XFD always support for TDX, it will be cleared finally in + * tdx_adjust_cpuid_features() if XFD is unavailable on the hardware + * because in this case the original data has it as 0. + */ + e->eax |=3D CPUID_XSAVE_XFD; e->ecx |=3D (tdx_caps->supported_xfam & CPUID_XSTATE_XSS_MASK); e->edx |=3D (tdx_caps->supported_xfam & CPUID_XSTATE_XSS_MASK) >> 32; } --=20 2.49.0