From: Sagi Shahar <sagis@google.com>
To: linux-kselftest@vger.kernel.org,
Paolo Bonzini <pbonzini@redhat.com>,
Shuah Khan <shuah@kernel.org>,
Sean Christopherson <seanjc@google.com>,
Ackerley Tng <ackerleytng@google.com>,
Ryan Afranji <afranji@google.com>,
Andrew Jones <ajones@ventanamicro.com>,
Isaku Yamahata <isaku.yamahata@intel.com>,
Erdem Aktas <erdemaktas@google.com>,
Rick Edgecombe <rick.p.edgecombe@intel.com>,
Sagi Shahar <sagis@google.com>,
Roger Wang <runanwang@google.com>,
Binbin Wu <binbin.wu@linux.intel.com>,
Oliver Upton <oliver.upton@linux.dev>,
"Pratik R. Sampat" <pratikrajesh.sampat@amd.com>,
Reinette Chatre <reinette.chatre@intel.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Subject: [PATCH v7 20/30] KVM: selftests: TDX: Add TDX CPUID TDVMCALL test
Date: Fri, 13 Jun 2025 12:13:47 -0700 [thread overview]
Message-ID: <20250613191359.35078-21-sagis@google.com> (raw)
In-Reply-To: <20250613191359.35078-1-sagis@google.com>
This test issues a CPUID TDVMCALL from inside the guest to get the CPUID
values as seen by KVM.
Co-developed-by: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Sagi Shahar <sagis@google.com>
---
.../selftests/kvm/include/x86/tdx/tdx.h | 4 +
tools/testing/selftests/kvm/lib/x86/tdx/tdx.c | 25 ++++++
tools/testing/selftests/kvm/x86/tdx_vm_test.c | 78 ++++++++++++++++++-
3 files changed, 106 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/kvm/include/x86/tdx/tdx.h b/tools/testing/selftests/kvm/include/x86/tdx/tdx.h
index 2fd67c3e5128..060158cb046b 100644
--- a/tools/testing/selftests/kvm/include/x86/tdx/tdx.h
+++ b/tools/testing/selftests/kvm/include/x86/tdx/tdx.h
@@ -9,6 +9,7 @@
#define TDG_VP_VMCALL_GET_TD_VM_CALL_INFO 0x10000
#define TDG_VP_VMCALL_REPORT_FATAL_ERROR 0x10003
+#define TDG_VP_VMCALL_INSTRUCTION_CPUID 10
#define TDG_VP_VMCALL_INSTRUCTION_HLT 12
#define TDG_VP_VMCALL_INSTRUCTION_IO 30
#define TDG_VP_VMCALL_INSTRUCTION_RDMSR 31
@@ -27,5 +28,8 @@ uint64_t tdg_vp_vmcall_ve_request_mmio_read(uint64_t address, uint64_t size,
uint64_t *data_out);
uint64_t tdg_vp_vmcall_ve_request_mmio_write(uint64_t address, uint64_t size,
uint64_t data_in);
+uint64_t tdg_vp_vmcall_instruction_cpuid(uint32_t eax, uint32_t ecx,
+ uint32_t *ret_eax, uint32_t *ret_ebx,
+ uint32_t *ret_ecx, uint32_t *ret_edx);
#endif // SELFTEST_TDX_TDX_H
diff --git a/tools/testing/selftests/kvm/lib/x86/tdx/tdx.c b/tools/testing/selftests/kvm/lib/x86/tdx/tdx.c
index d61940fe7df4..fb391483d2fa 100644
--- a/tools/testing/selftests/kvm/lib/x86/tdx/tdx.c
+++ b/tools/testing/selftests/kvm/lib/x86/tdx/tdx.c
@@ -137,3 +137,28 @@ uint64_t tdg_vp_vmcall_ve_request_mmio_write(uint64_t address, uint64_t size,
return __tdx_hypercall(&args, 0);
}
+
+uint64_t tdg_vp_vmcall_instruction_cpuid(uint32_t eax, uint32_t ecx,
+ uint32_t *ret_eax, uint32_t *ret_ebx,
+ uint32_t *ret_ecx, uint32_t *ret_edx)
+{
+ struct tdx_hypercall_args args = {
+ .r11 = TDG_VP_VMCALL_INSTRUCTION_CPUID,
+ .r12 = eax,
+ .r13 = ecx,
+ };
+ uint64_t ret;
+
+ ret = __tdx_hypercall(&args, TDX_HCALL_HAS_OUTPUT);
+
+ if (ret_eax)
+ *ret_eax = args.r12;
+ if (ret_ebx)
+ *ret_ebx = args.r13;
+ if (ret_ecx)
+ *ret_ecx = args.r14;
+ if (ret_edx)
+ *ret_edx = args.r15;
+
+ return ret;
+}
diff --git a/tools/testing/selftests/kvm/x86/tdx_vm_test.c b/tools/testing/selftests/kvm/x86/tdx_vm_test.c
index 6ad675a93eeb..2f75f12d2a44 100644
--- a/tools/testing/selftests/kvm/x86/tdx_vm_test.c
+++ b/tools/testing/selftests/kvm/x86/tdx_vm_test.c
@@ -885,6 +885,80 @@ void verify_mmio_writes(void)
printf("\t ... PASSED\n");
}
+/*
+ * Verifies CPUID TDVMCALL functionality.
+ * The guest will then send the values to userspace using an IO write to be
+ * checked against the expected values.
+ */
+void guest_code_cpuid_tdcall(void)
+{
+ uint32_t eax, ebx, ecx, edx;
+ uint64_t err;
+
+ /* Read CPUID leaf 0x1 from host. */
+ err = tdg_vp_vmcall_instruction_cpuid(/*eax=*/1, /*ecx=*/0,
+ &eax, &ebx, &ecx, &edx);
+ tdx_assert_error(err);
+
+ err = tdx_test_report_to_user_space(eax);
+ tdx_assert_error(err);
+
+ err = tdx_test_report_to_user_space(ebx);
+ tdx_assert_error(err);
+
+ err = tdx_test_report_to_user_space(ecx);
+ tdx_assert_error(err);
+
+ err = tdx_test_report_to_user_space(edx);
+ tdx_assert_error(err);
+
+ tdx_test_success();
+}
+
+void verify_td_cpuid_tdcall(void)
+{
+ struct kvm_cpuid_entry2 *cpuid_entry;
+ uint32_t eax, ebx, ecx, edx;
+ struct kvm_vcpu *vcpu;
+ struct kvm_vm *vm;
+
+ vm = td_create();
+ td_initialize(vm, VM_MEM_SRC_ANONYMOUS, 0);
+ vcpu = td_vcpu_add(vm, 0, guest_code_cpuid_tdcall);
+ td_finalize(vm);
+
+ printf("Verifying TD CPUID TDVMCALL:\n");
+
+ /* Wait for guest to report CPUID values */
+ tdx_run(vcpu);
+ eax = tdx_test_read_report_from_guest(vcpu);
+
+ tdx_run(vcpu);
+ ebx = tdx_test_read_report_from_guest(vcpu);
+
+ tdx_run(vcpu);
+ ecx = tdx_test_read_report_from_guest(vcpu);
+
+ tdx_run(vcpu);
+ edx = tdx_test_read_report_from_guest(vcpu);
+
+ tdx_run(vcpu);
+ tdx_test_assert_success(vcpu);
+
+ /* Get KVM CPUIDs for reference */
+ cpuid_entry = vcpu_get_cpuid_entry(vcpu, 1);
+ TEST_ASSERT(cpuid_entry, "CPUID entry missing\n");
+
+ TEST_ASSERT_EQ(cpuid_entry->eax, eax);
+ /* Mask lapic ID when comparing ebx. */
+ TEST_ASSERT_EQ(cpuid_entry->ebx & ~0xFF000000, ebx & ~0xFF000000);
+ TEST_ASSERT_EQ(cpuid_entry->ecx, ecx);
+ TEST_ASSERT_EQ(cpuid_entry->edx, edx);
+
+ kvm_vm_free(vm);
+ printf("\t ... PASSED\n");
+}
+
int main(int argc, char **argv)
{
ksft_print_header();
@@ -892,7 +966,7 @@ int main(int argc, char **argv)
if (!is_tdx_enabled())
ksft_exit_skip("TDX is not supported by the KVM. Exiting.\n");
- ksft_set_plan(12);
+ ksft_set_plan(13);
ksft_test_result(!run_in_new_process(&verify_td_lifecycle),
"verify_td_lifecycle\n");
ksft_test_result(!run_in_new_process(&verify_report_fatal_error),
@@ -917,6 +991,8 @@ int main(int argc, char **argv)
"verify_mmio_reads\n");
ksft_test_result(!run_in_new_process(&verify_mmio_writes),
"verify_mmio_writes\n");
+ ksft_test_result(!run_in_new_process(&verify_td_cpuid_tdcall),
+ "verify_td_cpuid_tdcall\n");
ksft_finished();
return 0;
--
2.50.0.rc2.692.g299adb8693-goog
next prev parent reply other threads:[~2025-06-13 19:14 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-13 19:13 [PATCH v7 00/30] TDX KVM selftests Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 01/30] KVM: selftests: Add function to allow one-to-one GVA to GPA mappings Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 02/30] KVM: selftests: Expose function that sets up sregs based on VM's mode Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 03/30] KVM: selftests: Store initial stack address in struct kvm_vcpu Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 04/30] KVM: selftests: Add vCPU descriptor table initialization utility Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 05/30] KVM: selftests: Update kvm_init_vm_address_properties() for TDX Sagi Shahar
2025-07-21 21:51 ` Ira Weiny
2025-08-01 23:10 ` Sagi Shahar
2025-08-05 15:41 ` Ira Weiny
2025-08-07 20:19 ` Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 06/30] KVM: selftests: Add helper functions to create TDX VMs Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 07/30] KVM: selftests: TDX: Use KVM_TDX_CAPABILITIES to validate TDs' attribute configuration Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 08/30] KVM: selftests: TDX: Update load_td_memory_region() for VM memory backed by guest memfd Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 09/30] KVM: selftests: TDX: Add TDX lifecycle test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 10/30] KVM: selftests: TDX: Add report_fatal_error test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 11/30] KVM: selftests: TDX: Adding test case for TDX port IO Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 12/30] KVM: selftests: TDX: Add basic TDX CPUID test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 13/30] KVM: selftests: TDX: Add basic TDG.VP.VMCALL<GetTdVmCallInfo> test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 14/30] KVM: selftests: TDX: Add TDX IO writes test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 15/30] KVM: selftests: TDX: Add TDX IO reads test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 16/30] KVM: selftests: TDX: Add TDX MSR read/write tests Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 17/30] KVM: selftests: TDX: Add TDX HLT exit test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 18/30] KVM: selftests: TDX: Add TDX MMIO reads test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 19/30] KVM: selftests: TDX: Add TDX MMIO writes test Sagi Shahar
2025-06-13 19:13 ` Sagi Shahar [this message]
2025-06-13 19:13 ` [PATCH v7 21/30] KVM: selftests: TDX: Verify the behavior when host consumes a TD private memory Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 22/30] KVM: selftests: TDX: Add TDG.VP.INFO test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 23/30] KVM: selftests: Add functions to allow mapping as shared Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 24/30] KVM: selftests: TDX: Add shared memory test Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 25/30] KVM: selftests: KVM: selftests: Expose new vm_vaddr_alloc_private() Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 26/30] KVM: selftests: TDX: Add support for TDG.MEM.PAGE.ACCEPT Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 27/30] KVM: selftests: TDX: Add support for TDG.VP.VEINFO.GET Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 28/30] KVM: selftests: TDX: Add TDX UPM selftest Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 29/30] KVM: selftests: TDX: Add TDX UPM selftests for implicit conversion Sagi Shahar
2025-06-13 19:13 ` [PATCH v7 30/30] KVM: selftests: TDX: Test LOG_DIRTY_PAGES flag to a non-GUEST_MEMFD memslot Sagi Shahar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250613191359.35078-21-sagis@google.com \
--to=sagis@google.com \
--cc=ackerleytng@google.com \
--cc=afranji@google.com \
--cc=ajones@ventanamicro.com \
--cc=binbin.wu@linux.intel.com \
--cc=erdemaktas@google.com \
--cc=isaku.yamahata@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=oliver.upton@linux.dev \
--cc=pbonzini@redhat.com \
--cc=pratikrajesh.sampat@amd.com \
--cc=reinette.chatre@intel.com \
--cc=rick.p.edgecombe@intel.com \
--cc=runanwang@google.com \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox