Hi Linus,
Please pull some x86/tdx changes for 7.1-rc1.
The only real thing of note here is printing the TDX module version.
This is a little silly on its own, but the upcoming TDX module update
code needs the same TDX module call. This shrinks that set a wee bit.
There's also few minor macro cleanups and a tweak to the GetQuote ABI
to make it easier for userspace to detect zero-length (failed) quotes.
The GetQuote tweak collides with a fix that showed up around 7.0-rc5.
Ingo resolved the conflict for the tip tree and I've appended it here
in case it is useful to you.
--
The following changes since commit 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f:
Linux 7.0-rc1 (2026-02-22 13:18:59 -0800)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_tdx_for_7.1-rc1
for you to fetch changes up to 0f409eaea53e49932cf92a761de66345c9a4b4be:
virt: tdx-guest: Return error for GetQuote failures (2026-03-05 13:23:58 -0800)
----------------------------------------------------------------
- Print TDX module version during boot
- Make TDX attribute naming consistent
----------------------------------------------------------------
Chao Gao (1):
x86/virt/tdx: Retrieve TDX module version
Kuppuswamy Sathyanarayanan (1):
virt: tdx-guest: Return error for GetQuote failures
Vishal Verma (1):
x86/virt/tdx: Print TDX module version during init
Xiaoyao Li (4):
x86/tdx: Fix the typo in TDX_ATTR_MIGRTABLE
KVM/TDX: Remove redundant definitions of TDX_TD_ATTR_*
x86/tdx: Rename TDX_ATTR_* to TDX_TD_ATTR_*
KVM/TDX: Rename KVM_SUPPORTED_TD_ATTRS to KVM_SUPPORTED_TDX_TD_ATTRS
arch/x86/coco/tdx/debug.c | 26 +++++++--------
arch/x86/coco/tdx/tdx.c | 8 ++---
arch/x86/include/asm/shared/tdx.h | 50 ++++++++++++++---------------
arch/x86/include/asm/tdx_global_metadata.h | 7 ++++
arch/x86/kvm/vmx/tdx.c | 4 +--
arch/x86/kvm/vmx/tdx_arch.h | 6 ----
arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 22 +++++++++++++
drivers/virt/coco/tdx-guest/tdx-guest.c | 5 +++
8 files changed, 78 insertions(+), 50 deletions(-)
----
commit 87d034b5b9f36c66bf02af587fb6935af88ffbf1
Merge: 0f409eaea53e4 cbfffcca2bf06
Author: Ingo Molnar <mingo@kernel.org>
Date: Sun Mar 29 06:46:18 2026 +0200
Merge branch 'linus' into x86/tdx, to resolve conflict
Conflicts:
drivers/virt/coco/tdx-guest/tdx-guest.c
Resolve conflict between upstream fix:
c3fd16c3b98e ("virt: tdx-guest: Fix handling of host controlled 'quote' buffer length")
... and pending commit in tip:x86/tdx:
0f409eaea53e ("virt: tdx-guest: Return error for GetQuote failures")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --cc drivers/virt/coco/tdx-guest/tdx-guest.c
index 23ef3991c4d5a,7cee97559ba29..a9ecc46df187d
--- a/drivers/virt/coco/tdx-guest/tdx-guest.c
+++ b/drivers/virt/coco/tdx-guest/tdx-guest.c
@@@ -306,12 -309,12 +309,17 @@@ static int tdx_report_new_locked(struc
return ret;
}
+ if (quote_buf->status != GET_QUOTE_SUCCESS) {
+ pr_debug("GetQuote request failed, status:%llx\n", quote_buf->status);
+ return -EIO;
+ }
+
- buf = kvmemdup(quote_buf->data, quote_buf->out_len, GFP_KERNEL);
+ out_len = READ_ONCE(quote_buf->out_len);
+
+ if (out_len > TDX_QUOTE_MAX_LEN)
+ return -EFBIG;
+
+ buf = kvmemdup(quote_buf->data, out_len, GFP_KERNEL);
if (!buf)
return -ENOMEM;