Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 4701A28727D for ; Thu, 4 Sep 2025 06:55:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756968909; cv=none; b=A2h/YyoV4YHBmPafgEQ4fbDSeluodUbfMPEuQ+0qjih6DqViU0JNwoWV1zNtLk/CKxkAnTOkeny/+z4hVD8in4+prdtQk+PsjH6/Nks1cCQE/UgI1cywo2R/5FVwMXmG35rAP+Kh1TzAkUHLBRRvIL8CbZP3XoKLHJQT09jRhX8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756968909; c=relaxed/simple; bh=EiTLc0aW13p3IiS4aBuoOV83AeEk06GWH67Cf3kqWJg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Qb4Zc7uLJhgTXGx/ue/EDkoOp8LUb8/QHf9lObJVTLgw2N7VFnvQisP50PhUR75bb1tjACsd/o6k9RXUdHlFdE365TGRPa9OlAIvDagymgZFZ/M0ccJ2IeKXBWlhmJqmC0T82auCE3RM8kjMUEEzk5h0Q3yiZ/LU/KAFRe6h29o= 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=3AzTe8GD; arc=none smtp.client-ip=209.85.210.202 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="3AzTe8GD" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-77260b29516so1374498b3a.3 for ; Wed, 03 Sep 2025 23:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756968907; x=1757573707; 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=1UaVfX3zOkLGXHSP9oRgmeXGU19apvDwL7UQ/Q2BpRU=; b=3AzTe8GDhnqiXVKdLiL7Cow142EmI8WyTS5jJmwHHuvyKz9kXgEkQYZeVGI1q8aKqq cQ0Izqr7Pmgv579zPgCu/xv678cjOYwk3x0UavgkAtTEB8b6pO/x0jqnR+T7eOKBNa0I CSb4euKRPckcN7RA3NxhekJx9+m43lyJ+nV2dziNX2BhwJMAWAjK3IAELFiTBn839VXN EKvenkp5OK+J/A73AS4k7u92HF1S0TcCHVesNcSzYXgve4Q55eOmYDHhdDYuzJDco/Ii 6FW8emkra/QEXLydkfDN+XE+1iaJVQVKwxmZlPk0GQjFM6LySJskxYQQfEAK69jbPPLk rzLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756968907; x=1757573707; 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=1UaVfX3zOkLGXHSP9oRgmeXGU19apvDwL7UQ/Q2BpRU=; b=sKjHYy/5Wz4FFafLXWwwi/u3+fHCrBTTCRx+ekqiMJEtll1yQhtURwYDJmC16+mDoc tNZS8sgnecVHVcaaKNWG9lQvg6VCb2iIcPq8szw3FqmZ1hkvYpQza7raEuDXEE9UPALz u6ZgYydWt6/22GJdEWuIY4O3zCTZ+2TDbHr0W0IO3TKS7yTDm15bJNVzOQsu0ScX9if1 P/XRyfsx/FFTJOTQOc4UL4EYtOV+FiC0pNgS95i7TNXL/ikgH37ijn2+283/rKxY3zq/ KuP10NXgcCip4UM2Me3obzyzKyEtOxyw4tYrqTtSyKXHNpkxnif/NXLiUB0bkWXH03Ev PmlQ== X-Forwarded-Encrypted: i=1; AJvYcCV1lvI2tgpPO6nG/SraeqjfF44LYTcfZeWQY0fcj63BEERq4423XnRAujV+1QXOGbZ3ik0=@vger.kernel.org X-Gm-Message-State: AOJu0YxoJhp2i8B+D8sZc7eV9FMBvonv09BD3ZK66U1jiqwvih7NKGxl WtcO9mp3HZSiQoNDqHEXkg9eyN41Rbqj8T8MJS7K1hVNFAtIeNT/vzkCYhpSn+SwI4vI47HIUuJ 1iQ== X-Google-Smtp-Source: AGHT+IFXT+7TET6eQLNfnMbWm2CfkiHvtD2nLGJIyq17+osdVfH3IRuTMKDNhIPImZxMhUnt6NxzFYe7Cg== X-Received: from pfch21.prod.google.com ([2002:a05:6a00:1715:b0:76e:396a:e2dd]) (user=sagis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2e0d:b0:772:88b7:5a with SMTP id d2e1a72fcca58-77288b70399mr3947136b3a.16.1756968907464; Wed, 03 Sep 2025 23:55:07 -0700 (PDT) Date: Wed, 3 Sep 2025 23:54:33 -0700 In-Reply-To: <20250904065453.639610-1-sagis@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250904065453.639610-1-sagis@google.com> X-Mailer: git-send-email 2.51.0.338.gd7d06c2dae-goog Message-ID: <20250904065453.639610-4-sagis@google.com> Subject: [PATCH v10 03/21] KVM: selftests: Expose function to allocate guest vCPU stack 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 guests' registers cannot be initialized directly using vcpu_regs_set(), hence the stack pointer needs to be initialized by the guest itself, running boot code beginning at the reset vector. Expose the function to allocate the guest stack so that TDX initialization code can allocate it itself and skip the allocation in vm_arch_vcpu_add() in that case. Signed-off-by: Sagi Shahar --- .../selftests/kvm/include/x86/processor.h | 2 ++ tools/testing/selftests/kvm/lib/x86/processor.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86/processor.h b/tools/testing/selftests/kvm/include/x86/processor.h index f610c09cadf4..8e75df5e6bc9 100644 --- a/tools/testing/selftests/kvm/include/x86/processor.h +++ b/tools/testing/selftests/kvm/include/x86/processor.h @@ -1109,6 +1109,8 @@ static inline void vcpu_clear_cpuid_feature(struct kvm_vcpu *vcpu, vcpu_set_or_clear_cpuid_feature(vcpu, feature, false); } +vm_vaddr_t kvm_allocate_vcpu_stack(struct kvm_vm *vm); + uint64_t vcpu_get_msr(struct kvm_vcpu *vcpu, uint64_t msr_index); int _vcpu_set_msr(struct kvm_vcpu *vcpu, uint64_t msr_index, uint64_t msr_value); diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c index 83efcf48faad..82369373e843 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -658,12 +658,9 @@ void vcpu_arch_set_entry_point(struct kvm_vcpu *vcpu, void *guest_code) vcpu_regs_set(vcpu, ®s); } -struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id) +vm_vaddr_t kvm_allocate_vcpu_stack(struct kvm_vm *vm) { - struct kvm_mp_state mp_state; - struct kvm_regs regs; vm_vaddr_t stack_vaddr; - struct kvm_vcpu *vcpu; stack_vaddr = __vm_vaddr_alloc(vm, DEFAULT_STACK_PGS * getpagesize(), DEFAULT_GUEST_STACK_VADDR_MIN, @@ -684,6 +681,15 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id) "__vm_vaddr_alloc() did not provide a page-aligned address"); stack_vaddr -= 8; + return stack_vaddr; +} + +struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id) +{ + struct kvm_mp_state mp_state; + struct kvm_regs regs; + struct kvm_vcpu *vcpu; + vcpu = __vm_vcpu_add(vm, vcpu_id); vcpu_init_cpuid(vcpu, kvm_get_supported_cpuid()); vcpu_init_sregs(vm, vcpu); @@ -692,7 +698,7 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id) /* Setup guest general purpose registers */ vcpu_regs_get(vcpu, ®s); regs.rflags = regs.rflags | 0x2; - regs.rsp = stack_vaddr; + regs.rsp = kvm_allocate_vcpu_stack(vm); vcpu_regs_set(vcpu, ®s); /* Setup the MP state */ -- 2.51.0.338.gd7d06c2dae-goog