From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 095F1476CDC for ; Wed, 22 Jul 2026 23:14:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784762091; cv=none; b=nVeSgSb/HocmIWheOO4BK2cGBoodVIh2KApDDi5LTihxpBTN6nb39SI0AGc5LgwCZaDKxokUiC10QLlzKgXjAuk7ys0mhtygMqE+UfWAonDvQfBFMpC6qQnNTrrScrQTQa42QKp0NfJQJiGmfNR3NfcuCFnTEHBNpBusbPInlJY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784762091; c=relaxed/simple; bh=85nJ9/hYOiJ96H11w7YE6HgvAK/atu2QWkFdBC4kTTk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LfmsVVKYId5d3wuerV+bcZaf83La5GMQL6DNwoREuWmXYJxYuaUDSmg7bwZRlhJMM1H46KUQCOzqlbigytyK9gs74ahDAXmIwryrT+/xscp0CQDCVyfDLli43Aps518tCeW3/a0TcJkXaqP9ClXKGTqthCHk4TNtZ72ctb6/lks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--wyihan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=sM+MjPkA; arc=none smtp.client-ip=209.85.214.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--wyihan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sM+MjPkA" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2ccb6823efcso468755ad.0 for ; Wed, 22 Jul 2026 16:14:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784762089; x=1785366889; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=fZLWKI1tlBYiW8AamRHdf/1OfHZxF/vT4pGO9bOW1EQ=; b=sM+MjPkAzYO8RBeo4MfUuoKz+PDLNGMrME7HF5M98S8mE0JW1fIxAFPqOa7Tozpyjk Vm8Armv7TAZBIQNEBynqYGOHFgRwD1ge/W3kNu+yyYL6T0VSnvsmpgBh8RzcsJ3As2lk 35DfT7QXWl5cjGws67w+PPne+WFK15J8DzT0f1ZN080n1aKi2gh3sp38UmcUulW1OrE8 HM2vNUrgkqW/Gh4xmwzl21e2sUg91jjkWj9eC35p6DV/KiOIY7QoKR7OZBKcEHPVrWyo N5sj9cgwSKlTVNUJNRtKzPLqhnU7eKIE/cCYzF3ch6qP3nhCBxSeWVHkjhaqEUC+V3uD eXOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784762089; x=1785366889; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=fZLWKI1tlBYiW8AamRHdf/1OfHZxF/vT4pGO9bOW1EQ=; b=mOX8XgPYQMZaC9j+7tyCemIK+3JEXfkJJH5hbplLXUqsH4ugH28OLCsTxrlJCHOFyn s4qowmZMAKH8cIUrvsOGFEeBiSINhlKZq/w2OG5GzNaSwR41/pw4N2U8ZRAiawDF1afU C+Q//XyjXNou1zBdrTxZ5JvhywTj/mUovo+U6HiX5Zd93YmeFEI/2pk5+EATGlk8US1m 6MIjs3rSwBcW9j01C8DVGhv33PnSvNYbMlKTwjzV6+2gZabopzjOyYBc25FeavmBzn0h HDOf2nis31e9ajG/9iw6ovP4xsGon/ueM+jvxvUl0TxIrFAODrYB5m6XVyX0Bthfo93U ijlA== X-Forwarded-Encrypted: i=1; AHgh+RpxWRoxsynal3jkFe/5YxU6CH7jRwfQkygbGt5i0c/iaUxqagOyMkQ6ySNybWU/9bsXOVO2LvaSwnkGnDU=@vger.kernel.org X-Gm-Message-State: AOJu0YzTswZmmj2Vmv8Eq9UeicQbK+jBpZZAe6ghP9LKUYxPhIcTnWRT pO/ea1a00SAsPVuJRWkNriYQt9Qu6K51hxQEAwIjyBn1TtPjq2aMOCmhmKMwEHIC+Teio2As2vU dzGPxww== X-Received: from plbku3.prod.google.com ([2002:a17:903:2883:b0:2bf:8db:4516]) (user=wyihan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ecd0:b0:2c6:9f6a:9f6f with SMTP id d9443c01a7336-2cfa6c66734mr9553835ad.28.1784762072595; Wed, 22 Jul 2026 16:14:32 -0700 (PDT) Date: Wed, 22 Jul 2026 23:13:20 +0000 In-Reply-To: <20260722-tdx-selftests-v14-0-15ad654a50db@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260722-tdx-selftests-v14-0-15ad654a50db@google.com> X-Developer-Key: i=wyihan@google.com; a=ed25519; pk=cRi0fKzS5BMxlHyHY2pJv3w/1zcgfYKr6EYGYppdMYc= X-Developer-Signature: v=1; a=ed25519-sha256; t=1784762054; l=3521; i=wyihan@google.com; s=20260319; h=from:subject:message-id; bh=xqpuRNldDHsQw4caqxUrdj/Q5OmHfnukgRI/kPmbKvA=; b=lro9gw6spAzyLdUzV3VuSRQIK+ZItJCg11HfLCf1lzHdMGraZlgSyxEOVHfijLoItxsnTtGLy nqcpK0M8FOyAze6f36y/Zonp0LYbMf4Ht+uI3WjVyWGfhWGCj7xCKum X-Mailer: b4 0.14.3 Message-ID: <20260722-tdx-selftests-v14-15-15ad654a50db@google.com> Subject: [PATCH v14 15/22] KVM: selftests: Call KVM_TDX_INIT_VCPU when creating a new TDX vcpu From: Lisa Wang To: Andrew Jones , Ackerley Tng , Binbin Wu , Chao Gao , Chenyi Qiang , Dave Hansen , Erdem Aktas , Ira Weiny , Isaku Yamahata , Kiryl Shutsemau , linux-kselftest@vger.kernel.org, Paolo Bonzini , "Pratik R. Sampat" , Reinette Chatre , Rick Edgecombe , Roger Wang , Ryan Afranji , Sagi Shahar , Sean Christopherson , Shuah Khan , Xiaoyao Li , Oliver Upton Cc: Jeremiah McReynolds , kvm@vger.kernel.org, linux-coco@lists.linux.dev, linux-kernel@vger.kernel.org, x86@kernel.org, Lisa Wang Content-Type: text/plain; charset="utf-8" From: Sagi Shahar TDX VMs need to issue the KVM_TDX_INIT_VCPU ioctl for each vcpu after vcpu creation. Since the cpuids for TD are managed by the TDX module, read the values virtualized for the TD using KVM_TDX_GET_CPUID and set them in kvm using KVM_SET_CPUID2 so that kvm has an accurate view of the VM cpuid values. Signed-off-by: Sagi Shahar Signed-off-by: Lisa Wang --- .../selftests/kvm/include/x86/tdx/tdx_util.h | 21 ++++++++++++++ tools/testing/selftests/kvm/lib/x86/processor.c | 33 ++++++++++++++++------ 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h b/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h index f5003cbaa106..07e7f5c90329 100644 --- a/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h +++ b/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h @@ -44,6 +44,27 @@ static inline bool is_tdx_vm(struct kvm_vm *vm) } \ }) +#define __tdx_vcpu_ioctl(vcpu, cmd, _flags, arg) \ +({ \ + union { \ + struct kvm_tdx_cmd c; \ + unsigned long raw; \ + } tdx_cmd = { .c = { \ + .id = (cmd), \ + .flags = (u32)(_flags), \ + .data = (u64)(arg), \ + } }; \ + \ + __vcpu_ioctl(vcpu, KVM_MEMORY_ENCRYPT_OP, &tdx_cmd.raw); \ +}) + +#define tdx_vcpu_ioctl(vcpu, cmd, flags, arg) \ +({ \ + int ret = __tdx_vcpu_ioctl(vcpu, cmd, flags, arg); \ + TEST_ASSERT(!ret, "%s failed, errno: %d (%s)", \ + #cmd, errno, strerror(errno)); \ +}) + void tdx_init_vm(struct kvm_vm *vm, u64 attributes); void tdx_vm_setup_boot_code_region(struct kvm_vm *vm); void tdx_vm_setup_boot_parameters_region(struct kvm_vm *vm, u32 nr_runnable_vcpus); diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c index 8f8bb90fec35..f6a2aa6b86a4 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -838,6 +838,17 @@ gva_t kvm_allocate_vcpu_stack(struct kvm_vm *vm) return stack_gva; } +static void tdx_vcpu_init(struct kvm_vm *vm, struct kvm_vcpu *vcpu) +{ + struct kvm_cpuid2 *cpuid; + + cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES); + tdx_vcpu_ioctl(vcpu, KVM_TDX_GET_CPUID, 0, cpuid); + vcpu_init_cpuid(vcpu, cpuid); + free(cpuid); + tdx_vcpu_ioctl(vcpu, KVM_TDX_INIT_VCPU, 0, NULL); +} + struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, u32 vcpu_id) { struct kvm_mp_state mp_state; @@ -845,15 +856,21 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, u32 vcpu_id) struct kvm_regs regs; vcpu = __vm_vcpu_add(vm, vcpu_id); - vcpu_init_cpuid(vcpu, kvm_get_supported_cpuid()); - vcpu_init_sregs(vm, vcpu); - vcpu_init_xcrs(vm, vcpu); - /* Setup guest general purpose registers */ - vcpu_regs_get(vcpu, ®s); - regs.rflags = regs.rflags | 0x2; - regs.rsp = kvm_allocate_vcpu_stack(vm); - vcpu_regs_set(vcpu, ®s); + if (is_tdx_vm(vm)) { + tdx_vcpu_init(vm, vcpu); + } else { + vcpu_init_cpuid(vcpu, kvm_get_supported_cpuid()); + + vcpu_init_sregs(vm, vcpu); + vcpu_init_xcrs(vm, vcpu); + + /* Setup guest general purpose registers */ + vcpu_regs_get(vcpu, ®s); + regs.rflags = regs.rflags | 0x2; + regs.rsp = kvm_allocate_vcpu_stack(vm); + vcpu_regs_set(vcpu, ®s); + } /* Setup the MP state */ mp_state.mp_state = 0; -- 2.55.0.229.g6434b31f56-goog