From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 A44B02877EE for ; Thu, 4 Sep 2025 06:55:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756968911; cv=none; b=IghybObUUStDnyCnbF2zzRAEtmSZ6GuXoBWm/lRUTj8HZUq/SyPLqI+IpycbJd8FCbSJKknSrp6jK9FMnj2sxAt+xEuPGxAzMAi9KKaLmCs5lsmhnwYgu1/nvhA5ahaRPgtCpzJ9QXpA2cvi12Q/s+fQhKYBUccHAQb2eVA34so= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756968911; c=relaxed/simple; bh=gbMGCJ4AmKTFx5ZP3d8/sR850NUZ8Nyfys/WO0gx5zQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=k2X+Kf3/omvjV6R0VyX3vQWM7z94/3dJQI3JEtSc7K7XoYTQqno1LtvWZFurjsQo75PG5NVRyGqrIhXhGnhKueHBZcGTNfmfdvebGF2Y9UsxPvCVi7vIUmNUDLwS5ZFZ+f7fv091R58T6/PSsaRCxo+TPcjzpXg2u1hmj7C8NdM= 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=emOewqRS; arc=none smtp.client-ip=209.85.215.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="emOewqRS" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b4dfb96c99dso477024a12.0 for ; Wed, 03 Sep 2025 23:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756968909; x=1757573709; 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=NDDOgHIgq9qGhhvchsAZNjlKa2bwiovWK1PgQkjRy/c=; b=emOewqRSahTk0nN4wYhNazRIY1dPE+SpIACQU36S7xXNeCXvgptOkDU5yOLIHMZ0ZO ruNnxqqS7xA2VLit0xmDiwzx7PVTwNQBx2D592+MAMBMogOP9hqg976dl1C+yY64vqbN GqJhREIShbpZ+KWi96a1FJewejdHjD1LyO1S0Td2YIhvRvafNdufT9QA+ECO2ZRo5G7d S3JBMmIXNfZTvrlUNQHmGhPHqO3f9One9kKvkplzk/EL/Ogna9+uFvyz4NskrnUe5792 WGhgfs5iYEwzEA0v1wYzLoXEPtaYnovzlUOqX2/SsihxXkJdYxoM/AM+njryOO1xYT1B U8yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756968909; x=1757573709; 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=NDDOgHIgq9qGhhvchsAZNjlKa2bwiovWK1PgQkjRy/c=; b=W/owvmkR8KPwGgURA/LaGVFX1dcEsFyCajCSDN8Tbj3HiQwhGu8uOb7YnvYGtJiF3w JofPbA/3vrwXm8Dy304988xOk3RI0go9qNM51SuAVIwWDtOxRrbZwWgry+7yCGMS//pP pnqP6fFRmVNfHPqm1rJs62pfSsARrF2y2dQY1cPb8HS5K1Nn1FSYpeVNLfbeyEDYrN5Z gHp6gbP/551D+8qIxwKGI3Fe7tWSUtZOmQd/agkDj1bJvwfIzYKzf2dZlrTj0IxwaFy2 +9ZRBgNyFjuzIO20uQRPS+2AXYomW8b3v5xnDAi7m+OA0IxLfxsf1ZB+VWs0AJn/CU9I FjtA== X-Forwarded-Encrypted: i=1; AJvYcCWRBHgZNunemjnqU2gpHLe5aayBXXZo0GpoNPF4XUyW7iE9p5P8thknjzjN1+37oFD/pIY=@vger.kernel.org X-Gm-Message-State: AOJu0Ywwu+G47aKTedMwQg/BPL1DKPy31QJblZmPighCOXg8cJEUuBGj COwVoKvaxhocdDicVwjAOe4UV7hXqm/TObihQYSjiGV9ZAY1uXRcahTw+mcNFEZv0CdtUydv82D Pjw== X-Google-Smtp-Source: AGHT+IEJ3xueX8dywduwUXcV9xf6moiRuuQXOoidBruGPeNFQRdyoPhUvTZBSxs/kIbopXdVJcYw683Htw== X-Received: from pgbdp9.prod.google.com ([2002:a05:6a02:f09:b0:b4c:2bd1:3d27]) (user=sagis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:258a:b0:24c:2fa1:fdd4 with SMTP id adf61e73a8af0-24c2fa201c8mr1255804637.19.1756968909005; Wed, 03 Sep 2025 23:55:09 -0700 (PDT) Date: Wed, 3 Sep 2025 23:54:34 -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-5-sagis@google.com> Subject: [PATCH v10 04/21] KVM: selftests: Update kvm_init_vm_address_properties() for TDX 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, Adrian Hunter Content-Type: text/plain; charset="UTF-8" From: Isaku Yamahata Let kvm_init_vm_address_properties() initialize vm->arch.{s_bit, tag_mask} similar to SEV. TDX sets the shared bit based on the guest physical address width and currently supports 48 and 52 widths. Co-developed-by: Adrian Hunter Signed-off-by: Adrian Hunter Signed-off-by: Isaku Yamahata Co-developed-by: Sagi Shahar Signed-off-by: Sagi Shahar --- .../selftests/kvm/include/x86/tdx/tdx_util.h | 14 ++++++++++++++ tools/testing/selftests/kvm/lib/x86/processor.c | 12 ++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h diff --git a/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h b/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h new file mode 100644 index 000000000000..286d5e3c24b1 --- /dev/null +++ b/tools/testing/selftests/kvm/include/x86/tdx/tdx_util.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef SELFTESTS_TDX_TDX_UTIL_H +#define SELFTESTS_TDX_TDX_UTIL_H + +#include + +#include "kvm_util.h" + +static inline bool is_tdx_vm(struct kvm_vm *vm) +{ + return vm->type == KVM_X86_TDX_VM; +} + +#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 82369373e843..2a44831e0cc9 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -8,6 +8,7 @@ #include "kvm_util.h" #include "processor.h" #include "sev.h" +#include "tdx/tdx_util.h" #ifndef NUM_INTERRUPTS #define NUM_INTERRUPTS 256 @@ -1160,12 +1161,19 @@ void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits) void kvm_init_vm_address_properties(struct kvm_vm *vm) { + uint32_t gpa_bits = kvm_cpu_property(X86_PROPERTY_GUEST_MAX_PHY_ADDR); + + vm->arch.sev_fd = -1; + if (is_sev_vm(vm)) { vm->arch.sev_fd = open_sev_dev_path_or_exit(); vm->arch.c_bit = BIT_ULL(this_cpu_property(X86_PROPERTY_SEV_C_BIT)); vm->gpa_tag_mask = vm->arch.c_bit; - } else { - vm->arch.sev_fd = -1; + } else if (is_tdx_vm(vm)) { + TEST_ASSERT(gpa_bits == 48 || gpa_bits == 52, + "TDX: bad X86_PROPERTY_GUEST_MAX_PHY_ADDR value: %u", gpa_bits); + vm->arch.s_bit = BIT_ULL(gpa_bits - 1); + vm->gpa_tag_mask = vm->arch.s_bit; } } -- 2.51.0.338.gd7d06c2dae-goog