From nobody Thu Oct 2 11:57:49 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 F3AD82F746A for ; Wed, 17 Sep 2025 21:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758145873; cv=none; b=gTd8rLa503hY2oVliQnty1BoSJ+mpLiI65lQzcuI74jioJCKFjyBWj0TkO176VGHSs6GGsDI58tnCS0w9PDpT1JmT0s7E3noEBGI7iPvXRB4GK65FGDLJiSrst0lhCDakAngpxyI0fOVr1rtFhkBC8o5a9DF/pBH58ToU2yQur0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758145873; c=relaxed/simple; bh=LqGmDErC+0rvfwTlCCv3MATKWOoGiTAPnRm7qx/uRIQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jRh78uGn8AtNey8aj5boQvV1OpGuJx92//dUDqhbnGySj87HkC+sbjYwbZ4V0OFwpr5JWor1ph1isxYaMnCGjgTI+d/c/bbUxGgLjOi1DLQjvkecGofTBFVgBbWO/shQ6LW1Lpr8Q3lixVG5FOVA82IWeiMZXQH18ZOz8RNFMD4= 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=mOuBjO3u; arc=none smtp.client-ip=209.85.210.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--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="mOuBjO3u" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-777d7c52cc3so465535b3a.2 for ; Wed, 17 Sep 2025 14:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758145871; x=1758750671; 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=raX33s8++blO4FFDhhuZ1t5E6VYJ8jLOCEs3GGXrhy4=; b=mOuBjO3uNlzXGe83rw/7pDmuO2CChgbdyCz8NaqLayWeQBsCc/WyAtoOp+hEnVxGGn ulWLdl4GcNKz/6OZFFm2HpXm6Otxs3x+F05aVKYQ6EA17QKROAjkasrAugUgJ5s0dFf2 Yi/b1PokCjFLfClg0NQRStVxg+9HW2IcUxnQ006I8aEWVC5JmHyjYFeRjUDgLyyxO25n PeJnDri2Aa4mM9iRS4DClZ9WuYDatCnwwyNMgofRmCsYmxuEcGOcPmuiqWIlutv0DLQ7 NPps1KlamvGCSEsipKclnxUn0ZuexsYe87NVwDXWKuHNz2VZ4RP7CypzpvxaVbM3Ak6J H/JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758145871; x=1758750671; 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=raX33s8++blO4FFDhhuZ1t5E6VYJ8jLOCEs3GGXrhy4=; b=GDTUyV+LulX+5X48FE76a69GbVbRcThiDZFw98s8a9+Izyof3g590QhdOvolWYxSJU WriLCGh3Z17rW6lEec0SIVFRK+DnJhqBj2QgByC3I7Wcl7eT3fYVhvzCc3MmrRsziQaf gE3A4C7BKbQ98tKZrNyVYDBWnS4ES6xb1JoeZf97XpXcxhqc6LoegmtWjzW5FTKyAmPI rcRpplXFGHX+6WJVL5BOKmNZRR+JKn3gDCznPxWAGvJEM2WJHRBqXXAEH1rImLaIrDob Cmqn728wbkx82w8s+sLkcY3mcZMJ69hiuGwx/EOu3/2VS5CLg2thuhoAZxyDFEmEYs7O 7tzw== X-Forwarded-Encrypted: i=1; AJvYcCXej4YO4QC/ldIAHBE/Ou6+7JFG2Qx6riLadqDLhlWgRbZ6pnUl8WkeeMVB+0MITUiKk4Ik5iqMCIgCPF8=@vger.kernel.org X-Gm-Message-State: AOJu0Yyrp/AmkIX3B/LEB4WEc1xdFnqr7OyX0gYl/JdUcoDiExs9YciI Sm08YHNii003P78NIyqn9cJEey2j5SF5ZnkOtKnKLVUgQA9h2nw9Fvqd3pviRgQqSY26p6kNexN /horVUqkGZ0J9CA== X-Google-Smtp-Source: AGHT+IEXHIfe31iHTiPUjWBrijjL9dOd26voZYrj2f7+bWGKHk6sS7I2FWWtoOYTdxUvPxMvYQxGk7MANH51Kg== X-Received: from pfaq4.prod.google.com ([2002:a05:6a00:a884:b0:772:32b1:58f9]) (user=jmattson job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:4328:b0:24e:2cee:9585 with SMTP id adf61e73a8af0-27aa99bdb8fmr5600927637.54.1758145871359; Wed, 17 Sep 2025 14:51:11 -0700 (PDT) Date: Wed, 17 Sep 2025 14:48:37 -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-2-jmattson@google.com> Subject: [PATCH 1/4] KVM: selftests: Use a loop to create 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 creating new mappings, 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 | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testin= g/selftests/kvm/lib/x86/processor.c index d4c19ac885a9..0238e674709d 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -184,8 +184,8 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *v= m, void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int = level) { const uint64_t pg_size =3D PG_LEVEL_SIZE(level); - uint64_t *pml4e, *pdpe, *pde; - uint64_t *pte; + uint64_t *pte =3D &vm->pgd; + int current_level; =20 TEST_ASSERT(vm->mode =3D=3D VM_MODE_PXXV48_4K, "Unknown or unsupported guest mode, mode: 0x%x", vm->mode); @@ -209,20 +209,14 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr,= uint64_t paddr, int level) * Allocate upper level page tables, if not already present. Return * early if a hugepage was created. */ - pml4e =3D virt_create_upper_pte(vm, &vm->pgd, vaddr, paddr, PG_LEVEL_512G= , level); - if (*pml4e & PTE_LARGE_MASK) - return; - - pdpe =3D virt_create_upper_pte(vm, pml4e, vaddr, paddr, PG_LEVEL_1G, leve= l); - if (*pdpe & PTE_LARGE_MASK) - return; - - pde =3D virt_create_upper_pte(vm, pdpe, vaddr, paddr, PG_LEVEL_2M, level); - if (*pde & PTE_LARGE_MASK) - return; + for (current_level =3D vm->pgtable_levels; current_level > 0; current_lev= el--) { + pte =3D virt_create_upper_pte(vm, pte, vaddr, paddr, current_level, leve= l); + if (*pte & PTE_LARGE_MASK) + return; + } =20 /* Fill in page table entry. */ - pte =3D virt_get_pte(vm, pde, vaddr, PG_LEVEL_4K); + pte =3D virt_get_pte(vm, pte, vaddr, PG_LEVEL_4K); TEST_ASSERT(!(*pte & PTE_PRESENT_MASK), "PTE already present for 4k page at vaddr: 0x%lx", vaddr); *pte =3D PTE_PRESENT_MASK | PTE_WRITABLE_MASK | (paddr & PHYSICAL_PAGE_MA= SK); --=20 2.51.0.470.ga7dc726c21-goog