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 4CE5733F58A for ; Sat, 23 May 2026 11:14:54 +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=1779534895; cv=none; b=YnBqyUytTC2qv48TQQv9RIf8TCeJNx7SPZzZADwCAkNCWGZwebz2CvIERNrHZ5t86vFZQn8ekgHyo3n6WSuBgXcARnqGzdPAC5F371RVDIX1Wt9yzTLyvqsEA430cXu0i2vQVWvwkBbl969T+0NSLq+hp+uu3A3FqkpGpblmSSQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779534895; c=relaxed/simple; bh=O0Dzr9y6cFVg8qYMI2oqsWYDxzwPFiV1IZwYIsniE4Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rsZVz7dQaYAiXRlLzNljp8rqunihfBbywmkOJ9+HyvG/pF/qYfi2YlBTtEEiDgX99ALYuFWKjgCsoWsHrhR5VXwIYEvy1T7eSoGwKWCzKksN6VngP6XGvn8tlgkkenx0kCI+F+SOB/Ts5PAgEix4/7X/NNg1eEdziICYdGzTj8Y= 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=dCKVdMSk; 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="dCKVdMSk" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-835c98b659eso6937985b3a.0 for ; Sat, 23 May 2026 04:14:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779534893; x=1780139693; 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=oMG8EtROF9Cg3C7hjmtqqGx+u6sXMBdHtk9UvMaumUw=; b=dCKVdMSk7dxwUeBz7HstIJ86CerA0/tX+YyCNWN415jO0+kD3XKVUcbLkd8mOEWP7B +z0EdDzT4RgrflHlKjyIGAW6mcMEyHc6N0iTIVvhCgqrgpzzCGsNkX2tmvXv22qivhuA NyEYM0tZb+AOENToTXwBDWQ/pDsYM+pNoolWf3Fg2N9P6LWjWNc1sn/BzP2P3O5K1PiQ SHbZMpklXXHvP/k5C/jhoulFQzgJx/WPSxxpVC59inLgrzrTi2wEkAkmgcNpxLgaD+lN 0Z/agdnKx3E4Ylzuh1SzUKEz1ELsK7sYNSA2CUwlMahzW1pPwXHC5souhNyDWSKgmsdJ ed4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779534893; x=1780139693; 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=oMG8EtROF9Cg3C7hjmtqqGx+u6sXMBdHtk9UvMaumUw=; b=Kq1W7PeGELImKh4dWT0Ceh8Ek10P4yBaY7tOVJZMxzop7W4PwLyDjA2hGah+nZI+OB 4MhUUs0c2LLkxUtacAvB1oJ/MBqQB9ssN0oXbDIhlpW8OlsKE+PcTShr5qzAjNqlHAQU F25xB6yO9R9Wdtle3jQ6To18sr9UPJDK/eHJMTj4Cqvlzt3jzGQiZmkS0wW8ZkBV3MbQ cC//vcL/EfEBCA6oUPn6oTZbk6xa2YYV6o8nQZUGD43Ro5U8lZ+KyEi9uyC58rdSoi0W 5MoKwSVAmn7S6t1GGel9DS3HjbPPh8f90s5Sq2X2lfK0XpmYeAAhTuQT/PWWinudG5Gu LDOQ== X-Forwarded-Encrypted: i=1; AFNElJ8PKpSgtVld1LbGx2R1r67wxHSDFnebibpJ1cO0kg9a0oafTmx29zYDMbKwc3/UFpeDwnD/3NZbjxYhu78=@vger.kernel.org X-Gm-Message-State: AOJu0YxRrjPIP6EMjgDUAdWInF0TyyGOcmxgcPTinvRcp2s1j7AB0mtn fQ2yY4PGqj27Q9S8qziAg7i//VvFngnPSZuBsaMEkytdR9+j/m2TVhzI X-Gm-Gg: Acq92OGJM3GfoGVpGBg3KCIfaI7OCFD3zk+s/J2qLOUzJC8hHgc0um2nkQYyTuM6Be/ jDaob9iayD2NyHt8var2U3LnGGYt/Fm8RvmK1b+hXNd1r0c3IKGrGbLaG7hjkSu1eXB+DB/RqxH 8WA5q2dlCHJN6fFfI7Gx/EI6jsAlpu+bO67MAktUFmADanke68UzEETLXXQvKU6eQdFA9UaVdcK iCQdgRaQ2MZgEKuIwNVga09wEw7SOJ35j5kZranoK9cEe+l20JUdESge8mZLEBtlrN1jhmXWnW4 1hXv+zpFlpJPZ07GLcVi5t5VfSp3Ne53sOXDlRGX4RMcThWrnGWvQmeL27cPEbzTOMBcUcdFhj5 NJkE7f1Ug3Ydq3zXxdEeWsgJ908gdEklf37M0YicwLNX0KBvQ6a7FTBL35/8lnJsNuEF9Vuj55t O46v6Jslv5Y89rKOn9VRZyBy46XAbifB1uvVmWjYE= X-Received: by 2002:a05:6a00:94fc:b0:82c:6683:b866 with SMTP id d2e1a72fcca58-8415f121b9bmr7424451b3a.4.1779534893432; Sat, 23 May 2026 04:14:53 -0700 (PDT) Received: from Mac.ibm.com ([49.205.216.49]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84164ac9c77sm5249140b3a.2.2026.05.23.04.14.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 23 May 2026 04:14:52 -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 , Misbah Anjum N , Anushree Mathur , Michael Ellerman , linux-kernel@vger.kernel.org, "Ritesh Harjani (IBM)" Subject: [RFC v2 1/5] KVM: selftests: Move pgd_created check into virt_pgd_alloc Date: Sat, 23 May 2026 16:44:20 +0530 Message-ID: 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 pgd_created. Move this into common code - except for x86's virt_arch_pgd_alloc() -> virt_mmu_init() - because this can also be called from it's tdp_mmu_init() call for setting up it's stage-2 mmu. Signed-off-by: Nicholas Piggin [Rebased to latest mainline tree and removed x86 case] 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 ---- 5 files changed, 5 insertions(+), 16 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; } /* -- 2.39.5