From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 73E563FF1AD for ; Fri, 15 May 2026 16:04:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861082; cv=none; b=MBsDoaFuVg7zZEOjwkfVo0OkdmosZhbogb6zD80VXXv7kmZ45BCoZME42XeqGv2dfDV1jTnCMCqGyMAh2gYgsEwMJ3plHXs4XRnYAfxvNNl3zuEcx2w33NN3wx4/l6f6WH5CEjNYkVy48pbq2Mj7M9iluL3f01X3c7yd87O9yiU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861082; c=relaxed/simple; bh=QGrJLUpisUTTqdsMw2pU1CxH7bvU3JfOjYaQtOBJWYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MlYM8yw5XUz9hNua3SQYMmgD2fjWnl76pacweugKqqJGuLeq4oSSQvRYli6Pwqjy8y0IvvwEYt8uGVFNmiI1aPtmlB0zzZhfWdZlv3A5E9SCp1yFbmyRalMoiyQlqA2Bcli+3n4gtalgKfB5k9XpelSu4eRO1aZytcYjEyTyvU4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BeY4dypM; arc=none smtp.client-ip=209.85.210.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BeY4dypM" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-82fbdd60b64so7029536b3a.3 for ; Fri, 15 May 2026 09:04:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778861081; x=1779465881; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tHtM3hln5E0LtkuEKr9m/vG1aJYWfiEmMpXBjaFCM6o=; b=BeY4dypMd8T0Xp+MWXDl2u8spJrzHJFF0B0cb+YnsbnAkmsj6NahyqiGH46AIW7JAL cQlJNm1on6Db5E3gxBQGf5BaviIPdB2f9gMC5hBHCRtphq9gw7A8gZ8oYEnJPjGpscHU OZOvBBWLGbCTTC+pFPFndM7dj8MvrCuN7v9GNbdjtNqkfnEOzMOV7mP5IDVPWinzIXEa b1WL45A0vM8tcHy1gdbVV7nPhTUUaeDvaEWp9qd0pqoahxgAjEAdikur0h20ZB4BJGu/ cDkFbdxKV3hM3vl16neAptGTFrMyM4KwdOo0Wu7RpHLQ/PIvCvdUhIscfc3OPiJ3iHYW +5og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778861081; x=1779465881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tHtM3hln5E0LtkuEKr9m/vG1aJYWfiEmMpXBjaFCM6o=; b=lH0CuxZs8D0mnNM0uLNvtCipRaTPAqyvwoNV702dIbLK/Pk8rhFefjlHlOegGzSVWn 5kJjCFZAmcdyLlbb37h2SQDgVBHYrz2V5doKt4q9svvHvzMa+zjimUWGcc2yG0x0U1Gg rEcpG+cxlX/+feJ3OZ4SOu78G1y2CzOo3wItJ36k8ffKoq0cEYUGWWvPs+OQYTOgba0b WtR9Z+xbM9grXgWXeA7JkXRTbbfnvm5NzJvcUt0wHrZWRvrrALN0ecPB5UvPu/zNmU+R N9lYC8BX8oD1B7t+5gegl4gZ+kF5GxRNkQ9vSE94fx/c3cgUeLYYqBIiGy/AaGTh98DP cADQ== X-Forwarded-Encrypted: i=1; AFNElJ/kystEu2SjhzcXNyf2jog7V2juaQi6FsApoVD/Z45PkbDiHnuEAAzGE7XY0OMSxDiH2ADln/+ZG0jSfAE=@vger.kernel.org X-Gm-Message-State: AOJu0YwohJrRIwIt9IkQJEqPxw9Q/jl1QnTHucV+Ch8Fs8DDHhLZRPSW M1tNzz1XFcqZwT66w7x51kOqQmSewrkhxzLr47oAzUFUuyrluPnVcaRj X-Gm-Gg: Acq92OGOW6NS3hEMq544C67EskKDsTNlsCPo4g1oTOsds4P2sMy+950NTh0rZBvOpfJ L8HfoazypM5zZMte5VkB6GtzVBo2IwJSzMLItu4yfG6Pg2aB2tadBPMpdyMLBZl7WVjY6cSll/S AspyN5N/PqwcQSHxpCFYuQ+fjuuG1o5QyKoIVhAPGquTywxuz73bomG21nlFnRswVfWR0xblr2d yW5BS3AKIpas2xiTaAkgofHDxCP6kFb5Ziw7bpawy9xMSOamzMRQkNwHQEy72sSjMFjdafxz0sp g4mTucI9ZfewgtbH2gpw11El9/0+0OxaF0MpheHobUMvaDvs6lyBwnVOo/GN8wPFTvOGUwL1q9C Yt/rXBcRBrgIQRHMvU0H7jgCR/cpU9RrajBWHR48mf9kB9MMqzaF/7kIpGEBKoq7LlQonQABCwh mFGBVl48fp+UWeg2egYQqYv8OigOdHK5QRUNHQL2bHdcky6dzNjnc60V0O9g5G2Zguuyp6l4nJX w== X-Received: by 2002:a05:6a00:391e:b0:82f:623f:e5b3 with SMTP id d2e1a72fcca58-83f33de9717mr5676947b3a.34.1778861080622; Fri, 15 May 2026 09:04:40 -0700 (PDT) Received: from localhost.localdomain ([171.76.86.174]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f19c7c74fsm7920262b3a.49.2026.05.15.09.04.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 09:04:39 -0700 (PDT) From: "Ritesh Harjani (IBM)" To: kvm@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org, Madhavan Srinivasan , Harsh Prateek Bora , Christophe Leroy , Venkat Rao Bagalkote , Nicholas Piggin , linux-kernel@vger.kernel.org, "Ritesh Harjani (IBM)" Subject: [RFC 1/4] KVM: selftests: Move pgd_created check into virt_pgd_alloc Date: Fri, 15 May 2026 21:34:20 +0530 Message-ID: <6e6aea750fb80d4d28dbba97c45f498f2ec06a68.1778857539.git.ritesh.list@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Nicholas Piggin virt_arch_pgd_alloc all do the same test and set of pgd_created. Move this into common code. Signed-off-by: Nicholas Piggin [Rebased to latest mainline tree] Signed-off-by: Ritesh Harjani (IBM) --- tools/testing/selftests/kvm/include/kvm_util.h | 5 +++++ tools/testing/selftests/kvm/lib/arm64/processor.c | 4 ---- tools/testing/selftests/kvm/lib/loongarch/processor.c | 4 ---- tools/testing/selftests/kvm/lib/riscv/processor.c | 4 ---- tools/testing/selftests/kvm/lib/s390/processor.c | 4 ---- tools/testing/selftests/kvm/lib/x86/processor.c | 9 +++------ 6 files changed, 8 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 2ecaaa0e9965..3666a8530f31 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -1197,7 +1197,12 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm); static inline void virt_pgd_alloc(struct kvm_vm *vm) { + if (vm->mmu.pgd_created) + return; + virt_arch_pgd_alloc(vm); + + vm->mmu.pgd_created = true; } /* diff --git a/tools/testing/selftests/kvm/lib/arm64/processor.c b/tools/testing/selftests/kvm/lib/arm64/processor.c index 01325bf4d36f..498fbcb0ea16 100644 --- a/tools/testing/selftests/kvm/lib/arm64/processor.c +++ b/tools/testing/selftests/kvm/lib/arm64/processor.c @@ -112,13 +112,9 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm) { size_t nr_pages = vm_page_align(vm, ptrs_per_pgd(vm) * 8) / vm->page_size; - if (vm->mmu.pgd_created) - return; - vm->mmu.pgd = vm_phy_pages_alloc(vm, nr_pages, KVM_GUEST_PAGE_TABLE_MIN_PADDR, vm->memslots[MEM_REGION_PT]); - vm->mmu.pgd_created = true; } static void _virt_pg_map(struct kvm_vm *vm, gva_t gva, gpa_t gpa, diff --git a/tools/testing/selftests/kvm/lib/loongarch/processor.c b/tools/testing/selftests/kvm/lib/loongarch/processor.c index 64d91fb76522..207055db5f5d 100644 --- a/tools/testing/selftests/kvm/lib/loongarch/processor.c +++ b/tools/testing/selftests/kvm/lib/loongarch/processor.c @@ -51,9 +51,6 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm) int i; gpa_t child, table; - if (vm->mmu.pgd_created) - return; - child = table = 0; for (i = 0; i < vm->mmu.pgtable_levels; i++) { invalid_pgtable[i] = child; @@ -64,7 +61,6 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm) child = table; } vm->mmu.pgd = table; - vm->mmu.pgd_created = true; } static int virt_pte_none(u64 *ptep, int level) diff --git a/tools/testing/selftests/kvm/lib/riscv/processor.c b/tools/testing/selftests/kvm/lib/riscv/processor.c index ded5429f3448..75a5d4c46001 100644 --- a/tools/testing/selftests/kvm/lib/riscv/processor.c +++ b/tools/testing/selftests/kvm/lib/riscv/processor.c @@ -66,13 +66,9 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm) { size_t nr_pages = vm_page_align(vm, ptrs_per_pte(vm) * 8) / vm->page_size; - if (vm->mmu.pgd_created) - return; - vm->mmu.pgd = vm_phy_pages_alloc(vm, nr_pages, KVM_GUEST_PAGE_TABLE_MIN_PADDR, vm->memslots[MEM_REGION_PT]); - vm->mmu.pgd_created = true; } void virt_arch_pg_map(struct kvm_vm *vm, gva_t gva, gpa_t gpa) diff --git a/tools/testing/selftests/kvm/lib/s390/processor.c b/tools/testing/selftests/kvm/lib/s390/processor.c index a9adb3782b35..342b7c92463e 100644 --- a/tools/testing/selftests/kvm/lib/s390/processor.c +++ b/tools/testing/selftests/kvm/lib/s390/processor.c @@ -17,16 +17,12 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm) TEST_ASSERT(vm->page_size == PAGE_SIZE, "Unsupported page size: 0x%x", vm->page_size); - if (vm->mmu.pgd_created) - return; - gpa = vm_phy_pages_alloc(vm, PAGES_PER_REGION, KVM_GUEST_PAGE_TABLE_MIN_PADDR, vm->memslots[MEM_REGION_PT]); memset(addr_gpa2hva(vm, gpa), 0xff, PAGES_PER_REGION * vm->page_size); vm->mmu.pgd = gpa; - vm->mmu.pgd_created = true; } /* diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c index b51467d70f6e..e420afdfbcfb 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -164,12 +164,9 @@ bool kvm_is_tdp_enabled(void) static void virt_mmu_init(struct kvm_vm *vm, struct kvm_mmu *mmu, struct pte_masks *pte_masks) { - /* If needed, create the top-level page table. */ - if (!mmu->pgd_created) { - mmu->pgd = vm_alloc_page_table(vm); - mmu->pgd_created = true; - mmu->arch.pte_masks = *pte_masks; - } + /* Create the top-level page table. */ + mmu->pgd = vm_alloc_page_table(vm); + mmu->arch.pte_masks = *pte_masks; TEST_ASSERT(mmu->pgtable_levels == 4 || mmu->pgtable_levels == 5, "Selftests MMU only supports 4-level and 5-level paging, not %u-level paging", -- 2.39.5