From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 5FCD33126BE for ; Thu, 25 Sep 2025 17:29:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758821348; cv=none; b=alGjzqi5U+n5vnpyv5z9jC96XTGXSwpK+sEze4/uz35kAOufzlg310txpiok75T4pFnhHU4L1iMYdAOIadvCWeTfN89ZBSiL/zGtu1Oh74ldXLJateuHyXw8NXU5f9+GdNpRhpkZBxfSY9OZrT1yJLgeCtAVls1UYieFhFc4MxE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758821348; c=relaxed/simple; bh=bOvTd2bB6/WZ+eh2dApwatXxF97GRYm67HVPHEr5nyI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tEcS+NxeBabmkNxPL7JCQ6DyiDXbyz5wReNaD+EZKxTpyN6dDazfK9Hq3xdlvqa+f8p8Af8skYcI1PUUJCxNE7FgOK5TYwSdmQVzEJiU7Bo0//LJkZwjWUCgSsc4qj/Ub8ODyltm3iqQlMbpXsqQQJwy872K+njBrvTBzVXoFDc= 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=aoOZByf9; arc=none smtp.client-ip=209.85.210.201 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="aoOZByf9" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-77f610f7325so1058621b3a.1 for ; Thu, 25 Sep 2025 10:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758821346; x=1759426146; 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=1mZRrNcnYUjmo7rmN8LDqwFLvvoTI0A/jd/T6+rTzXE=; b=aoOZByf90Rn79LMsBX4p0JPCjoh1uzea7GE4zhiDkQZkT6d8CfoQVkyNbovfiBRPu3 od4TpMx79b9P1FP711qS03uVf7MO7syprmX73gjNGel7Nckzmdbkg9niqAeEtjULuCfW qhbOzHOsavUSGpEl9I4wxCrCdU7pq+A+Hh7nnR1+oXhzvbexdRD1OiR07Lf8tzod/tnu JHz3i1f1FKo43S6nJeLqCBi69+o5XnmOcEody0x6vxqc6HkqAg0PqPfEfVNPK3oBsy5j +QBV4ZMVeoi6We+Y4Cqre5evySCetzHrmblY502VQTbI/Jb6d3WD4JfEfNKNnmTYMQhx tjKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758821346; x=1759426146; 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=1mZRrNcnYUjmo7rmN8LDqwFLvvoTI0A/jd/T6+rTzXE=; b=MtF5AN110QhXLtTu2wvCQFXJQEKSU+Auo6+dvcWOdtWFPNogu84wOa1mdrMkL7fr0w T27X7lWUVoPupYSWeWfRsinG7MQ10AQLQuoVif6INSipqdv0VI3ZM2JUhRRjSbKF8NzN TVTysBTwDqKHBMGuq7FcXw1WDzqRYS/1a0zvWNikxKrbvWfMW5IyGoAl6DQSJh3J5l4J bCICOLhagOCaQAHB1hWB9D6zn8yxtaQa8tDOEfop3bHSrso3cXVgvcGMzSHohXyFIrYg P3zBycuMqOnEZ8sZoi4G8zR20mCA/B8XhbUuDf7YgZAqRhhX2HEITrIzuG+hFWgD1Qb6 vbCA== X-Gm-Message-State: AOJu0YyFpUrkqxmDYW7dUCR/8JdDAYXIBdtjzkQ8dkrdomm5DBh0YtzU 3TMfY16wR1piHxKZXhDAaLxtkd3jRflXej26MZD2Ugj1CwlGqnb2ltwu5JKC//Z4o1IsenTNhZq Ib3d2AlW38Q210fmWzAFrbgNcRyEopLb8Tafb/RaNLFj6PE6SRtCPJ1n9wSaqbJYF+9ScFeA1zE ZwJXU7onqgSyxTI61xs7eHXb8DzKN7wuN3N50/OCiXDfQ= X-Google-Smtp-Source: AGHT+IHH7Mef2XNVh1ACvfIhTNHlDP18hKQJPvznI4TzvCashHW+qf63OPYFuy4CAmBPIVH0739cX6UI/A== X-Received: from pfbhh2.prod.google.com ([2002:a05:6a00:8682:b0:77f:61e8:fabd]) (user=sagis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4b0a:b0:776:1f45:9044 with SMTP id d2e1a72fcca58-780fcc6b61bmr4255358b3a.0.1758821345338; Thu, 25 Sep 2025 10:29:05 -0700 (PDT) Date: Thu, 25 Sep 2025 10:28:31 -0700 In-Reply-To: <20250925172851.606193-1-sagis@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250925172851.606193-1-sagis@google.com> X-Mailer: git-send-email 2.51.0.536.g15c5d4f767-goog Message-ID: <20250925172851.606193-4-sagis@google.com> Subject: [PATCH v11 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. Reviewed-by: Binbin Wu 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.536.g15c5d4f767-goog