From nobody Sat Nov 15 16:07:49 2025 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=1748927610; cv=none; d=zohomail.com; s=zohoarc; b=kQfCYxHOKYEMdfNz/YizMrq9O58AdmC05Wy9uPHbwwnLHmfCH7eiyoY+NWXnDpiRC7YlrO71W5PoagdRYkRBI6x25FotF7+TaUVUj9tM+QJP3CPWF35KevDb0ZcIEK6ANinmBgD1fmDqwH2extmPPsPcSc2hJ4TUyf3GFOy9aVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748927610; 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=1j0ASBpfUj4mFBz3FNj3ZP3N4NuHbftBgV0q4SPOVuo=; b=g9ayQCEkg4bx7osno12TSWMFnuqVuv+wNiWTbfMSF7S9VrNs5mFQW32WueholH80aPf94YM/wszjSWaiHYKKfBW+g2BhmH781ExNRJvllnv1a7lfUxVWu9t44KjRUOR13XPElYaB+RFM9RtUBbzrRrUtZhAwL0NKc+T8oiulP6E= 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 1748927610372325.79230059377926; Mon, 2 Jun 2025 22:13:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMJx6-0006th-3p; Tue, 03 Jun 2025 01:12:44 -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 1uMJx3-0006tA-CE for qemu-devel@nongnu.org; Tue, 03 Jun 2025 01:12:42 -0400 Received: from mgamail.intel.com ([198.175.65.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMJwz-0003OJ-UB for qemu-devel@nongnu.org; Tue, 03 Jun 2025 01:12:39 -0400 Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2025 22:09:11 -0700 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by orviesa002.jf.intel.com with ESMTP; 02 Jun 2025 22:09:10 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1748927558; x=1780463558; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5yCR1xkAwt2Ej/VPGCPcKRypG3VTb85Nj16RO6mSwyw=; b=hzR7R/xFtubk5kt25AfvSKWwt1KdzIzxsfGmeRu4+py9/q7Aa3pKB/VG zcbadCQ5yZ+e2zN9ELTHV3qFI7T63dSp2Vb2FWhk47ma8znUmeweD6YPH 5oapkLL3b9Bv+ZqnDndrlAjcNvYMUOaRAX8bgYlopAYso39Qgfm7wqLKp T6NmX4Spftg0M3dq28jAV1rQvsgoveSsRVfSMWyqNhe2vZ8Z6TLwVFqIo FSr0sDQNlI60+5LDiaw6tO1GR+0qqrJ5ikKvo5de4T7+cKWvuFeU80QLo I1XyEg0eVzGTQU2ksNCEmsz+vqKujXlAaJWMj6xzxJrZPnoU3PIXixo5R Q==; X-CSE-ConnectionGUID: TX6wKDw6Qsu2e2P4S+/bbQ== X-CSE-MsgGUID: oivO8biFT+exFMlPARYz+Q== X-IronPort-AV: E=McAfee;i="6700,10204,11451"; a="62007523" X-IronPort-AV: E=Sophos;i="6.16,205,1744095600"; d="scan'208";a="62007523" X-CSE-ConnectionGUID: so70jWytR1mKKPJV7qjFqA== X-CSE-MsgGUID: tWPGf3viSZm0a2SI+XhDZQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,205,1744095600"; d="scan'208";a="175700641" From: Xiaoyao Li To: Paolo Bonzini Cc: Igor Mammedov , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Xiaoyao Li , qemu-devel@nongnu.org Subject: [PATCH 1/3] i386/cpu: Rename enable_cpuid_0x1f to force_cpuid_0x1f Date: Tue, 3 Jun 2025 01:03:03 -0400 Message-ID: <20250603050305.1704586-2-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250603050305.1704586-1-xiaoyao.li@intel.com> References: <20250603050305.1704586-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=198.175.65.13; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.015, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.999, RCVD_IN_DNSWL_MED=-2.3, 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 @intel.com) X-ZM-MESSAGEID: 1748927611772116600 Content-Type: text/plain; charset="utf-8" The name of "enable_cpuid_0x1f" isn't right to its behavior because the leaf 0x1f can be enabled even when "enable_cpuid_0x1f" is false. Rename it to "force_cpuid_0x1f" to better reflect its behavior. Suggested-by: Igor Mammedov Signed-off-by: Xiaoyao Li Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Igor Mammedov --- Suggested by Igor at https://lore.kernel.org/qemu-devel/20250513144515.3761= 5651@imammedo.users.ipa.redhat.com/ --- target/i386/cpu.h | 4 ++-- target/i386/kvm/tdx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 1146465c8c62..aaef6a2a6767 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2270,7 +2270,7 @@ struct ArchCPU { bool enable_cpuid_0xb; =20 /* Force to enable cpuid 0x1f */ - bool enable_cpuid_0x1f; + bool force_cpuid_0x1f; =20 /* Enable auto level-increase for all CPUID leaves */ bool full_cpuid_auto_level; @@ -2540,7 +2540,7 @@ void mark_forced_on_features(X86CPU *cpu, FeatureWord= w, uint64_t mask, =20 static inline bool x86_has_cpuid_0x1f(X86CPU *cpu) { - return cpu->enable_cpuid_0x1f || + return cpu->force_cpuid_0x1f || x86_has_extended_topo(cpu->env.avail_cpu_topo); } =20 diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 0a21ae555c5c..17e671f1710f 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -746,7 +746,7 @@ static void tdx_cpu_instance_init(X86ConfidentialGuest = *cg, CPUState *cpu) /* invtsc is fixed1 for TD guest */ object_property_set_bool(OBJECT(cpu), "invtsc", true, &error_abort); =20 - x86cpu->enable_cpuid_0x1f =3D true; + x86cpu->force_cpuid_0x1f =3D true; } =20 static uint32_t tdx_adjust_cpuid_features(X86ConfidentialGuest *cg, --=20 2.43.0 From nobody Sat Nov 15 16:07:49 2025 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=1748927600; cv=none; d=zohomail.com; s=zohoarc; b=Aas3Cah3YGFgo8f0pn3yy2C8UZSwIwC7sLxbqv0GJNJDiIGget346Wk5J6XxKNY7hoIwDaFSaNTXkYFLJe9RtRgYgi35OIF3A+4ujvVwUJIPcaduz0uS6H1ohhRcUFin3rK8nWkOZfftEOYO3URg/EAMJhZ18hlK7Ki1AyezMvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748927600; 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=t7QBmwqzfW++ss6twwzewybt2eJc9s4TPqjpojOrwCA=; b=gm42s+5AcJNiz8v+mOG+V39n2HdNDfs52LetQ+ykpSzL8KreOqzZuCoi1njnbXJkKiea2Te8FFtZ6RqicDlYPmpwhJxB1PeWDv22xj8FeMx41z0nRZNk980jeI2b9owOk9MmZ/9tO6rPSFFI+DwEHxdUF40UX55lkLQctgiWP6M= 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 1748927600598291.38208265744015; Mon, 2 Jun 2025 22:13:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMJx9-0006ub-F7; Tue, 03 Jun 2025 01:12:47 -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 1uMJx5-0006tS-IP for qemu-devel@nongnu.org; Tue, 03 Jun 2025 01:12:43 -0400 Received: from mgamail.intel.com ([198.175.65.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMJx4-0003OJ-1o for qemu-devel@nongnu.org; Tue, 03 Jun 2025 01:12:43 -0400 Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2025 22:09:13 -0700 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by orviesa002.jf.intel.com with ESMTP; 02 Jun 2025 22:09:11 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1748927562; x=1780463562; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/o9QMCkvz+rS2wSdoCiqmfI/zo6XBVkcN10+Q9PmT0A=; b=Wts/mP7weakuQDz/y3W8PN8uApqM1FmuA28sCQwTEoy7n2qdM+FQz3wP oCSftYD8nK97IIQas5ZGcZpgnwIzJ5o1AHDh411RsYxIR2QzXgpByyP9g Fqvd5i116DMdw5RJZZhCJOgoJmou5VSgd9+H+e9tx4XZb9bAoNaFKp/8p GaEdYXxzN5oMD6UmE9YAUPZbe1wgA4MO3i6I5Uv3WIMxndd8qcc9cwRdl k1Wq8YtjyStyW7UBBCg1aUa7kEoNLBN+9w8NzynA+ufUt/5pgRzwMwpuc otAdCn7M7BVmFPD0uOE1ToSyRxGjGOI/wVLMbWlNFLEaqsptNbBxZzuUh Q==; X-CSE-ConnectionGUID: zCdTELykRTWXF072FonCUg== X-CSE-MsgGUID: M1j5h+94R9iQFdvzlTZWfg== X-IronPort-AV: E=McAfee;i="6700,10204,11451"; a="62007527" X-IronPort-AV: E=Sophos;i="6.16,205,1744095600"; d="scan'208";a="62007527" X-CSE-ConnectionGUID: +zKWB90qQoeMrDvsK2ulcA== X-CSE-MsgGUID: u60MaGTkTt+QBCB9JYHUmg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,205,1744095600"; d="scan'208";a="175700647" From: Xiaoyao Li To: Paolo Bonzini Cc: Igor Mammedov , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Xiaoyao Li , qemu-devel@nongnu.org Subject: [PATCH 2/3] i386/tdx: Fix the typo of the comment of struct TdxGuest Date: Tue, 3 Jun 2025 01:03:04 -0400 Message-ID: <20250603050305.1704586-3-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250603050305.1704586-1-xiaoyao.li@intel.com> References: <20250603050305.1704586-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=198.175.65.13; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.015, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.999, RCVD_IN_DNSWL_MED=-2.3, 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 @intel.com) X-ZM-MESSAGEID: 1748927601693116600 Content-Type: text/plain; charset="utf-8" Change sha348 to sha384. Signed-off-by: Xiaoyao Li Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Igor Mammedov --- target/i386/kvm/tdx.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/i386/kvm/tdx.h b/target/i386/kvm/tdx.h index 04b5afe199f9..8dd66e90149b 100644 --- a/target/i386/kvm/tdx.h +++ b/target/i386/kvm/tdx.h @@ -40,9 +40,9 @@ typedef struct TdxGuest { bool initialized; uint64_t attributes; /* TD attributes */ uint64_t xfam; - char *mrconfigid; /* base64 encoded sha348 digest */ - char *mrowner; /* base64 encoded sha348 digest */ - char *mrownerconfig; /* base64 encoded sha348 digest */ + char *mrconfigid; /* base64 encoded sha384 digest */ + char *mrowner; /* base64 encoded sha384 digest */ + char *mrownerconfig; /* base64 encoded sha384 digest */ =20 MemoryRegion *tdvf_mr; TdxFirmware tdvf; --=20 2.43.0 From nobody Sat Nov 15 16:07:49 2025 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=1748927621; cv=none; d=zohomail.com; s=zohoarc; b=S4iFaTGW0LAENKVyHZ2ilDsHB7vhEpckj1on1ZWu6sIAT8bo2zT4Jzn/ftNxVO/MWps+8JGz9Sk3HJGpf9HFPqT3yZhf7fS0DH7uUA+frMC2iKXnWTpomWIYxDd87wg01dnU3ziWN4XmX0ap9WqB5kG5F9OXXek4n4DFQu0ejKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748927621; h=Content-Type: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=So78gltEXRHsL4V6HPHyWjNUQzw3Qslq5qrKkaqcrAo=; b=Dp6TdtyLnyYPewlvWpLjH/7JdtHl1YokohbOjJwZrm8QHuPUmM9JZcg4GSZ4iy+NSaUOn0Ls4k0f2tGHFIvsx93BKAMslq51gnCN6E/mI4ZyTAzh+wN2lBoiyi9zXrstzJU05bqFMQONWxNC++X9AT/+M8db2Ym9Zz5FCpbbtM0= 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 1748927621707583.3334572112411; Mon, 2 Jun 2025 22:13:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMJxB-0006ui-5P; Tue, 03 Jun 2025 01:12:49 -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 1uMJx5-0006tT-KQ for qemu-devel@nongnu.org; Tue, 03 Jun 2025 01:12:43 -0400 Received: from mgamail.intel.com ([198.175.65.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMJx3-0003ON-SD for qemu-devel@nongnu.org; Tue, 03 Jun 2025 01:12:43 -0400 Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2025 22:09:14 -0700 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by orviesa002.jf.intel.com with ESMTP; 02 Jun 2025 22:09:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1748927562; x=1780463562; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aEBokaXE3lrXtpc+g4ptK8Bwk8vWkUXL1JJQu78WCfw=; b=gJtpt4IN9neEqkap1cGG2ZoPM3ksqrzD3XESH0ASTp/tWxVlli3kK2Og 2VckD3dpcfGs2rjVIN5f24EOHwX5s3kYNKzXpcFSpqnMmX6BBvT7ud9dt +o/mOcIHnzeW9BTr88ZfbQdxDsIXqkoQahGWNz5x1EaWn7543pdWyhxZY 7AWIormkAxvwObvKSj07f+DKsfD/n7VKBQAUnwcpOx5kvQhFLP5FUCG8P LWb3OA83pfIQihkHFWnP5hEFRNe5vRVKnymoHSJBKV6NwCz9DeF9MYzuY tkv90GHUZ2ejIsif5EjOZJfFMIcYKGEno++BsZk5DqxvrmGSrwIszotDC A==; X-CSE-ConnectionGUID: X4ByoYRzQV+G65EFRrUjJQ== X-CSE-MsgGUID: 7xGo6CViSyGxHkB3WwlKnQ== X-IronPort-AV: E=McAfee;i="6700,10204,11451"; a="62007533" X-IronPort-AV: E=Sophos;i="6.16,205,1744095600"; d="scan'208";a="62007533" X-CSE-ConnectionGUID: bcXopVodTeuuUmvu/P/hdA== X-CSE-MsgGUID: G1Zc+D52SH25le8L4UpbTw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,205,1744095600"; d="scan'208";a="175700651" From: Xiaoyao Li To: Paolo Bonzini Cc: Igor Mammedov , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Xiaoyao Li , qemu-devel@nongnu.org Subject: [PATCH 3/3] i386/tdx: Clarify the error message of mrconfigid/mrowner/mrownerconfig Date: Tue, 3 Jun 2025 01:03:05 -0400 Message-ID: <20250603050305.1704586-4-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250603050305.1704586-1-xiaoyao.li@intel.com> References: <20250603050305.1704586-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=198.175.65.13; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.015, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.999, RCVD_IN_DNSWL_MED=-2.3, 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 @intel.com) X-ZM-MESSAGEID: 1748927623823116600 The error message is misleading - we successfully decoded the data, the decoded data was simply with the wrong length. Change the error message to show it is an length check failure with both the received and expected values. Suggested-by: Daniel P. Berrang=C3=A9 Signed-off-by: Xiaoyao Li Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Igor Mammedov --- Suggested by Daniel at https://lore.kernel.org/qemu-devel/aBzT3TrdldaN-uqx@= redhat.com/ --- target/i386/kvm/tdx.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/target/i386/kvm/tdx.c b/target/i386/kvm/tdx.c index 17e671f1710f..4172bbd23340 100644 --- a/target/i386/kvm/tdx.c +++ b/target/i386/kvm/tdx.c @@ -1026,7 +1026,9 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp) return -1; } if (data_len !=3D QCRYPTO_HASH_DIGEST_LEN_SHA384) { - error_setg(errp, "TDX: failed to decode mrconfigid"); + error_setg(errp, "TDX 'mrconfigid' sha384 digest was %ld bytes= , " + "expected %d bytes", data_len, + QCRYPTO_HASH_DIGEST_LEN_SHA384); return -1; } memcpy(init_vm->mrconfigid, data, data_len); @@ -1039,7 +1041,9 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp) return -1; } if (data_len !=3D QCRYPTO_HASH_DIGEST_LEN_SHA384) { - error_setg(errp, "TDX: failed to decode mrowner"); + error_setg(errp, "TDX 'mrowner' sha384 digest was %ld bytes, " + "expected %d bytes", data_len, + QCRYPTO_HASH_DIGEST_LEN_SHA384); return -1; } memcpy(init_vm->mrowner, data, data_len); @@ -1052,7 +1056,9 @@ int tdx_pre_create_vcpu(CPUState *cpu, Error **errp) return -1; } if (data_len !=3D QCRYPTO_HASH_DIGEST_LEN_SHA384) { - error_setg(errp, "TDX: failed to decode mrownerconfig"); + error_setg(errp, "TDX 'mrownerconfig' sha384 digest was %ld by= tes, " + "expected %d bytes", data_len, + QCRYPTO_HASH_DIGEST_LEN_SHA384); return -1; } memcpy(init_vm->mrownerconfig, data, data_len); --=20 2.43.0