From nobody Thu Oct 2 11:57:49 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 9E80830DEC0 for ; Wed, 17 Sep 2025 21:51:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758145875; cv=none; b=cOVOG9CKJguG5P0j3pVZqk2+k/HkcR5USHiJvGK6gv5/V8JWVmHoJZ9mcpAvnua9quiasAjlKVZ7q8xNTQY8VHJOkSjUXjw6YG8rysG6lH5yroVgFQHDHhdRAiHv3SOq4+3HTiDZi5XYLr55NH9YyQrzD/KOTYSAGLG3az+O46g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758145875; c=relaxed/simple; bh=fV7d+iMC4cNbWSys5ekBLpLRqjs3hfSfwJ8ddSNU6KM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sAa/WwT/0fOcaESBR0S4c8lQHhfWhu9vQ6qCRIhpt6a58vhO+16XQYr21eDai46DVRJj0Lyo6o2CiNR+t0knbM2XnZE5546gmcPRjTPCaT0Iz8UA7bE0GlYidxBfSlN6uHDO6gvog6yMa4TM6Vs+2UEZMIF02ClFuscptJZHZ/I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jmattson.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=z3aa4xQg; arc=none smtp.client-ip=209.85.216.74 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--jmattson.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="z3aa4xQg" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-32e8c800a79so241168a91.0 for ; Wed, 17 Sep 2025 14:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758145873; x=1758750673; 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=6ODBCbD440uYvQ8SizIyBgOxXgM+3hzOx7AmPapgbVc=; b=z3aa4xQgQfrkctS0i6sPe9nVXl1EJCSbsu1n8C6siazFdEtDSmc7J3pFYBa225h7tr bmhI8ToKIwhLjRxImcc1IvUfC/NYwi/ZIs0zwyN1Hk3cnQ8TjOpGLrr51uLHGCSz3xl3 n/3xN/4tIbUbwxUcsDi/34Pd4rfIbR/RwYs3nESS9PhPz0AAZRBEnz/PKQgjRe0ET3xi rdeDt5XdClwVVn0kT68DN5zyQ5VSLrsyTKrcVX9GdqYLuP4HWa7pgqfAjbkLv8TuSQXW Fkz/nI0YcsZU5O59Sae4wnd0rrAEEpdNlxIdcl5KCMq4umVi4uUzFJ8gpooubl0S8RbB virg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758145873; x=1758750673; 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=6ODBCbD440uYvQ8SizIyBgOxXgM+3hzOx7AmPapgbVc=; b=bhGjYMwttxUTa/BYjAidHpxzQhCBDypKDhJYTAufUuhYZCEes97I8GbaJF9baShdyl FKk+nOotLDZhX2U4QjNK2V1sUvKNhwo6BARCtNxYr1r4YOsL4fNvnOk7/z6IUxCpqMxG NZpTzrxHRFESPZlyZ5C/3dTjL0MazB7bXfAxY8vH5xXReVy1SVK/NkyszvkanwNSiwkG LhvPdCk/XZ4UWjIo9iv9Hx03Q3E0j50/P5wtnbjTeTjKFK7EFt0SreQlgQGFR2bVAwQ6 VySWilnJ2V6i+t6hwelQeuOCIJxIeXCRKGEkHHMnQbbWZ1RfE/fsgauCIQrPrzAmVELL b8TQ== X-Forwarded-Encrypted: i=1; AJvYcCXm+r0zwPzbDOU1wd8g/suHWypgHac0JsYCZP5U8NLycncorbM1TTV1f5xvL+9Om8M5E5ptsYbDG+rcKAs=@vger.kernel.org X-Gm-Message-State: AOJu0YxJ1TAF020iLKx8Drq8G3EjdskGo6gPkrMqXmwbL67L/Ya4j1Lg qmUR673accgOvgQgrfI6U8d/5wyM2owkBKSx1/J4B7qoUq03Mpab1lbC0bkhmy+RRx6SzUcu4qj pIMX0sbbDWlSkqA== X-Google-Smtp-Source: AGHT+IEKqExV4mnY2Fu8atlg1uW5FJCAPBPhVFdmQ/waPYSuPzIUgusN63xwE2wudFUpWp9CX3s3sXd5/AY5zA== X-Received: from pjbsv12.prod.google.com ([2002:a17:90b:538c:b0:32e:b87b:6c84]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:39cc:b0:329:f535:6e48 with SMTP id 98e67ed59e1d1-32ee3fa2ccemr4100883a91.36.1758145872774; Wed, 17 Sep 2025 14:51:12 -0700 (PDT) Date: Wed, 17 Sep 2025 14:48:38 -0700 In-Reply-To: <20250917215031.2567566-1-jmattson@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250917215031.2567566-1-jmattson@google.com> X-Mailer: git-send-email 2.51.0.470.ga7dc726c21-goog Message-ID: <20250917215031.2567566-3-jmattson@google.com> Subject: [PATCH 2/4] KVM: selftests: Use a loop to walk guest page tables From: Jim Mattson To: Paolo Bonzini , Shuah Khan , Sean Christopherson , Bibo Mao , Huacai Chen , Andrew Jones , Claudio Imbrenda , "Pratik R. Sampat" , Kai Huang , Eric Auger , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Jim Mattson Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Walk the guest page tables via a loop when searching for a PTE, instead of using unique variables for each level of the page tables. This simplifies the code and makes it easier to support 5-level paging in the future. Signed-off-by: Jim Mattson --- .../testing/selftests/kvm/lib/x86/processor.c | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testin= g/selftests/kvm/lib/x86/processor.c index 0238e674709d..433365c8196d 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -270,7 +270,8 @@ static bool vm_is_target_pte(uint64_t *pte, int *level,= int current_level) uint64_t *__vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr, int *level) { - uint64_t *pml4e, *pdpe, *pde; + uint64_t *pte =3D &vm->pgd; + int current_level; =20 TEST_ASSERT(!vm->arch.is_pt_protected, "Walking page tables of protected guests is impossible"); @@ -291,19 +292,13 @@ uint64_t *__vm_get_page_table_entry(struct kvm_vm *vm= , uint64_t vaddr, TEST_ASSERT(vaddr =3D=3D (((int64_t)vaddr << 16) >> 16), "Canonical check failed. The virtual address is invalid."); =20 - pml4e =3D virt_get_pte(vm, &vm->pgd, vaddr, PG_LEVEL_512G); - if (vm_is_target_pte(pml4e, level, PG_LEVEL_512G)) - return pml4e; - - pdpe =3D virt_get_pte(vm, pml4e, vaddr, PG_LEVEL_1G); - if (vm_is_target_pte(pdpe, level, PG_LEVEL_1G)) - return pdpe; - - pde =3D virt_get_pte(vm, pdpe, vaddr, PG_LEVEL_2M); - if (vm_is_target_pte(pde, level, PG_LEVEL_2M)) - return pde; + for (current_level =3D vm->pgtable_levels; current_level > 0; current_lev= el--) { + pte =3D virt_get_pte(vm, pte, vaddr, current_level); + if (vm_is_target_pte(pte, level, current_level)) + return pte; + } =20 - return virt_get_pte(vm, pde, vaddr, PG_LEVEL_4K); + return pte; } =20 uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr) --=20 2.51.0.470.ga7dc726c21-goog