From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 A044E45D5EB for ; Wed, 22 Jul 2026 23:14:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784762079; cv=none; b=JiX/cahzF8eHh/ByamfClWqhOFSOB4loRtHBZ+PchgxlGOH5mFcMRyJiTaDMXKCMQATFLSmQRGjyB5mTbUlbA9cmyliyZVb6ctNgoz9TusRm/TEpuJa90YyPM96CrkZfd8cDrVXNlTQJJMR1KmnwjGo7jqAnOeVLcGp/YN0Yr0E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784762079; c=relaxed/simple; bh=jpR9xtsvpa/RjBQ8wnCwKk/x2/b0KiCTZGNnNI5CsfE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mu8+q9MndFErNNWRlLBTPSb9ioU3Oo1vsTUBLgNVZdTpEjg69Cg6eLigs/+mGEMEM2ZfZDD7FeiTwyjL6Ib6e7NV431PvadK+MFMYGNb1hLOMoTdNiDLqmg0DhpC/IrlCapwnrCkarYe8iObssC+eJ9HffHUScyUBhrTQJiLp1M= 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=ZGNz5egO; arc=none smtp.client-ip=209.85.214.198 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="ZGNz5egO" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2cacf17c7e0so652745ad.0 for ; Wed, 22 Jul 2026 16:14:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784762076; x=1785366876; 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=h/BhsDx/NrVOxcO3ExGYsFuYgkeOvxYZ93mj2rERXwA=; b=ZGNz5egOAowiJq/cKB/R674OkEzfC0Hc5y0WcI0QOnQUQE7aFck6vkAiPznBY90a1b nZdCG4OdlvlX6phR9DWsWDphylwcC18Tgl7H0Rb9UtucwyYSdqkUSFaLh2zbsdhd9EfM DqZpVTogY8IEwnU3HHqsTNn63MPGLhtAt+JPRvCst2HXpZdQSHhzBdlIOuRYPFo1LWBS 1kS2STwiFFPVW5aWiUwCJEnhPy3fGncxs6MXfIYdP/1Lw81X+f87EihdxJW9hS9Tlknz 4p/Etl7RTyk7GCsPraK1wYKPT68PcOjiIX6u8jq7gtJOfz/TnnhTtViiDk8Fh2WQ5V3m FQ4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784762076; x=1785366876; 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=h/BhsDx/NrVOxcO3ExGYsFuYgkeOvxYZ93mj2rERXwA=; b=JFlW7l+9x/lY10E4apUMooDEOsjZ93NXq7Ng3u0n6tJBQs6T0G5RfDYt79IbDh0Kxk /XrxjQQjLlsxXC3RQwQ5pf72KgcBBhimQT218+dpWrlR5JXMtLhZxkgPelGggNUBZYs3 PNFVqXCPGS+iS0y0Dc1BL/P67RYiouGJrhb44ccG+RvZN1cxy1kPBp/ire5zuFPw0qfz rTdqfrl8kgl4QIxwMsNfuroRjhT0454H4DLs0AR5U1/dVfRe4F8+PJrokNjttQpyYZR8 i5x2skhRZij5cR+AL4esYNQqRxJdHH0YSeOUAclvvJnpQMDENV4Ilf1mD2CGuPJhuEcJ AixQ== X-Forwarded-Encrypted: i=1; AHgh+Rpe5JrdSvLLpTxbwJFESLTYduVTMA4kY4RVmCFBRnnDdeO5f2LwAxywxE53+mWuon5Qrc3VOR+uxtrn/tY=@vger.kernel.org X-Gm-Message-State: AOJu0YyWx2Nd1+Z5OfojK1P4n5/6CW6LIJB8+1nqjyEp9RgSjYlT/RLs KH+/Zbl8vRsfArrYFIhwCZ77kHkEkAHc4tJk8QiHdLO+Y+zxBD+ZcQTICgq1sVrPwL10+0WpECm 0AM3Tqg== X-Received: from plcl21.prod.google.com ([2002:a17:902:e2d5:b0:2ca:5d68:247c]) (user=wyihan job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e544:b0:2cf:8131:75f3 with SMTP id d9443c01a7336-2cfa6a558e5mr9703405ad.7.1784762074619; Wed, 22 Jul 2026 16:14:34 -0700 (PDT) Date: Wed, 22 Jul 2026 23:13:22 +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=3002; i=wyihan@google.com; s=20260319; h=from:subject:message-id; bh=/f3t5qAAcjcel6oyHhPMCidPw1Nejh4ZBp7/fc5KqHM=; b=NQPWIjycJ+6xb4w0LTnFIA7Ko3LQ1ujfT5ISJno2PAeSTeWTXp/i4m3eMhUFBPNaSX7sc4prV AvAdTcIn6trCzFRLDIDTpJu/5gKDNMpvrzmGRQqT0HaRbKzLREq3ekg X-Mailer: b4 0.14.3 Message-ID: <20260722-tdx-selftests-v14-17-15ad654a50db@google.com> Subject: [PATCH v14 17/22] KVM: selftests: Set entry point for TDX guest code 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 Since the rip register is inaccessible for TDX VMs, we need a different way to set the guest entry point for TDX VMs. This is done by writing the guest code address to a predefined location in the guest memory and loading it into rip as part of the TDX boot code. Signed-off-by: Sagi Shahar Signed-off-by: Lisa Wang --- tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h | 1 + tools/testing/selftests/kvm/lib/x86/processor.c | 10 +++++++--- tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c | 10 ++++++++++ 3 files changed, 18 insertions(+), 3 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 93ce6e1ad2c8..307e2c0bc9c9 100644 --- a/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h +++ b/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h @@ -70,5 +70,6 @@ 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); void tdx_vm_load_common_boot_parameters(struct kvm_vm *vm); void tdx_vcpu_load_boot_parameters(struct kvm_vm *vm, struct kvm_vcpu *vcpu); +void tdx_vcpu_set_entry_point(struct kvm_vcpu *vcpu, void *guest_code); #endif /* SELFTESTS_TDX_TDX_UTIL_H */ diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c index 5e415c6577b8..4b97a9a1bb5e 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -808,9 +808,13 @@ void vcpu_arch_set_entry_point(struct kvm_vcpu *vcpu, void *guest_code) { struct kvm_regs regs; - vcpu_regs_get(vcpu, ®s); - regs.rip = (unsigned long) guest_code; - vcpu_regs_set(vcpu, ®s); + if (is_tdx_vm(vcpu->vm)) { + tdx_vcpu_set_entry_point(vcpu, guest_code); + } else { + vcpu_regs_get(vcpu, ®s); + regs.rip = (unsigned long)guest_code; + vcpu_regs_set(vcpu, ®s); + } } gva_t kvm_allocate_vcpu_stack(struct kvm_vm *vm) diff --git a/tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c b/tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c index 3c3ac6c7ce40..be63d8652a02 100644 --- a/tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c +++ b/tools/testing/selftests/kvm/lib/x86/tdx/tdx_util.c @@ -114,6 +114,16 @@ void tdx_vcpu_load_boot_parameters(struct kvm_vm *vm, struct kvm_vcpu *vcpu) vcpu_params->esp_gva = kvm_allocate_vcpu_stack(vm); } +void tdx_vcpu_set_entry_point(struct kvm_vcpu *vcpu, void *guest_code) +{ + struct td_boot_parameters *params = + addr_gpa2hva(vcpu->vm, TD_BOOT_PARAMETERS_GPA); + struct td_per_vcpu_parameters *vcpu_params = + ¶ms->per_vcpu[vcpu->id]; + + vcpu_params->guest_code = (u64)guest_code; +} + static struct kvm_tdx_capabilities *tdx_read_capabilities(struct kvm_vm *vm) { static struct kvm_tdx_capabilities *tdx_cap; -- 2.55.0.229.g6434b31f56-goog