{"id":2225340,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2225340/?format=json","web_url":"http://patchwork.ozlabs.org/project/kvm-riscv/patch/20260420212004.3938325-3-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-3-seanjc@google.com>","list_archive_url":null,"date":"2026-04-20T21:19:47","name":"[v3,02/19] KVM: selftests: Use gpa_t instead of vm_paddr_t","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"080498191e135cbaf0bad94b3dccae19181617d8","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-3-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/2225340/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225340/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=NyPdlrkn;\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=c+I971qB;\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 4fzz0f2j4Kz1yCv\n\tfor ; Tue, 21 Apr 2026 07:20:17 +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 1wEw2R-00000007fYG-48Hx;\n\tMon, 20 Apr 2026 21:20:15 +0000","from mail-pf1-x44a.google.com ([2607:f8b0:4864:20::44a])\n\tby bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux))\n\tid 1wEw2N-00000007fTD-1AzU\n\tfor kvm-riscv@lists.infradead.org;\n\tMon, 20 Apr 2026 21:20:14 +0000","by mail-pf1-x44a.google.com with SMTP id\n d2e1a72fcca58-82f756ebd0dso2243461b3a.1\n for ;\n Mon, 20 Apr 2026 14:20:10 -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=PvLm24+MHZMY4ZZfZEsFkJ09I39bdIQzWVoc9qjfMtU=; b=NyPdlrknj/4eXR\n\tOOHa697vDzjliNbaEVOOO3pGpgDZQpGU6ebht/gcn66g8lOEOPg1Ho7ycUgTNPWIb9SROZYCsOd/+\n\t+12sqNTgtuQepwrmxZqtEvl8ywyELYIuHSGAmnYZzyukH6i5ezvHGFUsjIKJNlPC9lZM7ky70DIKb\n\tAP8SAJtF3A9+cVde/SfMa5E00X18omRPyo7yRsvTE8vq7cZ9IS162FN+JSd5X6gvt/DQIX7O6B64a\n\tCfTOkjjWZ3eJh7zYZOWM20jrS8e2zMHOyXLae0AYNgZhYEUuZ1fMV6B9x5r+fHGCTgEsqOgZvuYnu\n\t1XsMz+u5aeKmk5+u5Ieg==;","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=google.com; s=20251104; t=1776720010; x=1777324810;\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=GUvaJ+xA/ByOjYAym9DrOAM97xYrvpdK6zXd2S4iDZk=;\n b=c+I971qBT02msI8EKUD35I1kJE3jAKDQk0XVCMGE+8yQIcv6pnf4YRex6XTvA6IyWm\n eiRUbigaZg7zb3sFle8bapihaF71TBabVUhhem4bYBQKRd0DSjGxG9s0IbxZFQYwAett\n YPn+hcTu+dgUrAiTVMuquYD6Pw0mdXe81DnEn/t/vQOx1K9s++E14ZbR8+K4D4klIlMq\n knn3HQPGMfy6OYHdR8bsOSpoU8SPURNaklYGThHaPxAiY5dQZueDDwbOrkBKMTP9Tnfc\n GTm9YvKr//iqqRsWGVuzgGuB75nvWxwpwaJTdOZLA+2mSDbtXTU8w7fSw3RIxqtJfQo2\n P+iQ=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776720010; x=1777324810;\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=GUvaJ+xA/ByOjYAym9DrOAM97xYrvpdK6zXd2S4iDZk=;\n b=DWtTNCA9tt9b3YVnE6A9Z/H4YnU4VWGxaNrTFI0LByHV0M1zBcAuIbcflx1lOZZkDf\n maF2I99iRM7ulNDzci8zZKSha4xs3To+OpM/doylAzMZGbk1t/FmvGQRr5CORclXuDFH\n qNmwnaMGEXPsSMUS2ir/1bkw9b6qT0C/Z5HFdXpAn6z+udvyMhlx62JHVe3ZeXH9dGBD\n QSjIzDPFLanDHh3/uYxzD7Edhyx3uK5BS0K4wRPmW84k5k+LKnkatuzfwExIYzvGW5jt\n GxOZZ3FyhR4jnlP4zXaF/sWtbiajkGoQZzLH01/2VBxGS5WDf9OQhNVFz14RVMDl08CV\n Fetw==","X-Forwarded-Encrypted":"i=1;\n AFNElJ+LfNX9CIodZyL1MpTONaQB7T7X3ivJskiYF+QQVX+43ofpSfp4hv5AtYvWqEX6ytxMJ6TPVSGNc4g=@lists.infradead.org","X-Gm-Message-State":"AOJu0YwAxdeTPr7OEQ2UJ/utSb58dc7hZ8DFRhfw3rijkzCixlQro+Ia\n\t4XJmrqFar2CpxB5krBUjUF6QyAU4IkJvIdpIFfS6d9TNOD07J3CjpluVQ6dJuRd8gq0dtK3qENo\n\tz4EgkzA==","X-Received":"from pfbho13.prod.google.com\n ([2002:a05:6a00:880d:b0:7ba:8e68:3140])\n (user=seanjc job=prod-delivery.src-stubby-dispatcher) by\n 2002:a05:6a00:847:b0:82f:6a64:deac\n with SMTP id d2e1a72fcca58-82f8c96211bmr16386230b3a.28.1776720009912; Mon, 20\n Apr 2026 14:20:09 -0700 (PDT)","Date":"Mon, 20 Apr 2026 14:19:47 -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-3-seanjc@google.com>","Subject":"[PATCH v3 02/19] KVM: selftests: Use gpa_t instead of vm_paddr_t","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_142011_398836_2F8B416F ","X-CRM114-Status":"GOOD ( 17.73 )","X-Spam-Score":"-9.5 (---------)","X-Spam-Report":"Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: From: David Matlack Replace all\n occurrences\n of vm_paddr_t with gpa_t to align with KVM code and with the conversion\n helpers\n (e.g. addr_hva2gpa()). This commit was generated with the following\n command: \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_PASS SPF: sender matches SPF record\n -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM welcome-list\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -0.1 DKIM_VALID Message has at least one valid DKIM or DK\n signature\n -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n author's\n domain\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":"From: David Matlack \n\nReplace all occurrences of vm_paddr_t with gpa_t to align with KVM code\nand with the conversion helpers (e.g. addr_hva2gpa()).\n\nThis commit was generated with the following command:\n\n git ls-files tools/testing/selftests/kvm | xargs sed -i 's/vm_paddr_/gpa_/g'\n\nThen by manually adjusting whitespace to make checkpatch.pl happy.\n\nNo functional change intended.\n\nSigned-off-by: David Matlack \n[sean: drop bogus changelog blurb about renaming functions]\nSigned-off-by: Sean Christopherson \n---\n .../testing/selftests/kvm/arm64/sea_to_user.c | 4 +--\n .../selftests/kvm/arm64/vgic_lpi_stress.c | 20 ++++++------\n tools/testing/selftests/kvm/dirty_log_test.c | 2 +-\n .../testing/selftests/kvm/include/arm64/gic.h | 4 +--\n .../selftests/kvm/include/arm64/gic_v3_its.h | 7 ++---\n .../testing/selftests/kvm/include/kvm_util.h | 31 +++++++++----------\n .../selftests/kvm/include/kvm_util_types.h | 2 +-\n .../selftests/kvm/include/riscv/ucall.h | 2 +-\n .../selftests/kvm/include/s390/ucall.h | 2 +-\n .../selftests/kvm/include/ucall_common.h | 4 +--\n tools/testing/selftests/kvm/include/x86/sev.h | 4 +--\n .../testing/selftests/kvm/include/x86/ucall.h | 2 +-\n .../selftests/kvm/kvm_page_table_test.c | 2 +-\n .../testing/selftests/kvm/lib/arm64/gic_v3.c | 4 +--\n .../selftests/kvm/lib/arm64/gic_v3_its.c | 11 +++----\n .../selftests/kvm/lib/arm64/processor.c | 2 +-\n tools/testing/selftests/kvm/lib/arm64/ucall.c | 2 +-\n tools/testing/selftests/kvm/lib/kvm_util.c | 27 ++++++++--------\n .../selftests/kvm/lib/loongarch/processor.c | 10 +++---\n .../selftests/kvm/lib/loongarch/ucall.c | 2 +-\n tools/testing/selftests/kvm/lib/memstress.c | 2 +-\n .../selftests/kvm/lib/riscv/processor.c | 2 +-\n .../selftests/kvm/lib/s390/processor.c | 4 +--\n .../testing/selftests/kvm/lib/ucall_common.c | 2 +-\n .../testing/selftests/kvm/lib/x86/processor.c | 2 +-\n tools/testing/selftests/kvm/lib/x86/sev.c | 2 +-\n .../selftests/kvm/riscv/sbi_pmu_test.c | 4 +--\n .../testing/selftests/kvm/s390/irq_routing.c | 2 +-\n .../selftests/kvm/s390/ucontrol_test.c | 2 +-\n tools/testing/selftests/kvm/steal_time.c | 4 +--\n .../testing/selftests/kvm/x86/hyperv_clock.c | 2 +-\n .../kvm/x86/hyperv_extended_hypercalls.c | 2 +-\n .../selftests/kvm/x86/hyperv_tlb_flush.c | 8 ++---\n .../selftests/kvm/x86/kvm_clock_test.c | 4 +--\n .../kvm/x86/vmx_nested_la57_state_test.c | 2 +-\n 35 files changed, 92 insertions(+), 96 deletions(-)","diff":"diff --git a/tools/testing/selftests/kvm/arm64/sea_to_user.c b/tools/testing/selftests/kvm/arm64/sea_to_user.c\nindex 573dd790aeb8..f41987dc726a 100644\n--- a/tools/testing/selftests/kvm/arm64/sea_to_user.c\n+++ b/tools/testing/selftests/kvm/arm64/sea_to_user.c\n@@ -51,7 +51,7 @@\n #define EINJ_OFFSET\t\t0x01234badUL\n #define EINJ_GVA\t\t((START_GVA) + (EINJ_OFFSET))\n \n-static vm_paddr_t einj_gpa;\n+static gpa_t einj_gpa;\n static void *einj_hva;\n static uint64_t einj_hpa;\n static bool far_invalid;\n@@ -254,7 +254,7 @@ static struct kvm_vm *vm_create_with_sea_handler(struct kvm_vcpu **vcpu)\n \tsize_t guest_page_size;\n \tsize_t alignment;\n \tuint64_t num_guest_pages;\n-\tvm_paddr_t start_gpa;\n+\tgpa_t start_gpa;\n \tenum vm_mem_backing_src_type src_type = VM_MEM_SRC_ANONYMOUS_HUGETLB_1GB;\n \tstruct kvm_vm *vm;\n \ndiff --git a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c b/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c\nindex e857a605f577..d64d434d3f06 100644\n--- a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c\n+++ b/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c\n@@ -23,7 +23,7 @@\n #define GIC_LPI_OFFSET\t8192\n \n static size_t nr_iterations = 1000;\n-static vm_paddr_t gpa_base;\n+static gpa_t gpa_base;\n \n static struct kvm_vm *vm;\n static struct kvm_vcpu **vcpus;\n@@ -35,14 +35,14 @@ static struct test_data {\n \tu32\t\tnr_devices;\n \tu32\t\tnr_event_ids;\n \n-\tvm_paddr_t\tdevice_table;\n-\tvm_paddr_t\tcollection_table;\n-\tvm_paddr_t\tcmdq_base;\n+\tgpa_t\t\tdevice_table;\n+\tgpa_t\t\tcollection_table;\n+\tgpa_t\t\tcmdq_base;\n \tvoid\t\t*cmdq_base_va;\n-\tvm_paddr_t\titt_tables;\n+\tgpa_t\t\titt_tables;\n \n-\tvm_paddr_t\tlpi_prop_table;\n-\tvm_paddr_t\tlpi_pend_tables;\n+\tgpa_t\t\tlpi_prop_table;\n+\tgpa_t\t\tlpi_pend_tables;\n } test_data = {\n \t.nr_cpus\t= 1,\n \t.nr_devices\t= 1,\n@@ -73,7 +73,7 @@ static void guest_setup_its_mappings(void)\n \t/* Round-robin the LPIs to all of the vCPUs in the VM */\n \tcoll_id = 0;\n \tfor (device_id = 0; device_id < nr_devices; device_id++) {\n-\t\tvm_paddr_t itt_base = test_data.itt_tables + (device_id * SZ_64K);\n+\t\tgpa_t itt_base = test_data.itt_tables + (device_id * SZ_64K);\n \n \t\tits_send_mapd_cmd(test_data.cmdq_base_va, device_id,\n \t\t\t\t itt_base, SZ_64K, true);\n@@ -188,7 +188,7 @@ static void setup_test_data(void)\n \tsize_t pages_per_64k = vm_calc_num_guest_pages(vm->mode, SZ_64K);\n \tu32 nr_devices = test_data.nr_devices;\n \tu32 nr_cpus = test_data.nr_cpus;\n-\tvm_paddr_t cmdq_base;\n+\tgpa_t cmdq_base;\n \n \ttest_data.device_table = vm_phy_pages_alloc(vm, pages_per_64k,\n \t\t\t\t\t\t gpa_base,\n@@ -224,7 +224,7 @@ static void setup_gic(void)\n \n static void signal_lpi(u32 device_id, u32 event_id)\n {\n-\tvm_paddr_t db_addr = GITS_BASE_GPA + GITS_TRANSLATER;\n+\tgpa_t db_addr = GITS_BASE_GPA + GITS_TRANSLATER;\n \n \tstruct kvm_msi msi = {\n \t\t.address_lo\t= db_addr,\ndiff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c\nindex 7627b328f18a..9b6b9a597175 100644\n--- a/tools/testing/selftests/kvm/dirty_log_test.c\n+++ b/tools/testing/selftests/kvm/dirty_log_test.c\n@@ -667,7 +667,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)\n \tvirt_map(vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages);\n \n \t/* Cache the HVA pointer of the region */\n-\thost_test_mem = addr_gpa2hva(vm, (vm_paddr_t)guest_test_phys_mem);\n+\thost_test_mem = addr_gpa2hva(vm, (gpa_t)guest_test_phys_mem);\n \n \t/* Export the shared variables to the guest */\n \tsync_global_to_guest(vm, host_page_size);\ndiff --git a/tools/testing/selftests/kvm/include/arm64/gic.h b/tools/testing/selftests/kvm/include/arm64/gic.h\nindex cc7a7f34ed37..6408f952cb64 100644\n--- a/tools/testing/selftests/kvm/include/arm64/gic.h\n+++ b/tools/testing/selftests/kvm/include/arm64/gic.h\n@@ -59,7 +59,7 @@ bool gic_irq_get_pending(unsigned int intid);\n void gic_irq_set_config(unsigned int intid, bool is_edge);\n void gic_irq_set_group(unsigned int intid, bool group);\n \n-void gic_rdist_enable_lpis(vm_paddr_t cfg_table, size_t cfg_table_size,\n-\t\t\t vm_paddr_t pend_table);\n+void gic_rdist_enable_lpis(gpa_t cfg_table, size_t cfg_table_size,\n+\t\t\t gpa_t pend_table);\n \n #endif /* SELFTEST_KVM_GIC_H */\ndiff --git a/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h b/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h\nindex 58feef3eb386..a43a407e2d5c 100644\n--- a/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h\n+++ b/tools/testing/selftests/kvm/include/arm64/gic_v3_its.h\n@@ -5,11 +5,10 @@\n \n #include \n \n-void its_init(vm_paddr_t coll_tbl, size_t coll_tbl_sz,\n-\t vm_paddr_t device_tbl, size_t device_tbl_sz,\n-\t vm_paddr_t cmdq, size_t cmdq_size);\n+void its_init(gpa_t coll_tbl, size_t coll_tbl_sz, gpa_t device_tbl,\n+\t size_t device_tbl_sz, gpa_t cmdq, size_t cmdq_size);\n \n-void its_send_mapd_cmd(void *cmdq_base, u32 device_id, vm_paddr_t itt_base,\n+void its_send_mapd_cmd(void *cmdq_base, u32 device_id, gpa_t itt_base,\n \t\t size_t itt_size, bool valid);\n void its_send_mapc_cmd(void *cmdq_base, u32 vcpu_id, u32 collection_id, bool valid);\n void its_send_mapti_cmd(void *cmdq_base, u32 device_id, u32 event_id,\ndiff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h\nindex 2378dd42c988..9f602c73fbb4 100644\n--- a/tools/testing/selftests/kvm/include/kvm_util.h\n+++ b/tools/testing/selftests/kvm/include/kvm_util.h\n@@ -111,7 +111,7 @@ struct kvm_vm {\n \tstruct sparsebit *vpages_valid;\n \tstruct sparsebit *vpages_mapped;\n \tbool has_irqchip;\n-\tvm_paddr_t ucall_mmio_addr;\n+\tgpa_t ucall_mmio_addr;\n \tgva_t handlers;\n \tuint32_t dirty_ring_size;\n \tuint64_t gpa_tag_mask;\n@@ -728,16 +728,16 @@ gva_t vm_vaddr_alloc_page(struct kvm_vm *vm);\n \n void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,\n \t unsigned int npages);\n-void *addr_gpa2hva(struct kvm_vm *vm, vm_paddr_t gpa);\n+void *addr_gpa2hva(struct kvm_vm *vm, gpa_t gpa);\n void *addr_gva2hva(struct kvm_vm *vm, gva_t gva);\n-vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva);\n-void *addr_gpa2alias(struct kvm_vm *vm, vm_paddr_t gpa);\n+gpa_t addr_hva2gpa(struct kvm_vm *vm, void *hva);\n+void *addr_gpa2alias(struct kvm_vm *vm, gpa_t gpa);\n \n #ifndef vcpu_arch_put_guest\n #define vcpu_arch_put_guest(mem, val) do { (mem) = (val); } while (0)\n #endif\n \n-static inline vm_paddr_t vm_untag_gpa(struct kvm_vm *vm, vm_paddr_t gpa)\n+static inline gpa_t vm_untag_gpa(struct kvm_vm *vm, gpa_t gpa)\n {\n \treturn gpa & ~vm->gpa_tag_mask;\n }\n@@ -988,15 +988,14 @@ void kvm_gsi_routing_write(struct kvm_vm *vm, struct kvm_irq_routing *routing);\n \n const char *exit_reason_str(unsigned int exit_reason);\n \n-vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min,\n-\t\t\t uint32_t memslot);\n-vm_paddr_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,\n-\t\t\t\tvm_paddr_t paddr_min, uint32_t memslot,\n-\t\t\t\tbool protected);\n-vm_paddr_t vm_alloc_page_table(struct kvm_vm *vm);\n+gpa_t vm_phy_page_alloc(struct kvm_vm *vm, gpa_t paddr_min, uint32_t memslot);\n+gpa_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,\n+\t\t\t gpa_t paddr_min, uint32_t memslot,\n+\t\t\t bool protected);\n+gpa_t vm_alloc_page_table(struct kvm_vm *vm);\n \n-static inline vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,\n-\t\t\t\t\t vm_paddr_t paddr_min, uint32_t memslot)\n+static inline gpa_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,\n+\t\t\t\t gpa_t paddr_min, uint32_t memslot)\n {\n \t/*\n \t * By default, allocate memory as protected for VMs that support\n@@ -1240,9 +1239,9 @@ static inline void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr\n * Returns the VM physical address of the translated VM virtual\n * address given by @gva.\n */\n-vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva);\n+gpa_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva);\n \n-static inline vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, gva_t gva)\n+static inline gpa_t addr_gva2gpa(struct kvm_vm *vm, gva_t gva)\n {\n \treturn addr_arch_gva2gpa(vm, gva);\n }\n@@ -1291,7 +1290,7 @@ void kvm_arch_vm_post_create(struct kvm_vm *vm, unsigned int nr_vcpus);\n void kvm_arch_vm_finalize_vcpus(struct kvm_vm *vm);\n void kvm_arch_vm_release(struct kvm_vm *vm);\n \n-bool vm_is_gpa_protected(struct kvm_vm *vm, vm_paddr_t paddr);\n+bool vm_is_gpa_protected(struct kvm_vm *vm, gpa_t paddr);\n \n uint32_t guest_get_vcpuid(void);\n \ndiff --git a/tools/testing/selftests/kvm/include/kvm_util_types.h b/tools/testing/selftests/kvm/include/kvm_util_types.h\nindex f27bd035ea10..1d9eedb4885e 100644\n--- a/tools/testing/selftests/kvm/include/kvm_util_types.h\n+++ b/tools/testing/selftests/kvm/include/kvm_util_types.h\n@@ -14,7 +14,7 @@\n #define __kvm_static_assert(expr, msg, ...) _Static_assert(expr, msg)\n #define kvm_static_assert(expr, ...) __kvm_static_assert(expr, ##__VA_ARGS__, #expr)\n \n-typedef uint64_t vm_paddr_t; /* Virtual Machine (Guest) physical address */\n+typedef uint64_t gpa_t; /* Virtual Machine (Guest) physical address */\n typedef uint64_t gva_t; /* Virtual Machine (Guest) virtual address */\n \n #define INVALID_GPA (~(uint64_t)0)\ndiff --git a/tools/testing/selftests/kvm/include/riscv/ucall.h b/tools/testing/selftests/kvm/include/riscv/ucall.h\nindex 41d56254968e..2de7c6a36096 100644\n--- a/tools/testing/selftests/kvm/include/riscv/ucall.h\n+++ b/tools/testing/selftests/kvm/include/riscv/ucall.h\n@@ -7,7 +7,7 @@\n \n #define UCALL_EXIT_REASON KVM_EXIT_RISCV_SBI\n \n-static inline void ucall_arch_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa)\n+static inline void ucall_arch_init(struct kvm_vm *vm, gpa_t mmio_gpa)\n {\n }\n \ndiff --git a/tools/testing/selftests/kvm/include/s390/ucall.h b/tools/testing/selftests/kvm/include/s390/ucall.h\nindex befee84c4609..3907d629304f 100644\n--- a/tools/testing/selftests/kvm/include/s390/ucall.h\n+++ b/tools/testing/selftests/kvm/include/s390/ucall.h\n@@ -6,7 +6,7 @@\n \n #define UCALL_EXIT_REASON KVM_EXIT_S390_SIEIC\n \n-static inline void ucall_arch_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa)\n+static inline void ucall_arch_init(struct kvm_vm *vm, gpa_t mmio_gpa)\n {\n }\n \ndiff --git a/tools/testing/selftests/kvm/include/ucall_common.h b/tools/testing/selftests/kvm/include/ucall_common.h\nindex e5499f170834..1db399c00d02 100644\n--- a/tools/testing/selftests/kvm/include/ucall_common.h\n+++ b/tools/testing/selftests/kvm/include/ucall_common.h\n@@ -29,7 +29,7 @@ struct ucall {\n \tstruct ucall *hva;\n };\n \n-void ucall_arch_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa);\n+void ucall_arch_init(struct kvm_vm *vm, gpa_t mmio_gpa);\n void ucall_arch_do_ucall(gva_t uc);\n void *ucall_arch_get_ucall(struct kvm_vcpu *vcpu);\n \n@@ -39,7 +39,7 @@ __printf(5, 6) void ucall_assert(uint64_t cmd, const char *exp,\n \t\t\t\t const char *file, unsigned int line,\n \t\t\t\t const char *fmt, ...);\n uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc);\n-void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa);\n+void ucall_init(struct kvm_vm *vm, gpa_t mmio_gpa);\n int ucall_nr_pages_required(uint64_t page_size);\n \n /*\ndiff --git a/tools/testing/selftests/kvm/include/x86/sev.h b/tools/testing/selftests/kvm/include/x86/sev.h\nindex 008b4169f5e2..289ff5b3f10c 100644\n--- a/tools/testing/selftests/kvm/include/x86/sev.h\n+++ b/tools/testing/selftests/kvm/include/x86/sev.h\n@@ -120,7 +120,7 @@ static inline void sev_register_encrypted_memory(struct kvm_vm *vm,\n \tvm_ioctl(vm, KVM_MEMORY_ENCRYPT_REG_REGION, &range);\n }\n \n-static inline void sev_launch_update_data(struct kvm_vm *vm, vm_paddr_t gpa,\n+static inline void sev_launch_update_data(struct kvm_vm *vm, gpa_t gpa,\n \t\t\t\t\t uint64_t size)\n {\n \tstruct kvm_sev_launch_update_data update_data = {\n@@ -131,7 +131,7 @@ static inline void sev_launch_update_data(struct kvm_vm *vm, vm_paddr_t gpa,\n \tvm_sev_ioctl(vm, KVM_SEV_LAUNCH_UPDATE_DATA, &update_data);\n }\n \n-static inline void snp_launch_update_data(struct kvm_vm *vm, vm_paddr_t gpa,\n+static inline void snp_launch_update_data(struct kvm_vm *vm, gpa_t gpa,\n \t\t\t\t\t uint64_t hva, uint64_t size, uint8_t type)\n {\n \tstruct kvm_sev_snp_launch_update update_data = {\ndiff --git a/tools/testing/selftests/kvm/include/x86/ucall.h b/tools/testing/selftests/kvm/include/x86/ucall.h\nindex d3825dcc3cd9..0e4950041e3e 100644\n--- a/tools/testing/selftests/kvm/include/x86/ucall.h\n+++ b/tools/testing/selftests/kvm/include/x86/ucall.h\n@@ -6,7 +6,7 @@\n \n #define UCALL_EXIT_REASON KVM_EXIT_IO\n \n-static inline void ucall_arch_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa)\n+static inline void ucall_arch_init(struct kvm_vm *vm, gpa_t mmio_gpa)\n {\n }\n \ndiff --git a/tools/testing/selftests/kvm/kvm_page_table_test.c b/tools/testing/selftests/kvm/kvm_page_table_test.c\nindex 61915fc89c17..e8a60d5ccbe6 100644\n--- a/tools/testing/selftests/kvm/kvm_page_table_test.c\n+++ b/tools/testing/selftests/kvm/kvm_page_table_test.c\n@@ -281,7 +281,7 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)\n \tvirt_map(vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages);\n \n \t/* Cache the HVA pointer of the region */\n-\thost_test_mem = addr_gpa2hva(vm, (vm_paddr_t)guest_test_phys_mem);\n+\thost_test_mem = addr_gpa2hva(vm, (gpa_t)guest_test_phys_mem);\n \n \t/* Export shared structure test_args to guest */\n \tsync_global_to_guest(vm, test_args);\ndiff --git a/tools/testing/selftests/kvm/lib/arm64/gic_v3.c b/tools/testing/selftests/kvm/lib/arm64/gic_v3.c\nindex 50754a27f493..ae3959f3bb11 100644\n--- a/tools/testing/selftests/kvm/lib/arm64/gic_v3.c\n+++ b/tools/testing/selftests/kvm/lib/arm64/gic_v3.c\n@@ -424,8 +424,8 @@ const struct gic_common_ops gicv3_ops = {\n \t.gic_irq_set_group = gicv3_set_group,\n };\n \n-void gic_rdist_enable_lpis(vm_paddr_t cfg_table, size_t cfg_table_size,\n-\t\t\t vm_paddr_t pend_table)\n+void gic_rdist_enable_lpis(gpa_t cfg_table, size_t cfg_table_size,\n+\t\t\t gpa_t pend_table)\n {\n \tvolatile void *rdist_base = gicr_base_cpu(guest_get_vcpuid());\n \ndiff --git a/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c b/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c\nindex 7f9fdcf42ae6..1188b578121d 100644\n--- a/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c\n+++ b/tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c\n@@ -54,7 +54,7 @@ static unsigned long its_find_baser(unsigned int type)\n \treturn -1;\n }\n \n-static void its_install_table(unsigned int type, vm_paddr_t base, size_t size)\n+static void its_install_table(unsigned int type, gpa_t base, size_t size)\n {\n \tunsigned long offset = its_find_baser(type);\n \tu64 baser;\n@@ -69,7 +69,7 @@ static void its_install_table(unsigned int type, vm_paddr_t base, size_t size)\n \tits_write_u64(offset, baser);\n }\n \n-static void its_install_cmdq(vm_paddr_t base, size_t size)\n+static void its_install_cmdq(gpa_t base, size_t size)\n {\n \tu64 cbaser;\n \n@@ -82,9 +82,8 @@ static void its_install_cmdq(vm_paddr_t base, size_t size)\n \tits_write_u64(GITS_CBASER, cbaser);\n }\n \n-void its_init(vm_paddr_t coll_tbl, size_t coll_tbl_sz,\n-\t vm_paddr_t device_tbl, size_t device_tbl_sz,\n-\t vm_paddr_t cmdq, size_t cmdq_size)\n+void its_init(gpa_t coll_tbl, size_t coll_tbl_sz, gpa_t device_tbl,\n+\t size_t device_tbl_sz, gpa_t cmdq, size_t cmdq_size)\n {\n \tu32 ctlr;\n \n@@ -204,7 +203,7 @@ static void its_send_cmd(void *cmdq_base, struct its_cmd_block *cmd)\n \t}\n }\n \n-void its_send_mapd_cmd(void *cmdq_base, u32 device_id, vm_paddr_t itt_base,\n+void its_send_mapd_cmd(void *cmdq_base, u32 device_id, gpa_t itt_base,\n \t\t size_t itt_size, bool valid)\n {\n \tstruct its_cmd_block cmd = {};\ndiff --git a/tools/testing/selftests/kvm/lib/arm64/processor.c b/tools/testing/selftests/kvm/lib/arm64/processor.c\nindex 3645acae09ce..0e8603788134 100644\n--- a/tools/testing/selftests/kvm/lib/arm64/processor.c\n+++ b/tools/testing/selftests/kvm/lib/arm64/processor.c\n@@ -230,7 +230,7 @@ uint64_t *virt_get_pte_hva(struct kvm_vm *vm, gva_t gva)\n \treturn virt_get_pte_hva_at_level(vm, gva, 3);\n }\n \n-vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n+gpa_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n {\n \tuint64_t *ptep = virt_get_pte_hva(vm, gva);\n \ndiff --git a/tools/testing/selftests/kvm/lib/arm64/ucall.c b/tools/testing/selftests/kvm/lib/arm64/ucall.c\nindex 9ea747982d00..5f85fa7a9449 100644\n--- a/tools/testing/selftests/kvm/lib/arm64/ucall.c\n+++ b/tools/testing/selftests/kvm/lib/arm64/ucall.c\n@@ -8,7 +8,7 @@\n \n gva_t *ucall_exit_mmio_addr;\n \n-void ucall_arch_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa)\n+void ucall_arch_init(struct kvm_vm *vm, gpa_t mmio_gpa)\n {\n \tgva_t mmio_gva = vm_vaddr_unused_gap(vm, vm->page_size, KVM_UTIL_MIN_VADDR);\n \ndiff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c\nindex 04a59603e93e..89c4e6f01739 100644\n--- a/tools/testing/selftests/kvm/lib/kvm_util.c\n+++ b/tools/testing/selftests/kvm/lib/kvm_util.c\n@@ -1457,9 +1457,9 @@ static gva_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, gva_t vaddr_min,\n \tuint64_t pages = (sz >> vm->page_shift) + ((sz % vm->page_size) != 0);\n \n \tvirt_pgd_alloc(vm);\n-\tvm_paddr_t paddr = __vm_phy_pages_alloc(vm, pages,\n-\t\t\t\t\t\tKVM_UTIL_MIN_PFN * vm->page_size,\n-\t\t\t\t\t\tvm->memslots[type], protected);\n+\tgpa_t paddr = __vm_phy_pages_alloc(vm, pages,\n+\t\t\t\t\t KVM_UTIL_MIN_PFN * vm->page_size,\n+\t\t\t\t\t vm->memslots[type], protected);\n \n \t/*\n \t * Find an unused range of virtual page addresses of at least\n@@ -1607,7 +1607,7 @@ void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,\n * address providing the memory to the vm physical address is returned.\n * A TEST_ASSERT failure occurs if no region containing gpa exists.\n */\n-void *addr_gpa2hva(struct kvm_vm *vm, vm_paddr_t gpa)\n+void *addr_gpa2hva(struct kvm_vm *vm, gpa_t gpa)\n {\n \tstruct userspace_mem_region *region;\n \n@@ -1640,7 +1640,7 @@ void *addr_gpa2hva(struct kvm_vm *vm, vm_paddr_t gpa)\n * VM physical address is returned. A TEST_ASSERT failure occurs if no\n * region containing hva exists.\n */\n-vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva)\n+gpa_t addr_hva2gpa(struct kvm_vm *vm, void *hva)\n {\n \tstruct rb_node *node;\n \n@@ -1651,7 +1651,7 @@ vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva)\n \t\tif (hva >= region->host_mem) {\n \t\t\tif (hva <= (region->host_mem\n \t\t\t\t+ region->region.memory_size - 1))\n-\t\t\t\treturn (vm_paddr_t)((uintptr_t)\n+\t\t\t\treturn (gpa_t)((uintptr_t)\n \t\t\t\t\tregion->region.guest_phys_addr\n \t\t\t\t\t+ (hva - (uintptr_t)region->host_mem));\n \n@@ -1683,7 +1683,7 @@ vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva)\n * memory without mapping said memory in the guest's address space. And, for\n * userfaultfd-based demand paging, to do so without triggering userfaults.\n */\n-void *addr_gpa2alias(struct kvm_vm *vm, vm_paddr_t gpa)\n+void *addr_gpa2alias(struct kvm_vm *vm, gpa_t gpa)\n {\n \tstruct userspace_mem_region *region;\n \tuintptr_t offset;\n@@ -2087,9 +2087,9 @@ const char *exit_reason_str(unsigned int exit_reason)\n * and their base address is returned. A TEST_ASSERT failure occurs if\n * not enough pages are available at or above paddr_min.\n */\n-vm_paddr_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,\n-\t\t\t\tvm_paddr_t paddr_min, uint32_t memslot,\n-\t\t\t\tbool protected)\n+gpa_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,\n+\t\t\t gpa_t paddr_min, uint32_t memslot,\n+\t\t\t bool protected)\n {\n \tstruct userspace_mem_region *region;\n \tsparsebit_idx_t pg, base;\n@@ -2133,13 +2133,12 @@ vm_paddr_t __vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,\n \treturn base * vm->page_size;\n }\n \n-vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min,\n-\t\t\t uint32_t memslot)\n+gpa_t vm_phy_page_alloc(struct kvm_vm *vm, gpa_t paddr_min, uint32_t memslot)\n {\n \treturn vm_phy_pages_alloc(vm, 1, paddr_min, memslot);\n }\n \n-vm_paddr_t vm_alloc_page_table(struct kvm_vm *vm)\n+gpa_t vm_alloc_page_table(struct kvm_vm *vm)\n {\n \treturn vm_phy_page_alloc(vm, KVM_GUEST_PAGE_TABLE_MIN_PADDR,\n \t\t\t\t vm->memslots[MEM_REGION_PT]);\n@@ -2353,7 +2352,7 @@ void __attribute((constructor)) kvm_selftest_init(void)\n \tkvm_selftest_arch_init();\n }\n \n-bool vm_is_gpa_protected(struct kvm_vm *vm, vm_paddr_t paddr)\n+bool vm_is_gpa_protected(struct kvm_vm *vm, gpa_t paddr)\n {\n \tsparsebit_idx_t pg = 0;\n \tstruct userspace_mem_region *region;\ndiff --git a/tools/testing/selftests/kvm/lib/loongarch/processor.c b/tools/testing/selftests/kvm/lib/loongarch/processor.c\nindex 3b67720fbbe1..28a384e9704f 100644\n--- a/tools/testing/selftests/kvm/lib/loongarch/processor.c\n+++ b/tools/testing/selftests/kvm/lib/loongarch/processor.c\n@@ -12,7 +12,7 @@\n #define LOONGARCH_PAGE_TABLE_PHYS_MIN\t\t0x200000\n #define LOONGARCH_GUEST_STACK_VADDR_MIN\t\t0x200000\n \n-static vm_paddr_t invalid_pgtable[4];\n+static gpa_t invalid_pgtable[4];\n static gva_t exception_handlers;\n \n static uint64_t virt_pte_index(struct kvm_vm *vm, gva_t gva, int level)\n@@ -35,7 +35,7 @@ static uint64_t ptrs_per_pte(struct kvm_vm *vm)\n \treturn 1 << (vm->page_shift - 3);\n }\n \n-static void virt_set_pgtable(struct kvm_vm *vm, vm_paddr_t table, vm_paddr_t child)\n+static void virt_set_pgtable(struct kvm_vm *vm, gpa_t table, gpa_t child)\n {\n \tuint64_t *ptep;\n \tint i, ptrs_per_pte;\n@@ -49,7 +49,7 @@ static void virt_set_pgtable(struct kvm_vm *vm, vm_paddr_t table, vm_paddr_t chi\n void virt_arch_pgd_alloc(struct kvm_vm *vm)\n {\n \tint i;\n-\tvm_paddr_t child, table;\n+\tgpa_t child, table;\n \n \tif (vm->mmu.pgd_created)\n \t\treturn;\n@@ -76,7 +76,7 @@ static uint64_t *virt_populate_pte(struct kvm_vm *vm, gva_t gva, int alloc)\n {\n \tint level;\n \tuint64_t *ptep;\n-\tvm_paddr_t child;\n+\tgpa_t child;\n \n \tif (!vm->mmu.pgd_created)\n \t\tgoto unmapped_gva;\n@@ -106,7 +106,7 @@ static uint64_t *virt_populate_pte(struct kvm_vm *vm, gva_t gva, int alloc)\n \texit(EXIT_FAILURE);\n }\n \n-vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n+gpa_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n {\n \tuint64_t *ptep;\n \ndiff --git a/tools/testing/selftests/kvm/lib/loongarch/ucall.c b/tools/testing/selftests/kvm/lib/loongarch/ucall.c\nindex a5aa568f437b..2c8abe9f5382 100644\n--- a/tools/testing/selftests/kvm/lib/loongarch/ucall.c\n+++ b/tools/testing/selftests/kvm/lib/loongarch/ucall.c\n@@ -11,7 +11,7 @@\n */\n gva_t *ucall_exit_mmio_addr;\n \n-void ucall_arch_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa)\n+void ucall_arch_init(struct kvm_vm *vm, gpa_t mmio_gpa)\n {\n \tgva_t mmio_gva = vm_vaddr_unused_gap(vm, vm->page_size, KVM_UTIL_MIN_VADDR);\n \ndiff --git a/tools/testing/selftests/kvm/lib/memstress.c b/tools/testing/selftests/kvm/lib/memstress.c\nindex 1ea735d66e15..b7bfeade85f7 100644\n--- a/tools/testing/selftests/kvm/lib/memstress.c\n+++ b/tools/testing/selftests/kvm/lib/memstress.c\n@@ -203,7 +203,7 @@ struct kvm_vm *memstress_create_vm(enum vm_guest_mode mode, int nr_vcpus,\n \t/* Add extra memory slots for testing */\n \tfor (i = 0; i < slots; i++) {\n \t\tuint64_t region_pages = guest_num_pages / slots;\n-\t\tvm_paddr_t region_start = args->gpa + region_pages * args->guest_page_size * i;\n+\t\tgpa_t region_start = args->gpa + region_pages * args->guest_page_size * i;\n \n \t\tvm_userspace_mem_region_add(vm, backing_src, region_start,\n \t\t\t\t\t MEMSTRESS_MEM_SLOT_INDEX + i,\ndiff --git a/tools/testing/selftests/kvm/lib/riscv/processor.c b/tools/testing/selftests/kvm/lib/riscv/processor.c\nindex 552628dda4a0..25749439fdbf 100644\n--- a/tools/testing/selftests/kvm/lib/riscv/processor.c\n+++ b/tools/testing/selftests/kvm/lib/riscv/processor.c\n@@ -119,7 +119,7 @@ void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)\n \t\tPGTBL_PTE_PERM_MASK | PGTBL_PTE_VALID_MASK;\n }\n \n-vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n+gpa_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n {\n \tuint64_t *ptep;\n \tint level = vm->mmu.pgtable_levels - 1;\ndiff --git a/tools/testing/selftests/kvm/lib/s390/processor.c b/tools/testing/selftests/kvm/lib/s390/processor.c\nindex e8d3c1d333d5..153cef5c2328 100644\n--- a/tools/testing/selftests/kvm/lib/s390/processor.c\n+++ b/tools/testing/selftests/kvm/lib/s390/processor.c\n@@ -12,7 +12,7 @@\n \n void virt_arch_pgd_alloc(struct kvm_vm *vm)\n {\n-\tvm_paddr_t paddr;\n+\tgpa_t paddr;\n \n \tTEST_ASSERT(vm->page_size == PAGE_SIZE, \"Unsupported page size: 0x%x\",\n \t\t vm->page_size);\n@@ -86,7 +86,7 @@ void virt_arch_pg_map(struct kvm_vm *vm, uint64_t gva, uint64_t gpa)\n \tentry[idx] = gpa;\n }\n \n-vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n+gpa_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n {\n \tint ri, idx;\n \tuint64_t *entry;\ndiff --git a/tools/testing/selftests/kvm/lib/ucall_common.c b/tools/testing/selftests/kvm/lib/ucall_common.c\nindex 997444178c78..9afcae844d72 100644\n--- a/tools/testing/selftests/kvm/lib/ucall_common.c\n+++ b/tools/testing/selftests/kvm/lib/ucall_common.c\n@@ -25,7 +25,7 @@ int ucall_nr_pages_required(uint64_t page_size)\n */\n static struct ucall_header *ucall_pool;\n \n-void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa)\n+void ucall_init(struct kvm_vm *vm, gpa_t mmio_gpa)\n {\n \tstruct ucall_header *hdr;\n \tstruct ucall *uc;\ndiff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testing/selftests/kvm/lib/x86/processor.c\nindex 7a01f83cab0b..d1de157fedff 100644\n--- a/tools/testing/selftests/kvm/lib/x86/processor.c\n+++ b/tools/testing/selftests/kvm/lib/x86/processor.c\n@@ -618,7 +618,7 @@ static void kvm_seg_set_kernel_data_64bit(struct kvm_segment *segp)\n \tsegp->present = true;\n }\n \n-vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n+gpa_t addr_arch_gva2gpa(struct kvm_vm *vm, gva_t gva)\n {\n \tint level = PG_LEVEL_NONE;\n \tuint64_t *pte = __vm_get_page_table_entry(vm, &vm->mmu, gva, &level);\ndiff --git a/tools/testing/selftests/kvm/lib/x86/sev.c b/tools/testing/selftests/kvm/lib/x86/sev.c\nindex c3a9838f4806..aecef6048ff1 100644\n--- a/tools/testing/selftests/kvm/lib/x86/sev.c\n+++ b/tools/testing/selftests/kvm/lib/x86/sev.c\n@@ -18,7 +18,7 @@ static void encrypt_region(struct kvm_vm *vm, struct userspace_mem_region *regio\n \t\t\t uint8_t page_type, bool private)\n {\n \tconst struct sparsebit *protected_phy_pages = region->protected_phy_pages;\n-\tconst vm_paddr_t gpa_base = region->region.guest_phys_addr;\n+\tconst gpa_t gpa_base = region->region.guest_phys_addr;\n \tconst sparsebit_idx_t lowest_page_in_region = gpa_base >> vm->page_shift;\n \tsparsebit_idx_t i, j;\n \ndiff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c\nindex 8366c11131ff..207dc5cd36f0 100644\n--- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c\n+++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c\n@@ -24,7 +24,7 @@ union sbi_pmu_ctr_info ctrinfo_arr[RISCV_MAX_PMU_COUNTERS];\n /* Snapshot shared memory data */\n #define PMU_SNAPSHOT_GPA_BASE\t\tBIT(30)\n static void *snapshot_gva;\n-static vm_paddr_t snapshot_gpa;\n+static gpa_t snapshot_gpa;\n \n static int vcpu_shared_irq_count;\n static int counter_in_use;\n@@ -259,7 +259,7 @@ static inline void verify_sbi_requirement_assert(void)\n \t\t__GUEST_ASSERT(0, \"SBI implementation version doesn't support PMU Snapshot\");\n }\n \n-static void snapshot_set_shmem(vm_paddr_t gpa, unsigned long flags)\n+static void snapshot_set_shmem(gpa_t gpa, unsigned long flags)\n {\n \tunsigned long lo = (unsigned long)gpa;\n #if __riscv_xlen == 32\ndiff --git a/tools/testing/selftests/kvm/s390/irq_routing.c b/tools/testing/selftests/kvm/s390/irq_routing.c\nindex 7819a0af19a8..f3839284ac08 100644\n--- a/tools/testing/selftests/kvm/s390/irq_routing.c\n+++ b/tools/testing/selftests/kvm/s390/irq_routing.c\n@@ -27,7 +27,7 @@ static void test(void)\n \tstruct kvm_irq_routing *routing;\n \tstruct kvm_vcpu *vcpu;\n \tstruct kvm_vm *vm;\n-\tvm_paddr_t mem;\n+\tgpa_t mem;\n \tint ret;\n \n \tstruct kvm_irq_routing_entry ue = {\ndiff --git a/tools/testing/selftests/kvm/s390/ucontrol_test.c b/tools/testing/selftests/kvm/s390/ucontrol_test.c\nindex 50bc1c38225a..f773ba0f4641 100644\n--- a/tools/testing/selftests/kvm/s390/ucontrol_test.c\n+++ b/tools/testing/selftests/kvm/s390/ucontrol_test.c\n@@ -111,7 +111,7 @@ FIXTURE(uc_kvm)\n \tuintptr_t base_hva;\n \tuintptr_t code_hva;\n \tint kvm_run_size;\n-\tvm_paddr_t pgd;\n+\tgpa_t pgd;\n \tvoid *vm_mem;\n \tint vcpu_fd;\n \tint kvm_fd;\ndiff --git a/tools/testing/selftests/kvm/steal_time.c b/tools/testing/selftests/kvm/steal_time.c\nindex d2a513ec7dd5..f461eb7a0f6e 100644\n--- a/tools/testing/selftests/kvm/steal_time.c\n+++ b/tools/testing/selftests/kvm/steal_time.c\n@@ -239,7 +239,7 @@ static void check_steal_time_uapi(void)\n /* SBI STA shmem must have 64-byte alignment */\n #define STEAL_TIME_SIZE\t\t((sizeof(struct sta_struct) + 63) & ~63)\n \n-static vm_paddr_t st_gpa[NR_VCPUS];\n+static gpa_t st_gpa[NR_VCPUS];\n \n struct sta_struct {\n \tuint32_t sequence;\n@@ -249,7 +249,7 @@ struct sta_struct {\n \tuint8_t pad[47];\n } __packed;\n \n-static void sta_set_shmem(vm_paddr_t gpa, unsigned long flags)\n+static void sta_set_shmem(gpa_t gpa, unsigned long flags)\n {\n \tunsigned long lo = (unsigned long)gpa;\n #if __riscv_xlen == 32\ndiff --git a/tools/testing/selftests/kvm/x86/hyperv_clock.c b/tools/testing/selftests/kvm/x86/hyperv_clock.c\nindex b68844924dc5..6bb1ca11256f 100644\n--- a/tools/testing/selftests/kvm/x86/hyperv_clock.c\n+++ b/tools/testing/selftests/kvm/x86/hyperv_clock.c\n@@ -98,7 +98,7 @@ static inline void check_tsc_msr_tsc_page(struct ms_hyperv_tsc_page *tsc_page)\n \tGUEST_ASSERT(r2 >= t1 && r2 - t2 < 100000);\n }\n \n-static void guest_main(struct ms_hyperv_tsc_page *tsc_page, vm_paddr_t tsc_page_gpa)\n+static void guest_main(struct ms_hyperv_tsc_page *tsc_page, gpa_t tsc_page_gpa)\n {\n \tu64 tsc_scale, tsc_offset;\n \ndiff --git a/tools/testing/selftests/kvm/x86/hyperv_extended_hypercalls.c b/tools/testing/selftests/kvm/x86/hyperv_extended_hypercalls.c\nindex 7762c168bbf3..5f561fcda55a 100644\n--- a/tools/testing/selftests/kvm/x86/hyperv_extended_hypercalls.c\n+++ b/tools/testing/selftests/kvm/x86/hyperv_extended_hypercalls.c\n@@ -15,7 +15,7 @@\n /* Any value is fine */\n #define EXT_CAPABILITIES 0xbull\n \n-static void guest_code(vm_paddr_t in_pg_gpa, vm_paddr_t out_pg_gpa,\n+static void guest_code(gpa_t in_pg_gpa, gpa_t out_pg_gpa,\n \t\t gva_t out_pg_gva)\n {\n \tuint64_t *output_gva;\ndiff --git a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c b/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c\nindex 7f58a5efe6d5..2de01da9d11d 100644\n--- a/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c\n+++ b/tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c\n@@ -62,7 +62,7 @@ struct hv_tlb_flush_ex {\n */\n struct test_data {\n \tgva_t hcall_gva;\n-\tvm_paddr_t hcall_gpa;\n+\tgpa_t hcall_gpa;\n \tgva_t test_pages;\n \tgva_t test_pages_pte[NTEST_PAGES];\n };\n@@ -133,7 +133,7 @@ static void set_expected_val(void *addr, u64 val, int vcpu_id)\n * Update PTEs swapping two test pages.\n * TODO: use swap()/xchg() when these are provided.\n */\n-static void swap_two_test_pages(vm_paddr_t pte_gva1, vm_paddr_t pte_gva2)\n+static void swap_two_test_pages(gpa_t pte_gva1, gpa_t pte_gva2)\n {\n \tuint64_t tmp = *(uint64_t *)pte_gva1;\n \n@@ -201,7 +201,7 @@ static void sender_guest_code(gva_t test_data)\n \tstruct test_data *data = (struct test_data *)test_data;\n \tstruct hv_tlb_flush *flush = (struct hv_tlb_flush *)data->hcall_gva;\n \tstruct hv_tlb_flush_ex *flush_ex = (struct hv_tlb_flush_ex *)data->hcall_gva;\n-\tvm_paddr_t hcall_gpa = data->hcall_gpa;\n+\tgpa_t hcall_gpa = data->hcall_gpa;\n \tint i, stage = 1;\n \n \twrmsr(HV_X64_MSR_GUEST_OS_ID, HYPERV_LINUX_OS_ID);\n@@ -582,7 +582,7 @@ int main(int argc, char *argv[])\n \tstruct kvm_vcpu *vcpu[3];\n \tpthread_t threads[2];\n \tgva_t test_data_page, gva;\n-\tvm_paddr_t gpa;\n+\tgpa_t gpa;\n \tuint64_t *pte;\n \tstruct test_data *data;\n \tstruct ucall uc;\ndiff --git a/tools/testing/selftests/kvm/x86/kvm_clock_test.c b/tools/testing/selftests/kvm/x86/kvm_clock_test.c\nindex e14f7330302e..5721e035e38c 100644\n--- a/tools/testing/selftests/kvm/x86/kvm_clock_test.c\n+++ b/tools/testing/selftests/kvm/x86/kvm_clock_test.c\n@@ -31,7 +31,7 @@ static struct test_case test_cases[] = {\n #define GUEST_SYNC_CLOCK(__stage, __val)\t\t\t\\\n \t\tGUEST_SYNC_ARGS(__stage, __val, 0, 0, 0)\n \n-static void guest_main(vm_paddr_t pvti_pa, struct pvclock_vcpu_time_info *pvti)\n+static void guest_main(gpa_t pvti_pa, struct pvclock_vcpu_time_info *pvti)\n {\n \tint i;\n \n@@ -136,7 +136,7 @@ int main(void)\n {\n \tstruct kvm_vcpu *vcpu;\n \tgva_t pvti_gva;\n-\tvm_paddr_t pvti_gpa;\n+\tgpa_t pvti_gpa;\n \tstruct kvm_vm *vm;\n \tint flags;\n \ndiff --git a/tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c b/tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c\nindex 4ffa11a6bcd8..f13dee317383 100644\n--- a/tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c\n+++ b/tools/testing/selftests/kvm/x86/vmx_nested_la57_state_test.c\n@@ -30,7 +30,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)\n #define L2_GUEST_STACK_SIZE 64\n \tunsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];\n \tu64 guest_cr4;\n-\tvm_paddr_t pml5_pa, pml4_pa;\n+\tgpa_t pml5_pa, pml4_pa;\n \tu64 *pml5;\n \tu64 exit_reason;\n \n","prefixes":["v3","02/19"]}