From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 437F93C1986 for ; Mon, 20 Apr 2026 21:20:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776720045; cv=none; b=sJuJA+aljdYZqmMQ44LNeDjmZ7CAqyMfmY9tWk4plZxAnKfz5WvlLgxMvP0cgPK5TsYKe1L987gVMaUvDCgtO7KdBFLPAtFXEuZsqMrxjvIehYoKzkEA9zjcRiq5qB+kKgpMCmbtj5X4zNSQiaZzLW9VHW58tJvfsdB1a8EdOAY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776720045; c=relaxed/simple; bh=rGlxiGCoF1z1rV0m6jsQdC2fJYh/1Na3J5FPTRlOY0g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uBZIsjZdT6JO2ovrOl0u/9nMRIZkZenS+sHzL5KsUsZol8vqAqUahqR+ieTXNZZb98sBTBwdBXDfrELtxd/x9XnXAF7vu9efeDcnbhBll9TvWKaVQVea2a0JcGVWweclCQdYz1R2y0CLz/2oIheyBWT6YVS30H0esRt7QeWnv2Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WkmrGdKH; arc=none smtp.client-ip=209.85.215.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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WkmrGdKH" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c76c6280732so3875866a12.0 for ; Mon, 20 Apr 2026 14:20:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776720042; x=1777324842; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=QEFsBmHczG78buJgokkfE6P9p/Sjtw0NPo8cky9xSS4=; b=WkmrGdKHhLQQbWeUmo5qHuEYeHNyL82HZjvmCWhsDY945Nl6yAg8epzPgou+qT08Iw vIAaap+2BBI5M0HBMIsOVsWBhSALBAA7fBeflQkwO8utm48LAs9npBiE2202i7h1cLg8 yDpsid+vim7ELGQOvC4RCIS20iaQPDFz8G/hsnBHpevLzyosCkX5F0UFfVQB01kRMRh3 rIHlaE71G2xnPBkCpba48E0tLpURpfOFN4f4xaKet5ARChEwigxbL6K+ACPUAS7ukojF Mytsbh9SzlDiFGYAkvuuIl1hHvmj2k8BSQ3loDQG+vALDTL2buSJlI/6ZQb+vvv7GICZ rWgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776720042; x=1777324842; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QEFsBmHczG78buJgokkfE6P9p/Sjtw0NPo8cky9xSS4=; b=WiSO6csmviIVchBA7ciMgWEkA7YbM7SQ2HYftX1H7bMErlnxHEMu+puhxHRzPny6oP DiA+IkRYm4NaFHKKEUlHZL7JqFTuB6ph/NiNncPKvKhuC2BiwwfB53Hiv8pMQsavOYbY pGl62yPU/ovbRvoD+Xvz/wi1zard+qA5s5Mdoyn+w8selcvx0xEbLaIlCZlo7XXhsR+F ryf2IuMSjX/er7btoCRc+LyYlEtcoHgx7wiWHv4AGuE/szY3bkmjSRn2ffGCRLPgN9vy 9uzYDLYkvnmzLJyg3IYxIhTLLeSkEbbzaQQymdniouvBRLxsuTpceZY7xhLcuDUBODHN VLbA== X-Forwarded-Encrypted: i=1; AFNElJ/m50p8zMWK78cEoxLWsbO+R5MZelc9+zC0YpTOXPhuH97teSeJdFKWl6rgUYW7eJNAieyvXEt8CSGYCM8=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1EkmhKztHTlG7sttRP3nJhZv7wOxPS7E/lTHfnedCSm1HWwMR BldeSL0+q+oLyigWhwfY90jEWd8qbcLqVNNK03V+hNSgcad/jfwl1J/LLwfXWbSRxsXcolYYaEI MWb8A0g== X-Received: from pgbdp12.prod.google.com ([2002:a05:6a02:f0c:b0:c79:84fb:feac]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6d82:b0:398:90e5:a9b9 with SMTP id adf61e73a8af0-3a08d89d0b9mr16041202637.27.1776720042436; Mon, 20 Apr 2026 14:20:42 -0700 (PDT) Reply-To: Sean Christopherson Date: Mon, 20 Apr 2026 14:20:03 -0700 In-Reply-To: <20260420212004.3938325-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260420212004.3938325-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.rc1.555.g9c883467ad-goog Message-ID: <20260420212004.3938325-19-seanjc@google.com> Subject: [PATCH v3 18/19] KVM: selftests: Replace "u64 nested_paddr" with "gpa_t l2_gpa" From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, David Matlack Content-Type: text/plain; charset="UTF-8" In x86's nested TDP APIs, use the appropriate gpa_t typedef and rename variables from nested_paddr to l2_gpa to match KVM x86's nomenclature. No functional change intended. Signed-off-by: Sean Christopherson --- .../testing/selftests/kvm/include/x86/processor.h | 2 +- tools/testing/selftests/kvm/lib/x86/processor.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86/processor.h b/tools/testing/selftests/kvm/include/x86/processor.h index fc7efd722229..97dc887658c3 100644 --- a/tools/testing/selftests/kvm/include/x86/processor.h +++ b/tools/testing/selftests/kvm/include/x86/processor.h @@ -1514,7 +1514,7 @@ void virt_map_level(struct kvm_vm *vm, gva_t gva, u64 paddr, void vm_enable_tdp(struct kvm_vm *vm); bool kvm_cpu_has_tdp(void); -void tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr, u64 size); +void tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size); void tdp_identity_map_default_memslots(struct kvm_vm *vm); void tdp_identity_map_1g(struct kvm_vm *vm, u64 addr, u64 size); u64 *tdp_get_pte(struct kvm_vm *vm, u64 l2_gpa); diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c index 3c55980c81b2..892cc517d9f1 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -495,26 +495,24 @@ bool kvm_cpu_has_tdp(void) return kvm_cpu_has_ept() || kvm_cpu_has_npt(); } -void __tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr, - u64 size, int level) +void __tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size, int level) { size_t page_size = PG_LEVEL_SIZE(level); size_t npages = size / page_size; - TEST_ASSERT(nested_paddr + size > nested_paddr, "Vaddr overflow"); + TEST_ASSERT(l2_gpa + size > l2_gpa, "L2 GPA overflow"); TEST_ASSERT(paddr + size > paddr, "Paddr overflow"); while (npages--) { - __virt_pg_map(vm, &vm->stage2_mmu, nested_paddr, paddr, level); - nested_paddr += page_size; + __virt_pg_map(vm, &vm->stage2_mmu, l2_gpa, paddr, level); + l2_gpa += page_size; paddr += page_size; } } -void tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr, - u64 size) +void tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size) { - __tdp_map(vm, nested_paddr, paddr, size, PG_LEVEL_4K); + __tdp_map(vm, l2_gpa, paddr, size, PG_LEVEL_4K); } /* Prepare an identity extended page table that maps all the -- 2.54.0.rc1.555.g9c883467ad-goog