From nobody Wed Dec 17 15:52:38 2025 Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B116E28CF5D for ; Tue, 21 Oct 2025 07:48:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761032934; cv=none; b=lCAXeXydkzIDgmpyL1N7OoUqyE9il2tMNwPpokyAOYhDnjzAEScz7jU+5gGSRz4lqXc5mFgjIAiIW9PggmqYIxs1Co3rv+NNMvWXM3543qgVBjO1Me04XBb8Sfe8/A+cJUwEpv8X5f3nKnHYtWaFkc4NM+hBS6tOQad9EF3r1tU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761032934; c=relaxed/simple; bh=nwpKTYunhpR2I0MoWw1vUHuiJF4funA/hkV+m9fRtrs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XQzUCdQyWMgmwEPvr17qdv5zGCIxb4xQdsVzBhT/ogbclWDnATrI24QZ4RRSHh/mhUXc6DAOIPgwcZuUqqXEXhtgU9SHn2ODClLlRH8iWda8uNdsccK78fjI7ehBEn+lHbmFP4qOoZzB/1ZjY+NkdILJxK+MZUzVtQRD6a6J4xo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=RKXTwJX0; arc=none smtp.client-ip=95.215.58.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="RKXTwJX0" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1761032926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Gu9aKJgaFjqAioSjcKo6ytfp2sq+GCP1NpEqf7iOGR4=; b=RKXTwJX0QR7FdDc+zDFHY9HJGGzCceCN+8dnlp1HwdXNLJyoKJ3SlwGwOqeYikKRUIcjHM qGGilgGfioQeKVKGp1QslmYAn+QH9OhQqu+Uab3sAskkvLIijPcSECUvplxRHhGAiTe5Zk pyChKLPvKgpx4Bk0EAQzLNhfdiJ3fwU= From: Yosry Ahmed To: Sean Christopherson Cc: Paolo Bonzini , Jim Mattson , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed Subject: [PATCH v2 14/23] KVM: selftests: Pass the root GPA into __virt_pg_map() Date: Tue, 21 Oct 2025 07:47:27 +0000 Message-ID: <20251021074736.1324328-15-yosry.ahmed@linux.dev> In-Reply-To: <20251021074736.1324328-1-yosry.ahmed@linux.dev> References: <20251021074736.1324328-1-yosry.ahmed@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Pass the root_gpa into __virt_pg_map() instead of assuming vm->pgd in preparation for using it with other MMUs. No functional change intended. Signed-off-by: Yosry Ahmed --- .../testing/selftests/kvm/include/x86/processor.h | 4 ++-- tools/testing/selftests/kvm/lib/x86/processor.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86/processor.h b/tools/te= sting/selftests/kvm/include/x86/processor.h index 8debe0df3ffca..2f0d83b6e5952 100644 --- a/tools/testing/selftests/kvm/include/x86/processor.h +++ b/tools/testing/selftests/kvm/include/x86/processor.h @@ -1451,8 +1451,8 @@ struct pte_masks { =20 extern const struct pte_masks x86_pte_masks; =20 -void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, - int level, const struct pte_masks *masks); +void __virt_pg_map(struct kvm_vm *vm, vm_paddr_t root_gpa, uint64_t vaddr, + uint64_t paddr, int level, const struct pte_masks *masks); void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, uint64_t nr_bytes, int level); =20 diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testin= g/selftests/kvm/lib/x86/processor.c index 92a2b5aefd880..13e9376d5f545 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -230,11 +230,11 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm = *vm, return pte; } =20 -void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, - int level, const struct pte_masks *masks) +void __virt_pg_map(struct kvm_vm *vm, vm_paddr_t root_gpa, uint64_t vaddr, + uint64_t paddr, int level, const struct pte_masks *masks) { const uint64_t pg_size =3D PG_LEVEL_SIZE(level); - uint64_t *pte =3D &vm->pgd; + uint64_t *pte =3D &root_gpa; int current_level; =20 TEST_ASSERT(vm->mode =3D=3D VM_MODE_PXXV48_4K || @@ -261,14 +261,14 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr,= uint64_t paddr, * early if a hugepage was created. */ for (current_level =3D vm->pgtable_levels; current_level > PG_LEVEL_4K; c= urrent_level--) { - pte =3D virt_create_upper_pte(vm, vm->pgd, pte, vaddr, paddr, + pte =3D virt_create_upper_pte(vm, root_gpa, pte, vaddr, paddr, current_level, level, masks); if (*pte & masks->large) return; } =20 /* Fill in page table entry. */ - pte =3D virt_get_pte(vm, vm->pgd, pte, vaddr, PG_LEVEL_4K, masks); + pte =3D virt_get_pte(vm, root_gpa, pte, vaddr, PG_LEVEL_4K, masks); TEST_ASSERT(!(*pte & masks->present), "PTE already present for 4k page at vaddr: 0x%lx", vaddr); *pte =3D masks->present | masks->writeable | (paddr & PHYSICAL_PAGE_MASK); @@ -285,7 +285,7 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, u= int64_t paddr, =20 void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr) { - __virt_pg_map(vm, vaddr, paddr, PG_LEVEL_4K, &x86_pte_masks); + __virt_pg_map(vm, vm->pgd, vaddr, paddr, PG_LEVEL_4K, &x86_pte_masks); } =20 void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, @@ -300,7 +300,7 @@ void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, = uint64_t paddr, nr_bytes, pg_size); =20 for (i =3D 0; i < nr_pages; i++) { - __virt_pg_map(vm, vaddr, paddr, level, &x86_pte_masks); + __virt_pg_map(vm, vm->pgd, vaddr, paddr, level, &x86_pte_masks); sparsebit_set_num(vm->vpages_mapped, vaddr >> vm->page_shift, nr_bytes / PAGE_SIZE); =20 --=20 2.51.0.869.ge66316f041-goog