From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f74.google.com (mail-io1-f74.google.com [209.85.166.74]) (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 6F4EC3587C1 for ; Tue, 28 Oct 2025 21:21:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761686474; cv=none; b=h7X+p82Z2YJ5/ihNVeofGD2opI7NzU0WKOFztWe6RkjJt3AhxW082AZd5nRiKHNgfh774L1TZ/da29Cy++ovcfzLlk+4UYIiGnBu89aL1acojf6GjAJscj3MaxN8vCt7qGRFnAYazdOXmR1puAWau+fUpxZ+sf0Ms/gWINx3dIw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761686474; c=relaxed/simple; bh=FNuIYYaTDnExBaJlJLyltrsAwMmyaJqObjpLAPe8cjE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GDHgL+42zKhsMYweMCk6o/3q8nzsW2BaJjXzXkALTD6jCWxRTiohi9AU8O+EXsJPKNoM8o1aHzegILwTh2GEst4gEtwY7S7ikKLtUxQfMXdXgUaQZB8uiD9mxkQw7Aax8oNP9KWQ6MvH5N4XCaaUj8GeDs7YcQbspltZ+6yavjY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sagis.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=EyWD6zJE; arc=none smtp.client-ip=209.85.166.74 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--sagis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EyWD6zJE" Received: by mail-io1-f74.google.com with SMTP id ca18e2360f4ac-940d395fd10so1991961439f.1 for ; Tue, 28 Oct 2025 14:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1761686471; x=1762291271; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wtNpCTnCzrMlYFhLw7qwZUR1YJujCF7DVHm7Qw4COQg=; b=EyWD6zJE4Lj3tEqAxZVu90OR/AV3dR62FO+Y9e7T9a13GDf+p2oxsZXcRNJEdsstzz 8IdTLWcHDvMfGky7tsF2wu8ABpfD5iv8P71qRl7BbiMoSCgcVRmFHPZYJr06twFq7Vj7 WWKaSno6h1/LiUNOUhXkvkjYjDIBjMtVLgm6sQg4GmMd+wthsr3HlWRhZ0SAJz0HFNky KAX1ABzLrX5S9C9xDYElvGFW1t35ZXdiFm+jaANuFapIxEdRAvtg4F26W2vmGvyoyNxq ZaPvE9+lSuqGxDOlF7iRqb9kPivBd8atZFr1Vn6vnn+SLEPyY9zm0FMgv3ordzj2XzUW 6Llg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761686471; x=1762291271; h=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; bh=wtNpCTnCzrMlYFhLw7qwZUR1YJujCF7DVHm7Qw4COQg=; b=wgjwKQhGHo0GBov+c6sEVNnunllEdFVOjeg1xyRFZy+F+wccKkJDcIL0CconDlC0h0 o3W2uzO5jLzA6VR3n8y9vecMM6Eunr8dTMpha94JfYFvxqTevSbU/sdsMPkbAlpopEAA lsORTtPMBaJyEfuNJqa6woo2ojxJfvEBLlv2c7Hz2fOQoCyNm9FLyuZLOJFemXAerRYK 8rQL0H9+N37r1UNsjmtySv+nixb55NQU+jAul7fOJj/p9tUSVcIkKWFfMHfGHFh2Z5gS c6LH4d8dvH1Ci6KioRtSMZCsMCsIOBzVYU+bD82bMa6d3xpkaOvvhrWQYSP8tSE7y0zC cv6g== X-Forwarded-Encrypted: i=1; AJvYcCXqOQrKWfu3asogOM/iAs4sUZ0Yx/4VZHeL218RNRtmhn+/j9R8e3I/oBjJqHPifTgrda0=@vger.kernel.org X-Gm-Message-State: AOJu0YzdkToB+wxdXFwwJBUxbIRYnyDBCNaN7yHE8LsWNTTzu315fzfx cWpH12isZRXlK2l9xrOCi3ulFKsvVifugvXi8ZcFQNxgq6K3k8LWZLWzuhdYb2DGU1Q+NLUqyL5 hGw== X-Google-Smtp-Source: AGHT+IE4wigd+sbcojUz5qHvrr7kF5OQrUZWBBxs3tohiwBFRj7c0ff5ucgIVmL3YMeSBqq9v4qFKvnm5A== X-Received: from iobhd10.prod.google.com ([2002:a05:6602:680a:b0:945:af6f:682e]) (user=sagis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6602:2d83:b0:945:abea:9f6a with SMTP id ca18e2360f4ac-945c9889dc5mr154675739f.19.1761686471591; Tue, 28 Oct 2025 14:21:11 -0700 (PDT) Date: Tue, 28 Oct 2025 21:20:43 +0000 In-Reply-To: <20251028212052.200523-1-sagis@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251028212052.200523-1-sagis@google.com> X-Mailer: git-send-email 2.51.1.851.g4ebd6896fd-goog Message-ID: <20251028212052.200523-18-sagis@google.com> Subject: [PATCH v12 17/23] KVM: selftests: Call KVM_TDX_INIT_VCPU when creating a new TDX vcpu From: Sagi Shahar To: linux-kselftest@vger.kernel.org, Paolo Bonzini , Shuah Khan , Sean Christopherson , Ackerley Tng , Ryan Afranji , Andrew Jones , Isaku Yamahata , Erdem Aktas , Rick Edgecombe , Sagi Shahar , Roger Wang , Binbin Wu , Oliver Upton , "Pratik R. Sampat" , Reinette Chatre , Ira Weiny , Chao Gao , Chenyi Qiang Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" 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 --- .../testing/selftests/kvm/lib/x86/processor.c | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c index 990f2769c5d8..036875fe140f 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -722,6 +722,19 @@ vm_vaddr_t kvm_allocate_vcpu_stack(struct kvm_vm *vm) return stack_vaddr; } +static void vm_tdx_vcpu_add(struct kvm_vm *vm, struct kvm_vcpu *vcpu) +{ + struct kvm_cpuid2 *cpuid; + + cpuid = allocate_kvm_cpuid2(MAX_NR_CPUID_ENTRIES); + vm_tdx_vcpu_ioctl(vcpu, KVM_TDX_GET_CPUID, 0, cpuid); + vcpu_init_cpuid(vcpu, cpuid); + free(cpuid); + vm_tdx_vcpu_ioctl(vcpu, KVM_TDX_INIT_VCPU, 0, NULL); + + vm_tdx_load_vcpu_boot_parameters(vm, vcpu); +} + struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id) { struct kvm_mp_state mp_state; @@ -729,15 +742,21 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id) struct kvm_vcpu *vcpu; 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)) { + vm_tdx_vcpu_add(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.51.1.851.g4ebd6896fd-goog