From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 9150B11CAF for ; Wed, 10 Jun 2026 12:47:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781095665; cv=none; b=D9dhBqxcZJRq2BEyiiJunQ2iafil1s/zvKckJOObdn4LTWwCgyxOgj9frmSi9EbdMYFUA8JUs1YYLhoJ/4d2rDiLw3dts3ZHGgvugndEPwp24jmiIC9IncvgJS5CYXSce2uoYJzsGPvT0qlF42EqSPDeHC3ymPb+pP6ot8iq4qc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781095665; c=relaxed/simple; bh=Bk7J3mLs3N7bfIUBu+nSVFQaHOBl7tueImnj0PHHNt0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nRkSYq+VV0/RGXLMcex+8t3H2IjatBh1rMQmH4if2bSAZs1WrJco1bW0Yg5mka3EdJYaVYMXBB6LHX53/XVZZpf8p1Y3Evzy9Au1COpMJSWr9MwWvHQC3ngMm+WVeYqP9lQYsohGe4XBZC/RaS3qthAVLo5HhrXvzDH1WMlA8A8= 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=BGCGa5Ub; arc=none smtp.client-ip=209.85.216.53 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="BGCGa5Ub" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-36d630c0e35so7247945a91.3 for ; Wed, 10 Jun 2026 05:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781095664; x=1781700464; 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=t1g5wHVLikCWLgdTTQWpgtkBPvcVl9HkkR1GjckPL4Q=; b=BGCGa5UbRlkMLk2ILiLpYR6JxRMHolkBQdH0NUlbFgnjDr/hmpoburpog5a6RgGOLy CVTe1XL7fudDafXfvtaNd2iHMVYcS7RHq+bed/SKPCHhdhpS9KvUm2FKOsKQQVb1LiY+ fLQfEQ9bWbKHpSMIf847ZAFrJ3Gg5/rTXWjP7YGYcXTJGr8qf4O7GaRpRxtjaGLPsXGQ 4hJOENYPsMRoMmrikkJ84OhChvnCRZP7vm23YHdHCNpbDJJGAuIks3VrSOZy5esxP+qE 7uQ44xwhEPe6d6e8xOucRMxfoS45I3KIECnRb9+C7RKKBbEq87af5C8lrljZ9aQ1hAYy C+aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781095664; x=1781700464; 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=t1g5wHVLikCWLgdTTQWpgtkBPvcVl9HkkR1GjckPL4Q=; b=haanf5XopdXTQSWAurr8LxI/4V/ewPc4CL5mF6VS9VlK/Mb5Y78XN+y8wI3iPLDCOi NxJRLgkgVF71gl+7ydmGB3sZBQImbN8Qes5Q12hO1zikoq/d1Ky0W6JVdAIP1Pr/VSOa P+2+YY/s8rzS4vAwVk+H0g2jzOTVfficEI18vAgYX/4f5Or81qTr+L59lRmAMPR6XYoL zYaalHs5dHQsJYstXofYwE3f7M7bpCPM0srySWzzJJrckV6ouX0EdCUq73vuKIoJ3FGJ F91mkq0MyoBOUFQzs9DDWwbujzClNpbhi6a5e7lOi89zM1K4stislmY2SzVs+hKYO/JC hlqQ== X-Forwarded-Encrypted: i=1; AFNElJ9FvJq54xnAbeXggCwSL8dSq7uQoR2x1zuYPxgx3onX8ZOhMsf3e5UaGBzsbFUpQpRwA/GZdt6DEYGghCU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyam5xbRxmPVvcXgD/17uQIoEflA9pdVbXQbBByAnG1BjBC38Sk uN+EmB0+EwsSzB2G2p30CFNBPHQPgYkgrHLJkIJPLZf3zEjA2VAbpJmT X-Gm-Gg: Acq92OE1oUQpnJ24al5YEGFjPMTQ/QBIvURAdtYbG7BAgEUpoUEl8oG7w1neoXGBS9z oIG75Osmd+7OtB9ndgsypMWdtw7WgWjCL3PvHsCCcO/AD0lHYenQr+RXQRhDeLnouASJpp4ASlb cqII8lrJQz36c3AkGbDM0TwB1l9bY4sw0wQvVfaX00MKFW2B/BSqKPT7ie+miNZsGMMbHvz5Wa+ F0gib9A8bIywHoximsSOSxYkk38h5yAEEzw68mTmQ3aSGBuot3PwE8SnICerK1CGRNDIDS/mtcE /E2sNubWJ8Lp5Xx4m/C6We+J6NMt+dQV/MzReYPIBERtPWtb6MlchCoOwfM3uf3/oJ/zNazgLeI B6C9oZzLD1FdqP4Q3bniEq17CWHB1GwPd+lqt05dDU5cJx6Px8oth7Zht7dE1hZ1Mj/zZ6H0CkQ agrc2aotRiwnCAV+jsTnzhueqUJrHPdtEC6gjkVpEN7nhNUamYhxHugE39Sjuzew== X-Received: by 2002:a17:90b:3d44:b0:368:7c0f:ebf7 with SMTP id 98e67ed59e1d1-370f0095b8amr26453338a91.16.1781095663927; Wed, 10 Jun 2026 05:47:43 -0700 (PDT) Received: from localhost.localdomain ([171.76.83.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37624b83589sm3783554a91.16.2026.06.10.05.47.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 10 Jun 2026 05:47:43 -0700 (PDT) From: "Ritesh Harjani (IBM)" To: kvm@vger.kernel.org, Paolo Bonzini Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Michael Ellerman , Christophe Leroy , Anushree Mathur , Venkat Rao Bagalkote , Harsh Prateek Bora , Sean Christopherson , Ackerley Tng , Christian Borntraeger , Claudio Imbrenda , Nicholas Piggin , "Ritesh Harjani (IBM)" Subject: [PATCH v3 RESEND 01/10] KVM: selftests: Move pgd_created check into virt_pgd_alloc Date: Wed, 10 Jun 2026 18:17:17 +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.50.1 (Apple Git-155)