{"id":2225352,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2225352/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-riscv/patch/20260420212004.3938325-18-seanjc@google.com/","project":{"id":70,"url":"http://patchwork.ozlabs.org/api/1.2/projects/70/?format=json","name":"Linux KVM RISC-V","link_name":"kvm-riscv","list_id":"kvm-riscv.lists.infradead.org","list_email":"kvm-riscv@lists.infradead.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"http://lists.infradead.org/pipermail/kvm-riscv/","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260420212004.3938325-18-seanjc@google.com>","list_archive_url":null,"date":"2026-04-20T21:20:02","name":"[v3,17/19] KVM: selftests: Replace \"u64 gpa\" with \"gpa_t\" throughout","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1ab9500bb59a11cff6e29b03178d75a61f7601ba","submitter":{"id":81022,"url":"http://patchwork.ozlabs.org/api/1.2/people/81022/?format=json","name":"Sean Christopherson","email":"seanjc@google.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/kvm-riscv/patch/20260420212004.3938325-18-seanjc@google.com/mbox/","series":[{"id":500685,"url":"http://patchwork.ozlabs.org/api/1.2/series/500685/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-riscv/list/?series=500685","date":"2026-04-20T21:19:45","name":"KVM: selftests: Use kernel-style integer and g[vp]a_t types","version":3,"mbox":"http://patchwork.ozlabs.org/series/500685/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225352/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225352/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=LZjHsKx1;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256\n header.s=casper.20170209 header.b=TUGUuiG1;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256\n header.s=20251104 header.b=Xk2Dgr2F;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fzz2510c7z1yCv\n\tfor ; Tue, 21 Apr 2026 07:21:33 +1000 (AEST)","from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wEw3e-00000007h7h-0tOV;\n\tMon, 20 Apr 2026 21:21:30 +0000","from casper.infradead.org ([2001:8b0:10b:1236::1])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wEw2y-00000007g9a-3xGH\n\tfor kvm-riscv@bombadil.infradead.org;\n\tMon, 20 Apr 2026 21:20:49 +0000","from mail-pf1-x44a.google.com ([2607:f8b0:4864:20::44a])\n\tby casper.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wEw2u-000000093Rb-1szu\n\tfor kvm-riscv@lists.infradead.org;\n\tMon, 20 Apr 2026 21:20:47 +0000","by mail-pf1-x44a.google.com with SMTP id\n d2e1a72fcca58-82f756ebd0dso2243659b3a.1\n for ;\n Mon, 20 Apr 2026 14:20:43 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help:\n\tList-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID\n\t:References:Mime-Version:In-Reply-To:Date:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=qABbapR4o4st6+wfL533ehdPNmwFy3AkGUOvYt8S4Cw=; b=LZjHsKx1CtW6iG\n\tIfTiVBpRdQpguuhnbc7UIDtmDIO9GpKE8lx/V7SGKR57+rmU7DF6GVEjqp+TT+SLEy7tjyp+luIWK\n\t7VpiAAYSOB37kAnHbhBPxR6SGh07C1M+9OpArASt7fszugjOT68hSAd9vs7YEpFq9ZFIJQDoWyugN\n\tKOBWKn1kKL+VOIL+VawrV4cpInAP9kaJIqhRdZqHC+vfrhXgu/Tg9JxnybC5FzT4M6hlwZbMFvZZk\n\tOyqTI7sId5juzCC4eYqS/pqWPSlHCosAgmLC3Mza5+rZsaqj/y/nw45KOFq9FsIApH+R29RPrCYrX\n\t/9/APdiOsS+PIAxzyKTA==;","v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject:\n\tMessage-ID:References:Mime-Version:In-Reply-To:Date:Reply-To:Sender:\n\tContent-Transfer-Encoding:Content-ID:Content-Description;\n\tbh=Rpd6vMcLqXnLIzoMZjZBJw63vKplluuAVwdNOopWl7o=; b=TUGUuiG18uLlFlMmIbCGQGYJ1x\n\tiKNHsjaHCg5whxKrzZDrbmqrQwovyLJcfV23kdLcHJsoleglqanIT1p/O8PeOmv4maM9Zf3djxvoR\n\tl+91YNrpGabFA3Pb1uKLJwbKgFfC9jSPZKEbTjyKOpBHhE1DoBt8ZZMnjlNvGW+qdSrqQHlZYTxNc\n\tpsqbgp8xTopZnvQ3ymPsA+LmvvkHRj2yWxQ0gzANqPa6OpwCOnw/FheZfOQWCBcQ7S6JMLkHzB4dw\n\tF7fV+QPSYo+RL8VLV8M4/wRs+XMVN2AQLQZV9urCxRFnBamOPi/tbUykDchnXAJvHGN4UKbZf8CGK\n\tZNOhQ3Mw==;","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=google.com; s=20251104; t=1776720041; x=1777324841;\n darn=lists.infradead.org;\n h=cc:to:from:subject:message-id:references:mime-version:in-reply-to\n :date:reply-to:from:to:cc:subject:date:message-id:reply-to;\n bh=Rpd6vMcLqXnLIzoMZjZBJw63vKplluuAVwdNOopWl7o=;\n b=Xk2Dgr2FDNBtqogFkebk28Nd9FXcS/LSPyHqy4qmUMTOeOPJ/D1zTFvPqGBJEqPSmq\n LjHVC6J006nnsi30L+UO2obgLfEf4aR+c4cisGkE1TfNVAK4xUDT7SnAWqY+FEKw/nRU\n w5tELf0b58ABJ+8CVbg6sDaZ0d/PHzHvfhUlVplzA8uDl6YKPcqgdZlUddkImTzKF1DH\n fbzDpOZy3TpxSTpfjGaPpyO5o/hiktmvT1mydT8qJ2NaQGlo0G0h9QW4RQ9W7zv/375M\n 1iqaPc3CRVXus8CQGyEkSldrhkJMXULmETA4x1vibMG4JlyPrzZ+njMqDrD4FSuhSRWS\n rBxg=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776720041; x=1777324841;\n h=cc:to:from:subject:message-id:references:mime-version:in-reply-to\n :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id\n :reply-to;\n bh=Rpd6vMcLqXnLIzoMZjZBJw63vKplluuAVwdNOopWl7o=;\n b=YvyOrb13k+WxlnZuC9xf67SK1sgjZXk3oc0TW4uLr1o1eAWNQnUJ0Z0UlPJvFfWZXW\n H5wxwpmykFiloxFLAjr4Y9JnfkltClHrGBnrt8Nr/v3qQGn6nYYHRQXvv90PN4zuLcBQ\n 6HRZk/UHN2JJb2tqEyEy9knPiWP+t+lD6xjDZr1za3t6wDv2T+4gXMWKE2Y1gT4MxdwA\n XxvUejd9+Znr6bmnXWRqWtbObugfV7o72Wx8dh2siBCU3TGvoc6TjGvbng6CGqhWP4FR\n 90q6ddlkKH3alui6rrYjHbPIZsmqQkoiY72iY4rjB+m5qyF3lxezAhG+aWG2nxP0rj5h\n O1+Q==","X-Forwarded-Encrypted":"i=1;\n AFNElJ8n/vPVaJ9+iHplnmQUTa0f9OtfkJIPYkr2WUqD7kZdgjl3ULxnd6acF1SwlJXzhQ7q6nGqNkTC9AY=@lists.infradead.org","X-Gm-Message-State":"AOJu0YyTjYIiFQoFd4qmBjSA2DgJEfmO09Y6cPpE1URXagvJq47dhRh1\n\tt2QV8QnMG2SkBX6dEpzy70JFDM9U3y6PXxV+RBxXHKA0z6/ArEnoUJqAgSqWP7+b4pYCgsoDfE/\n\trgud41A==","X-Received":"from pffv19.prod.google.com ([2002:aa7:8093:0:b0:82f:5d4f:734f])\n (user=seanjc job=prod-delivery.src-stubby-dispatcher) by\n 2002:a05:6a00:4f87:b0:82f:8698:101\n with SMTP id d2e1a72fcca58-82f8c9bbeb9mr15967277b3a.44.1776720040495; Mon, 20\n Apr 2026 14:20:40 -0700 (PDT)","Date":"Mon, 20 Apr 2026 14:20:02 -0700","In-Reply-To":"<20260420212004.3938325-1-seanjc@google.com>","Mime-Version":"1.0","References":"<20260420212004.3938325-1-seanjc@google.com>","X-Mailer":"git-send-email 2.54.0.rc1.555.g9c883467ad-goog","Message-ID":"<20260420212004.3938325-18-seanjc@google.com>","Subject":"[PATCH v3 17/19] KVM: selftests: Replace \"u64 gpa\" with \"gpa_t\"\n throughout","From":"Sean Christopherson ","To":"Paolo Bonzini , Marc Zyngier ,\n\tOliver Upton , Tianrui Zhao ,\n\tBibo Mao , Huacai Chen ,\n\tAnup Patel , Paul Walmsley ,\n\tPalmer Dabbelt , Albert Ou ,\n\tChristian Borntraeger ,\n Janosch Frank ,\n\tClaudio Imbrenda ,\n Sean Christopherson ","Cc":"kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,\n\tkvmarm@lists.linux.dev, loongarch@lists.linux.dev,\n\tkvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org,\n\tlinux-kernel@vger.kernel.org, David Matlack ","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20260420_222044_654760_A4C7C9DD ","X-CRM114-Status":"GOOD ( 13.12 )","X-Spam-Score":"-9.5 (---------)","X-Spam-Report":"SpamAssassin version 4.0.1 on casper.infradead.org summary:\n Content analysis details: (-9.5 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no\n trust\n [2607:f8b0:4864:20:0:0:0:44a listed in]\n [list.dnswl.org]\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM welcome-list\n -0.0 SPF_PASS SPF: sender matches SPF record\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n 0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n not necessarily valid\n -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n [score: 0.0000]\n -0.0 DKIMWL_WL_MED DKIMwl.org - Medium trust sender","X-BeenThere":"kvm-riscv@lists.infradead.org","X-Mailman-Version":"2.1.34","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Reply-To":"Sean Christopherson ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"kvm-riscv\" ","Errors-To":"kvm-riscv-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"Use gpa_t instead of u64 for obvious declarations of GPA variables.\n\nNo functional change intended.\n\nSigned-off-by: Sean Christopherson \n---\n .../testing/selftests/kvm/guest_memfd_test.c | 2 +-\n .../testing/selftests/kvm/include/kvm_util.h | 26 +++++++++----------\n .../testing/selftests/kvm/include/memstress.h | 4 +--\n .../selftests/kvm/include/x86/processor.h | 4 +--\n tools/testing/selftests/kvm/lib/kvm_util.c | 14 +++++-----\n .../selftests/kvm/lib/s390/processor.c | 2 +-\n .../kvm/memslot_modification_stress_test.c | 2 +-\n .../testing/selftests/kvm/memslot_perf_test.c | 10 +++----\n tools/testing/selftests/kvm/mmu_stress_test.c | 4 +--\n .../selftests/kvm/pre_fault_memory_test.c | 4 +--\n .../selftests/kvm/s390/ucontrol_test.c | 2 +-\n .../selftests/kvm/set_memory_region_test.c | 2 +-\n .../kvm/x86/private_mem_conversions_test.c | 24 ++++++++---------\n .../x86/smaller_maxphyaddr_emulation_test.c | 2 +-\n .../selftests/kvm/x86/svm_nested_vmcb12_gpa.c | 8 +++---\n 15 files changed, 55 insertions(+), 55 deletions(-)","diff":"diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c\nindex 9cbd3ad7f44a..d6528c6f5e03 100644\n--- a/tools/testing/selftests/kvm/guest_memfd_test.c\n+++ b/tools/testing/selftests/kvm/guest_memfd_test.c\n@@ -489,7 +489,7 @@ static void test_guest_memfd_guest(void)\n \t * the guest's code, stack, and page tables, and low memory contains\n \t * the PCI hole and other MMIO regions that need to be avoided.\n \t */\n-\tconst u64 gpa = SZ_4G;\n+\tconst gpa_t gpa = SZ_4G;\n \tconst int slot = 1;\n \n \tstruct kvm_vcpu *vcpu;\ndiff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h\nindex 0dcfad728edd..0d9f11be9806 100644\n--- a/tools/testing/selftests/kvm/include/kvm_util.h\n+++ b/tools/testing/selftests/kvm/include/kvm_util.h\n@@ -114,7 +114,7 @@ struct kvm_vm {\n \tgpa_t ucall_mmio_addr;\n \tgva_t handlers;\n \tu32 dirty_ring_size;\n-\tu64 gpa_tag_mask;\n+\tgpa_t gpa_tag_mask;\n \n \t/*\n \t * \"mmu\" is the guest's stage-1, with a short name because the vast\n@@ -418,7 +418,7 @@ static inline void vm_enable_cap(struct kvm_vm *vm, u32 cap, u64 arg0)\n \tvm_ioctl(vm, KVM_ENABLE_CAP, &enable_cap);\n }\n \n-static inline void vm_set_memory_attributes(struct kvm_vm *vm, u64 gpa,\n+static inline void vm_set_memory_attributes(struct kvm_vm *vm, gpa_t gpa,\n \t\t\t\t\t u64 size, u64 attributes)\n {\n \tstruct kvm_memory_attributes attr = {\n@@ -439,28 +439,28 @@ static inline void vm_set_memory_attributes(struct kvm_vm *vm, u64 gpa,\n }\n \n \n-static inline void vm_mem_set_private(struct kvm_vm *vm, u64 gpa,\n+static inline void vm_mem_set_private(struct kvm_vm *vm, gpa_t gpa,\n \t\t\t\t u64 size)\n {\n \tvm_set_memory_attributes(vm, gpa, size, KVM_MEMORY_ATTRIBUTE_PRIVATE);\n }\n \n-static inline void vm_mem_set_shared(struct kvm_vm *vm, u64 gpa,\n+static inline void vm_mem_set_shared(struct kvm_vm *vm, gpa_t gpa,\n \t\t\t\t u64 size)\n {\n \tvm_set_memory_attributes(vm, gpa, size, 0);\n }\n \n-void vm_guest_mem_fallocate(struct kvm_vm *vm, u64 gpa, u64 size,\n+void vm_guest_mem_fallocate(struct kvm_vm *vm, gpa_t gpa, u64 size,\n \t\t\t bool punch_hole);\n \n-static inline void vm_guest_mem_punch_hole(struct kvm_vm *vm, u64 gpa,\n+static inline void vm_guest_mem_punch_hole(struct kvm_vm *vm, gpa_t gpa,\n \t\t\t\t\t u64 size)\n {\n \tvm_guest_mem_fallocate(vm, gpa, size, true);\n }\n \n-static inline void vm_guest_mem_allocate(struct kvm_vm *vm, u64 gpa,\n+static inline void vm_guest_mem_allocate(struct kvm_vm *vm, gpa_t gpa,\n \t\t\t\t\t u64 size)\n {\n \tvm_guest_mem_fallocate(vm, gpa, size, false);\n@@ -685,21 +685,21 @@ static inline int vm_create_guest_memfd(struct kvm_vm *vm, u64 size,\n }\n \n void vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,\n-\t\t\t u64 gpa, u64 size, void *hva);\n+\t\t\t gpa_t gpa, u64 size, void *hva);\n int __vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,\n-\t\t\t\tu64 gpa, u64 size, void *hva);\n+\t\t\t\tgpa_t gpa, u64 size, void *hva);\n void vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,\n-\t\t\t\tu64 gpa, u64 size, void *hva,\n+\t\t\t\tgpa_t gpa, u64 size, void *hva,\n \t\t\t\tu32 guest_memfd, u64 guest_memfd_offset);\n int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,\n-\t\t\t\t u64 gpa, u64 size, void *hva,\n+\t\t\t\t gpa_t gpa, u64 size, void *hva,\n \t\t\t\t u32 guest_memfd, u64 guest_memfd_offset);\n \n void vm_userspace_mem_region_add(struct kvm_vm *vm,\n \t\t\t\t enum vm_mem_backing_src_type src_type,\n-\t\t\t\t u64 gpa, u32 slot, u64 npages, u32 flags);\n+\t\t\t\t gpa_t gpa, u32 slot, u64 npages, u32 flags);\n void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,\n-\t\tu64 gpa, u32 slot, u64 npages, u32 flags,\n+\t\tgpa_t gpa, u32 slot, u64 npages, u32 flags,\n \t\tint guest_memfd_fd, u64 guest_memfd_offset);\n \n #ifndef vm_arch_has_protected_memory\ndiff --git a/tools/testing/selftests/kvm/include/memstress.h b/tools/testing/selftests/kvm/include/memstress.h\nindex abd0dca10283..0d1d6230cc05 100644\n--- a/tools/testing/selftests/kvm/include/memstress.h\n+++ b/tools/testing/selftests/kvm/include/memstress.h\n@@ -20,7 +20,7 @@\n #define MEMSTRESS_MEM_SLOT_INDEX\t1\n \n struct memstress_vcpu_args {\n-\tu64 gpa;\n+\tgpa_t gpa;\n \tgva_t gva;\n \tu64 pages;\n \n@@ -32,7 +32,7 @@ struct memstress_vcpu_args {\n struct memstress_args {\n \tstruct kvm_vm *vm;\n \t/* The starting address and size of the guest test region. */\n-\tu64 gpa;\n+\tgpa_t gpa;\n \tu64 size;\n \tu64 guest_page_size;\n \tu32 random_seed;\ndiff --git a/tools/testing/selftests/kvm/include/x86/processor.h b/tools/testing/selftests/kvm/include/x86/processor.h\nindex 15252e75aaf1..fc7efd722229 100644\n--- a/tools/testing/selftests/kvm/include/x86/processor.h\n+++ b/tools/testing/selftests/kvm/include/x86/processor.h\n@@ -1400,12 +1400,12 @@ u64 kvm_hypercall(u64 nr, u64 a0, u64 a1, u64 a2, u64 a3);\n u64 __xen_hypercall(u64 nr, u64 a0, void *a1);\n void xen_hypercall(u64 nr, u64 a0, void *a1);\n \n-static inline u64 __kvm_hypercall_map_gpa_range(u64 gpa, u64 size, u64 flags)\n+static inline u64 __kvm_hypercall_map_gpa_range(gpa_t gpa, u64 size, u64 flags)\n {\n \treturn kvm_hypercall(KVM_HC_MAP_GPA_RANGE, gpa, size >> PAGE_SHIFT, flags, 0);\n }\n \n-static inline void kvm_hypercall_map_gpa_range(u64 gpa, u64 size, u64 flags)\n+static inline void kvm_hypercall_map_gpa_range(gpa_t gpa, u64 size, u64 flags)\n {\n \tu64 ret = __kvm_hypercall_map_gpa_range(gpa, size, flags);\n \ndiff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c\nindex e282f9abd4c7..905fa214099d 100644\n--- a/tools/testing/selftests/kvm/lib/kvm_util.c\n+++ b/tools/testing/selftests/kvm/lib/kvm_util.c\n@@ -919,7 +919,7 @@ static void vm_userspace_mem_region_hva_insert(struct rb_root *hva_tree,\n \n \n int __vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,\n-\t\t\t\tu64 gpa, u64 size, void *hva)\n+\t\t\t\tgpa_t gpa, u64 size, void *hva)\n {\n \tstruct kvm_userspace_memory_region region = {\n \t\t.slot = slot,\n@@ -933,7 +933,7 @@ int __vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,\n }\n \n void vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,\n-\t\t\t u64 gpa, u64 size, void *hva)\n+\t\t\t gpa_t gpa, u64 size, void *hva)\n {\n \tint ret = __vm_set_user_memory_region(vm, slot, flags, gpa, size, hva);\n \n@@ -946,7 +946,7 @@ void vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,\n \t\t \"KVM selftests now require KVM_SET_USER_MEMORY_REGION2 (introduced in v6.8)\")\n \n int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,\n-\t\t\t\t u64 gpa, u64 size, void *hva,\n+\t\t\t\t gpa_t gpa, u64 size, void *hva,\n \t\t\t\t u32 guest_memfd, u64 guest_memfd_offset)\n {\n \tstruct kvm_userspace_memory_region2 region = {\n@@ -965,7 +965,7 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,\n }\n \n void vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,\n-\t\t\t\tu64 gpa, u64 size, void *hva,\n+\t\t\t\tgpa_t gpa, u64 size, void *hva,\n \t\t\t\tu32 guest_memfd, u64 guest_memfd_offset)\n {\n \tint ret = __vm_set_user_memory_region2(vm, slot, flags, gpa, size, hva,\n@@ -978,7 +978,7 @@ void vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,\n \n /* FIXME: This thing needs to be ripped apart and rewritten. */\n void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,\n-\t\tu64 gpa, u32 slot, u64 npages, u32 flags,\n+\t\tgpa_t gpa, u32 slot, u64 npages, u32 flags,\n \t\tint guest_memfd, u64 guest_memfd_offset)\n {\n \tint ret;\n@@ -1141,7 +1141,7 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,\n \n void vm_userspace_mem_region_add(struct kvm_vm *vm,\n \t\t\t\t enum vm_mem_backing_src_type src_type,\n-\t\t\t\t u64 gpa, u32 slot, u64 npages, u32 flags)\n+\t\t\t\t gpa_t gpa, u32 slot, u64 npages, u32 flags)\n {\n \tvm_mem_add(vm, src_type, gpa, slot, npages, flags, -1, 0);\n }\n@@ -1278,7 +1278,7 @@ void vm_guest_mem_fallocate(struct kvm_vm *vm, u64 base, u64 size,\n \tconst int mode = FALLOC_FL_KEEP_SIZE | (punch_hole ? FALLOC_FL_PUNCH_HOLE : 0);\n \tstruct userspace_mem_region *region;\n \tu64 end = base + size;\n-\tu64 gpa, len;\n+\tgpa_t gpa, len;\n \toff_t fd_offset;\n \tint ret;\n \ndiff --git a/tools/testing/selftests/kvm/lib/s390/processor.c b/tools/testing/selftests/kvm/lib/s390/processor.c\nindex 643e583c804c..77a7b6965812 100644\n--- a/tools/testing/selftests/kvm/lib/s390/processor.c\n+++ b/tools/testing/selftests/kvm/lib/s390/processor.c\n@@ -47,7 +47,7 @@ static u64 virt_alloc_region(struct kvm_vm *vm, int ri)\n \t\t| ((ri < 4 ? (PAGES_PER_REGION - 1) : 0) & REGION_ENTRY_LENGTH);\n }\n \n-void virt_arch_pg_map(struct kvm_vm *vm, gva_t gva, u64 gpa)\n+void virt_arch_pg_map(struct kvm_vm *vm, gva_t gva, gpa_t gpa)\n {\n \tint ri, idx;\n \tu64 *entry;\ndiff --git a/tools/testing/selftests/kvm/memslot_modification_stress_test.c b/tools/testing/selftests/kvm/memslot_modification_stress_test.c\nindex 9d7c4afab961..9c7578a098c3 100644\n--- a/tools/testing/selftests/kvm/memslot_modification_stress_test.c\n+++ b/tools/testing/selftests/kvm/memslot_modification_stress_test.c\n@@ -58,7 +58,7 @@ static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay,\n \t\t\t u64 nr_modifications)\n {\n \tu64 pages = max_t(int, vm->page_size, getpagesize()) / vm->page_size;\n-\tu64 gpa;\n+\tgpa_t gpa;\n \tint i;\n \n \t/*\ndiff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testing/selftests/kvm/memslot_perf_test.c\nindex 51f8be50c7e4..3d02db371422 100644\n--- a/tools/testing/selftests/kvm/memslot_perf_test.c\n+++ b/tools/testing/selftests/kvm/memslot_perf_test.c\n@@ -186,9 +186,9 @@ static void wait_for_vcpu(void)\n \t\t \"sem_timedwait() failed: %d\", errno);\n }\n \n-static void *vm_gpa2hva(struct vm_data *data, u64 gpa, u64 *rempages)\n+static void *vm_gpa2hva(struct vm_data *data, gpa_t gpa, u64 *rempages)\n {\n-\tu64 gpage, pgoffs;\n+\tgpa_t gpage, pgoffs;\n \tu32 slot, slotoffs;\n \tvoid *base;\n \tu32 guest_page_size = data->vm->page_size;\n@@ -332,7 +332,7 @@ static bool prepare_vm(struct vm_data *data, int nslots, u64 *maxslots,\n \n \tfor (slot = 1, guest_addr = MEM_GPA; slot <= data->nslots; slot++) {\n \t\tu64 npages;\n-\t\tu64 gpa;\n+\t\tgpa_t gpa;\n \n \t\tnpages = data->pages_per_slot;\n \t\tif (slot == data->nslots)\n@@ -638,7 +638,7 @@ static void test_memslot_move_loop(struct vm_data *data, struct sync_area *sync)\n static void test_memslot_do_unmap(struct vm_data *data,\n \t\t\t\t u64 offsp, u64 count)\n {\n-\tu64 gpa, ctr;\n+\tgpa_t gpa, ctr;\n \tu32 guest_page_size = data->vm->page_size;\n \n \tfor (gpa = MEM_TEST_GPA + offsp * guest_page_size, ctr = 0; ctr < count; ) {\n@@ -663,7 +663,7 @@ static void test_memslot_do_unmap(struct vm_data *data,\n static void test_memslot_map_unmap_check(struct vm_data *data,\n \t\t\t\t\t u64 offsp, u64 valexp)\n {\n-\tu64 gpa;\n+\tgpa_t gpa;\n \tu64 *val;\n \tu32 guest_page_size = data->vm->page_size;\n \ndiff --git a/tools/testing/selftests/kvm/mmu_stress_test.c b/tools/testing/selftests/kvm/mmu_stress_test.c\nindex e0975a5dcff1..54d281419d31 100644\n--- a/tools/testing/selftests/kvm/mmu_stress_test.c\n+++ b/tools/testing/selftests/kvm/mmu_stress_test.c\n@@ -22,7 +22,7 @@ static bool all_vcpus_hit_ro_fault;\n \n static void guest_code(u64 start_gpa, u64 end_gpa, u64 stride)\n {\n-\tu64 gpa;\n+\tgpa_t gpa;\n \tint i;\n \n \tfor (i = 0; i < 2; i++) {\n@@ -206,7 +206,7 @@ static pthread_t *spawn_workers(struct kvm_vm *vm, struct kvm_vcpu **vcpus,\n \t\t\t\tu64 start_gpa, u64 end_gpa)\n {\n \tstruct vcpu_info *info;\n-\tu64 gpa, nr_bytes;\n+\tgpa_t gpa, nr_bytes;\n \tpthread_t *threads;\n \tint i;\n \ndiff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/testing/selftests/kvm/pre_fault_memory_test.c\nindex bfdaaeed3a8c..fcb57fd034e6 100644\n--- a/tools/testing/selftests/kvm/pre_fault_memory_test.c\n+++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c\n@@ -33,7 +33,7 @@ static void guest_code(u64 base_gva)\n \n struct slot_worker_data {\n \tstruct kvm_vm *vm;\n-\tu64 gpa;\n+\tgpa_t gpa;\n \tu32 flags;\n \tbool worker_ready;\n \tbool prefault_ready;\n@@ -161,7 +161,7 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 base_gpa, u64 offset,\n \n static void __test_pre_fault_memory(unsigned long vm_type, bool private)\n {\n-\tu64 gpa, gva, alignment, guest_page_size;\n+\tgpa_t gpa, gva, alignment, guest_page_size;\n \tconst struct vm_shape shape = {\n \t\t.mode = VM_MODE_DEFAULT,\n \t\t.type = vm_type,\ndiff --git a/tools/testing/selftests/kvm/s390/ucontrol_test.c b/tools/testing/selftests/kvm/s390/ucontrol_test.c\nindex dbdee4c39d47..b8c6f37b53e0 100644\n--- a/tools/testing/selftests/kvm/s390/ucontrol_test.c\n+++ b/tools/testing/selftests/kvm/s390/ucontrol_test.c\n@@ -269,7 +269,7 @@ TEST(uc_cap_hpage)\n }\n \n /* calculate host virtual addr from guest physical addr */\n-static void *gpa2hva(FIXTURE_DATA(uc_kvm) *self, u64 gpa)\n+static void *gpa2hva(FIXTURE_DATA(uc_kvm) *self, gpa_t gpa)\n {\n \treturn (void *)(self->base_hva - self->base_gpa + gpa);\n }\ndiff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c\nindex 5551dd0f9fad..9b919a231c93 100644\n--- a/tools/testing/selftests/kvm/set_memory_region_test.c\n+++ b/tools/testing/selftests/kvm/set_memory_region_test.c\n@@ -112,7 +112,7 @@ static struct kvm_vm *spawn_vm(struct kvm_vcpu **vcpu, pthread_t *vcpu_thread,\n {\n \tstruct kvm_vm *vm;\n \tu64 *hva;\n-\tu64 gpa;\n+\tgpa_t gpa;\n \n \tvm = vm_create_with_one_vcpu(vcpu, guest_code);\n \ndiff --git a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c\nindex 27675d7d04c0..1d2f5d4fd45d 100644\n--- a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c\n+++ b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c\n@@ -38,7 +38,7 @@ do {\t\t\t\t\t\t\t\t\t\t\t\t\\\n \t\t\t pattern, i, gpa + i, mem[i]);\t\t\t\t\t\\\n } while (0)\n \n-static void memcmp_h(u8 *mem, u64 gpa, u8 pattern, size_t size)\n+static void memcmp_h(u8 *mem, gpa_t gpa, u8 pattern, size_t size)\n {\n \tsize_t i;\n \n@@ -70,13 +70,13 @@ enum ucall_syncs {\n \tSYNC_PRIVATE,\n };\n \n-static void guest_sync_shared(u64 gpa, u64 size,\n+static void guest_sync_shared(gpa_t gpa, u64 size,\n \t\t\t u8 current_pattern, u8 new_pattern)\n {\n \tGUEST_SYNC5(SYNC_SHARED, gpa, size, current_pattern, new_pattern);\n }\n \n-static void guest_sync_private(u64 gpa, u64 size, u8 pattern)\n+static void guest_sync_private(gpa_t gpa, u64 size, u8 pattern)\n {\n \tGUEST_SYNC4(SYNC_PRIVATE, gpa, size, pattern);\n }\n@@ -86,7 +86,7 @@ static void guest_sync_private(u64 gpa, u64 size, u8 pattern)\n #define MAP_GPA_SHARED\t\tBIT(1)\n #define MAP_GPA_DO_FALLOCATE\tBIT(2)\n \n-static void guest_map_mem(u64 gpa, u64 size, bool map_shared,\n+static void guest_map_mem(gpa_t gpa, u64 size, bool map_shared,\n \t\t\t bool do_fallocate)\n {\n \tu64 flags = MAP_GPA_SET_ATTRIBUTES;\n@@ -98,12 +98,12 @@ static void guest_map_mem(u64 gpa, u64 size, bool map_shared,\n \tkvm_hypercall_map_gpa_range(gpa, size, flags);\n }\n \n-static void guest_map_shared(u64 gpa, u64 size, bool do_fallocate)\n+static void guest_map_shared(gpa_t gpa, u64 size, bool do_fallocate)\n {\n \tguest_map_mem(gpa, size, true, do_fallocate);\n }\n \n-static void guest_map_private(u64 gpa, u64 size, bool do_fallocate)\n+static void guest_map_private(gpa_t gpa, u64 size, bool do_fallocate)\n {\n \tguest_map_mem(gpa, size, false, do_fallocate);\n }\n@@ -134,7 +134,7 @@ static void guest_test_explicit_conversion(u64 base_gpa, bool do_fallocate)\n \tmemcmp_g(base_gpa, init_p, PER_CPU_DATA_SIZE);\n \n \tfor (i = 0; i < ARRAY_SIZE(test_ranges); i++) {\n-\t\tu64 gpa = base_gpa + test_ranges[i].offset;\n+\t\tgpa_t gpa = base_gpa + test_ranges[i].offset;\n \t\tu64 size = test_ranges[i].size;\n \t\tu8 p1 = 0x11;\n \t\tu8 p2 = 0x22;\n@@ -214,7 +214,7 @@ static void guest_test_explicit_conversion(u64 base_gpa, bool do_fallocate)\n \t}\n }\n \n-static void guest_punch_hole(u64 gpa, u64 size)\n+static void guest_punch_hole(gpa_t gpa, u64 size)\n {\n \t/* \"Mapping\" memory shared via fallocate() is done via PUNCH_HOLE. */\n \tu64 flags = MAP_GPA_SHARED | MAP_GPA_DO_FALLOCATE;\n@@ -239,7 +239,7 @@ static void guest_test_punch_hole(u64 base_gpa, bool precise)\n \tguest_map_private(base_gpa, PER_CPU_DATA_SIZE, false);\n \n \tfor (i = 0; i < ARRAY_SIZE(test_ranges); i++) {\n-\t\tu64 gpa = base_gpa + test_ranges[i].offset;\n+\t\tgpa_t gpa = base_gpa + test_ranges[i].offset;\n \t\tu64 size = test_ranges[i].size;\n \n \t\t/*\n@@ -289,7 +289,7 @@ static void guest_code(u64 base_gpa)\n static void handle_exit_hypercall(struct kvm_vcpu *vcpu)\n {\n \tstruct kvm_run *run = vcpu->run;\n-\tu64 gpa = run->hypercall.args[0];\n+\tgpa_t gpa = run->hypercall.args[0];\n \tu64 size = run->hypercall.args[1] * PAGE_SIZE;\n \tbool set_attributes = run->hypercall.args[2] & MAP_GPA_SET_ATTRIBUTES;\n \tbool map_shared = run->hypercall.args[2] & MAP_GPA_SHARED;\n@@ -337,7 +337,7 @@ static void *__test_mem_conversions(void *__vcpu)\n \t\tcase UCALL_ABORT:\n \t\t\tREPORT_GUEST_ASSERT(uc);\n \t\tcase UCALL_SYNC: {\n-\t\t\tu64 gpa = uc.args[1];\n+\t\t\tgpa_t gpa = uc.args[1];\n \t\t\tsize_t size = uc.args[2];\n \t\t\tsize_t i;\n \n@@ -402,7 +402,7 @@ static void test_mem_conversions(enum vm_mem_backing_src_type src_type, u32 nr_v\n \t\t\t KVM_MEM_GUEST_MEMFD, memfd, slot_size * i);\n \n \tfor (i = 0; i < nr_vcpus; i++) {\n-\t\tu64 gpa = BASE_DATA_GPA + i * per_cpu_size;\n+\t\tgpa_t gpa = BASE_DATA_GPA + i * per_cpu_size;\n \n \t\tvcpu_args_set(vcpus[i], 1, gpa);\n \ndiff --git a/tools/testing/selftests/kvm/x86/smaller_maxphyaddr_emulation_test.c b/tools/testing/selftests/kvm/x86/smaller_maxphyaddr_emulation_test.c\nindex 27cded643699..3dca85e95478 100644\n--- a/tools/testing/selftests/kvm/x86/smaller_maxphyaddr_emulation_test.c\n+++ b/tools/testing/selftests/kvm/x86/smaller_maxphyaddr_emulation_test.c\n@@ -48,7 +48,7 @@ int main(int argc, char *argv[])\n \tstruct kvm_vm *vm;\n \tstruct ucall uc;\n \tu64 *hva;\n-\tu64 gpa;\n+\tgpa_t gpa;\n \tint rc;\n \n \tTEST_REQUIRE(kvm_has_cap(KVM_CAP_SMALLER_MAXPHYADDR));\ndiff --git a/tools/testing/selftests/kvm/x86/svm_nested_vmcb12_gpa.c b/tools/testing/selftests/kvm/x86/svm_nested_vmcb12_gpa.c\nindex ae8a10913af7..a4935ce2fb99 100644\n--- a/tools/testing/selftests/kvm/x86/svm_nested_vmcb12_gpa.c\n+++ b/tools/testing/selftests/kvm/x86/svm_nested_vmcb12_gpa.c\n@@ -28,28 +28,28 @@ static void l2_code(void)\n \tvmcall();\n }\n \n-static void l1_vmrun(struct svm_test_data *svm, u64 gpa)\n+static void l1_vmrun(struct svm_test_data *svm, gpa_t gpa)\n {\n \tgeneric_svm_setup(svm, l2_code, &l2_guest_stack[L2_GUEST_STACK_SIZE]);\n \n \tasm volatile (\"vmrun %[gpa]\" : : [gpa] \"a\" (gpa) : \"memory\");\n }\n \n-static void l1_vmload(struct svm_test_data *svm, u64 gpa)\n+static void l1_vmload(struct svm_test_data *svm, gpa_t gpa)\n {\n \tgeneric_svm_setup(svm, l2_code, &l2_guest_stack[L2_GUEST_STACK_SIZE]);\n \n \tasm volatile (\"vmload %[gpa]\" : : [gpa] \"a\" (gpa) : \"memory\");\n }\n \n-static void l1_vmsave(struct svm_test_data *svm, u64 gpa)\n+static void l1_vmsave(struct svm_test_data *svm, gpa_t gpa)\n {\n \tgeneric_svm_setup(svm, l2_code, &l2_guest_stack[L2_GUEST_STACK_SIZE]);\n \n \tasm volatile (\"vmsave %[gpa]\" : : [gpa] \"a\" (gpa) : \"memory\");\n }\n \n-static void l1_vmexit(struct svm_test_data *svm, u64 gpa)\n+static void l1_vmexit(struct svm_test_data *svm, gpa_t gpa)\n {\n \tgeneric_svm_setup(svm, l2_code, &l2_guest_stack[L2_GUEST_STACK_SIZE]);\n \n","prefixes":["v3","17/19"]}