From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 ACCD2407CFF for ; Wed, 10 Jun 2026 12:48:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781095717; cv=none; b=nOo0TQX5kNlsZhZ2iWlv8yuxTk6y99EYnZaeMKmgM/ezeKcOgkH+ppfQ5GL0HET6HdCLBWWTVy/io3Ea/8URkrOv4Nkzgr4GM4jvsBz7BfkBRn5msE3W9Ykd6F3pP9DgCriK2EkX6ObypRC4dqwAFPqq50wtCY3hkw2BlI5ItNY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781095717; c=relaxed/simple; bh=7wV4425Ik6VmbZw8mS9ERhskIFF8KLOKmoKc5i15TOc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OFGzSKGeWRsPWuPF4IVE3uVcAPor1ZaiIxZzTqeHuWX4ln5Y+Q4iPS3f4GkZ+iN+GOCFkz5by/AkYD7Ult7i/VMgvuPcAU+SCApPmTpZWflFtUBKKfkwXmilsGgh7nhFv/jjkXIcLxR6J6x96tAinv7bWeF38weswADg7fGb33I= 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=UZ3ueX5g; arc=none smtp.client-ip=209.85.216.49 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="UZ3ueX5g" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-36d5b11201aso4290839a91.2 for ; Wed, 10 Jun 2026 05:48:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781095716; x=1781700516; 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=z9BiimjFi0aXMRD8saAolcJy9dKWyzjah+ENtioga50=; b=UZ3ueX5g1tECmiQTekl63YG4uxnbaZ5Ruja4oBxSC/TyyT9mu0AEIvsnWzSFtm0kVu r4z7Q/N416FOxEo7DOUpm1q84P9vJp+xoH6mNSCPC+1B1mLTFtA327bAel7Wt//F6iXD KiAn5kZeRZbexUauobIXQsF1pfPDx+z7lUSFL72a5ZdRJgCWeLDo98vwuNLRFdBtKhjl 2olNXw769sv1uutWsUTR8e8prLaYHBVqgzNTUiRrsh/TMJaWliR/ee4xpRk9ARMLFjnY XB9QTrso/RsR+qlbRrmLcvvMagnbimnHoiv3q/MBduL1cRvYEn7GYhLXs5X2H3v4jCqv rX2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781095716; x=1781700516; 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=z9BiimjFi0aXMRD8saAolcJy9dKWyzjah+ENtioga50=; b=bxmZr8qYZ4oS2lmzrzYuSqnobkxpyHu3d0d/LrDxtUtaTLFm8DBCa5f3ISEUdOfTkU qzMktc/WRn8CyMt/096rPAbC6TyOfBJP4uOfgn8D/+APi1TFeeRWR5AtZpTGP7GgLvwY 1zDtITURMu76/nd1rtT+xGtxwqCSdQCG8X5ZE8KE8DMaR+TTYCc6cMgmImicgtP9nl3s 12O30j4JWzt1mYzLK0rHyE9Nqjq1JV16My4kv0drXChOrpR8TPLozaN1ep0dpumNj5CD Lmuv42JGviPLz8c8NYOn7K/1EYM081zfBQTwY87WYexpCB4GqKj4+BAiZx2g0tVGdV8O q/Mw== X-Forwarded-Encrypted: i=1; AFNElJ9wNVw7p+qd8RBIUOKplc4kRNvpxajt/M2aZGSnzBeGWfmTjl/miXZi0DCLilfjPD0vOPSm0/L/P8kjVkA=@vger.kernel.org X-Gm-Message-State: AOJu0YzJACccKnDJZNoktqBtgIGDNAvTgJ5bdpprtvW1wUj7Foea9IeO F+FRXp2UBRXkRDL63bIs6Iaq5/TcF/I+zP7664SA4GZP7YyzLZKOVil4 X-Gm-Gg: Acq92OEgy3ZcMvGgGKLBTl0J96J3qrMEZKlKujFEHy7RwVR4PX5FCriD1iURWEe9Z1f Yt6aaammnyb7jBxLtFr338c4FweVCSqaeNkDcEVN1UYyFQT8ePo2RJKMCXqaomKhNSJ1DbjDVmX wjkOs6dExbrMbipa6M0BKw/ZtAu7+SxA9t9bh9F1nIWwoVKNb04wKbAjIYWs0nSwEF6f6zLwC78 GTmCWMd1kmP9LTNzVkRB7idlobrEPDErAF+wqx9+v6es6DC1VmDBnyp1elxBGMrCoOZBRnyH9Xl DPuwdeYLwq2w9eBaJuASWvrfYY8/Y/TanuBRxGz4n9P3+pkQo3U84/cAKaUM+SndoN2JKfWM9+j PHaNLBCGMrvR14LpD/PdQa55sOghNx2zMgAxxAOzs68bGcfVoSgB9fZwYjlLc7FWoBN2+dyFmrm NRjIwoMaBN7K0qPkVjZiC8J9hj2CwHBmG9aJBE/+fskMmI/pO1HiD6qsVHArTEyYfptler8o/J X-Received: by 2002:a17:90b:1350:b0:366:4782:1379 with SMTP id 98e67ed59e1d1-370f0f459d1mr26153514a91.24.1781095716002; Wed, 10 Jun 2026 05:48:36 -0700 (PDT) Received: from localhost.localdomain ([171.76.83.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-37624b83589sm3783554a91.16.2026.06.10.05.48.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 10 Jun 2026 05:48:35 -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 , "Ritesh Harjani (IBM)" Subject: [PATCH v3 RESEND 10/10] KVM: PPC: selftests: Replace u64 gpa, u64 gva|vaddr with gpa_t and gva_t Date: Wed, 10 Jun 2026 18:17:26 +0530 Message-ID: <2acdd4984130cc5b66ab6cdbdb8bdfee193838c2.1781093720.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 commit df079910f9814 ("KVM: selftests: Replace "u64 gpa" with "gpa_t" throughout") commit 014dfb7b9bf3f ("KVM: selftests: Replace "vaddr" with "gva" throughout") Similar to above 2 commits, this patch makes the relevant changes to powerpc kvm selftests code to make use of gpa_t and gva_t types instead of u64 throughout the code. No functional change intended. Signed-off-by: Ritesh Harjani (IBM) --- .../selftests/kvm/include/powerpc/processor.h | 3 ++- .../selftests/kvm/lib/powerpc/processor.c | 20 +++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/kvm/include/powerpc/processor.h b/tools/testing/selftests/kvm/include/powerpc/processor.h index 95ec3debc83c..f0ee21a8e2d4 100644 --- a/tools/testing/selftests/kvm/include/powerpc/processor.h +++ b/tools/testing/selftests/kvm/include/powerpc/processor.h @@ -7,6 +7,7 @@ #include #include "ppc_asm.h" +#include "kvm_util_types.h" extern unsigned char __interrupts_start[]; extern unsigned char __interrupts_end[]; @@ -24,7 +25,7 @@ struct ex_regs { u64 xer; u32 cr; u32 trap; - u64 vaddr; /* vaddr of this struct */ + gva_t gva; /* gva of this struct */ }; void vm_install_exception_handler(struct kvm_vm *vm, int vector, diff --git a/tools/testing/selftests/kvm/lib/powerpc/processor.c b/tools/testing/selftests/kvm/lib/powerpc/processor.c index 2c1e95c8aa9c..009a0859ba05 100644 --- a/tools/testing/selftests/kvm/lib/powerpc/processor.c +++ b/tools/testing/selftests/kvm/lib/powerpc/processor.c @@ -97,17 +97,17 @@ static u64 pt_entry_coverage(struct kvm_vm *vm, int level) return size; } -static int pt_idx(struct kvm_vm *vm, u64 vaddr, int level, u64 *nls) +static int pt_idx(struct kvm_vm *vm, gva_t gva, int level, u64 *nls) { switch (level) { case 1: if (nls) *nls = 0x9; - return (vaddr >> 39) & 0x1fff; + return (gva >> 39) & 0x1fff; case 2: if (nls) *nls = 0x9; - return (vaddr >> 30) & 0x1ff; + return (gva >> 30) & 0x1ff; case 3: if (vm->mode == VM_MODE_P52V52_4K) { if (nls) @@ -116,12 +116,12 @@ static int pt_idx(struct kvm_vm *vm, u64 vaddr, int level, u64 *nls) if (nls) *nls = 0x5; } - return (vaddr >> 21) & 0x1ff; + return (gva >> 21) & 0x1ff; case 4: if (vm->mode == VM_MODE_P52V52_4K) - return (vaddr >> 12) & 0x1ff; + return (gva >> 12) & 0x1ff; else /* vm->mode == VM_MODE_P52V52_64K */ - return (vaddr >> 16) & 0x1f; + return (gva >> 16) & 0x1f; default: TEST_ASSERT(false, "Invalid page table level %d\n", level); return 0; @@ -129,9 +129,9 @@ static int pt_idx(struct kvm_vm *vm, u64 vaddr, int level, u64 *nls) } static u64 *virt_get_pte(struct kvm_vm *vm, gpa_t pt, - u64 vaddr, int level, u64 *nls) + gva_t gva, int level, u64 *nls) { - int idx = pt_idx(vm, vaddr, level, nls); + int idx = pt_idx(vm, gva, level, nls); u64 *ptep = addr_gpa2hva(vm, pt + idx * 8); return ptep; @@ -189,7 +189,7 @@ static gpa_t __vm_alloc_pt(struct kvm_vm *vm, u64 pt_shift) return pt; } -void virt_arch_pg_map(struct kvm_vm *vm, u64 gva, u64 gpa) +void virt_arch_pg_map(struct kvm_vm *vm, gva_t gva, gpa_t gpa) { gpa_t pt = vm->mmu.pgd; u64 *ptep, pte; @@ -331,7 +331,7 @@ struct kvm_vcpu *vm_arch_vcpu_add(struct kvm_vm *vm, u32 vcpu_id) MEM_REGION_DATA); ex_regs_paddr = addr_gva2gpa(vm, ex_regs_vaddr); ex_regs = addr_gpa2hva(vm, ex_regs_paddr); - ex_regs->vaddr = ex_regs_vaddr; + ex_regs->gva = ex_regs_vaddr; vcpu = __vm_vcpu_add(vm, vcpu_id); -- 2.50.1 (Apple Git-155)