From: Ricardo Koller <ricarkol@google.com> To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, drjones@redhat.com Cc: maz@kernel.org, bgardon@google.com, pbonzini@redhat.com, axelrasmussen@google.com Subject: [PATCH 03/11] KVM: selftests: aarch64: Add vm_get_pte_gpa library function Date: Thu, 10 Mar 2022 22:01:59 -0800 [thread overview] Message-ID: <20220311060207.2438667-4-ricarkol@google.com> (raw) In-Reply-To: <20220311060207.2438667-1-ricarkol@google.com> Add a library function (in-guest) to get the GPA of the PTE of a particular GVA. This will be used in a future commit by a test to clear and check the AF (access flag) of a particular page. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- .../selftests/kvm/include/aarch64/processor.h | 2 ++ .../selftests/kvm/lib/aarch64/processor.c | 24 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h index 8f9f46979a00..caa572d83062 100644 --- a/tools/testing/selftests/kvm/include/aarch64/processor.h +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h @@ -125,6 +125,8 @@ void vm_install_exception_handler(struct kvm_vm *vm, void vm_install_sync_handler(struct kvm_vm *vm, int vector, int ec, handler_fn handler); +vm_paddr_t vm_get_pte_gpa(struct kvm_vm *vm, vm_vaddr_t gva); + static inline void cpu_relax(void) { asm volatile("yield" ::: "memory"); diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c index 9343d82519b4..ee006d354b79 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -139,7 +139,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr) _virt_pg_map(vm, vaddr, paddr, attr_idx); } -vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) +vm_paddr_t vm_get_pte_gpa(struct kvm_vm *vm, vm_vaddr_t gva) { uint64_t *ptep; @@ -162,7 +162,7 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) goto unmapped_gva; /* fall through */ case 2: - ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pte_index(vm, gva) * 8; + ptep = (uint64_t *)(pte_addr(vm, *ptep) + pte_index(vm, gva) * 8); if (!ptep) goto unmapped_gva; break; @@ -170,6 +170,26 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) TEST_FAIL("Page table levels must be 2, 3, or 4"); } + return (vm_paddr_t)ptep; + +unmapped_gva: + TEST_FAIL("No mapping for vm virtual address, gva: 0x%lx", gva); + exit(1); +} + +vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) +{ + uint64_t *ptep; + vm_paddr_t ptep_gpa; + + ptep_gpa = vm_get_pte_gpa(vm, gva); + if (!ptep_gpa) + goto unmapped_gva; + + ptep = addr_gpa2hva(vm, ptep_gpa); + if (!ptep) + goto unmapped_gva; + return pte_addr(vm, *ptep) + (gva & (vm->page_size - 1)); unmapped_gva: -- 2.35.1.723.g4982287a31-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Ricardo Koller <ricarkol@google.com> To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, drjones@redhat.com Cc: pbonzini@redhat.com, maz@kernel.org, alexandru.elisei@arm.com, eric.auger@redhat.com, oupton@google.com, reijiw@google.com, rananta@google.com, bgardon@google.com, axelrasmussen@google.com, Ricardo Koller <ricarkol@google.com> Subject: [PATCH 03/11] KVM: selftests: aarch64: Add vm_get_pte_gpa library function Date: Thu, 10 Mar 2022 22:01:59 -0800 [thread overview] Message-ID: <20220311060207.2438667-4-ricarkol@google.com> (raw) In-Reply-To: <20220311060207.2438667-1-ricarkol@google.com> Add a library function (in-guest) to get the GPA of the PTE of a particular GVA. This will be used in a future commit by a test to clear and check the AF (access flag) of a particular page. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- .../selftests/kvm/include/aarch64/processor.h | 2 ++ .../selftests/kvm/lib/aarch64/processor.c | 24 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h index 8f9f46979a00..caa572d83062 100644 --- a/tools/testing/selftests/kvm/include/aarch64/processor.h +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h @@ -125,6 +125,8 @@ void vm_install_exception_handler(struct kvm_vm *vm, void vm_install_sync_handler(struct kvm_vm *vm, int vector, int ec, handler_fn handler); +vm_paddr_t vm_get_pte_gpa(struct kvm_vm *vm, vm_vaddr_t gva); + static inline void cpu_relax(void) { asm volatile("yield" ::: "memory"); diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c index 9343d82519b4..ee006d354b79 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -139,7 +139,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr) _virt_pg_map(vm, vaddr, paddr, attr_idx); } -vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) +vm_paddr_t vm_get_pte_gpa(struct kvm_vm *vm, vm_vaddr_t gva) { uint64_t *ptep; @@ -162,7 +162,7 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) goto unmapped_gva; /* fall through */ case 2: - ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pte_index(vm, gva) * 8; + ptep = (uint64_t *)(pte_addr(vm, *ptep) + pte_index(vm, gva) * 8); if (!ptep) goto unmapped_gva; break; @@ -170,6 +170,26 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) TEST_FAIL("Page table levels must be 2, 3, or 4"); } + return (vm_paddr_t)ptep; + +unmapped_gva: + TEST_FAIL("No mapping for vm virtual address, gva: 0x%lx", gva); + exit(1); +} + +vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) +{ + uint64_t *ptep; + vm_paddr_t ptep_gpa; + + ptep_gpa = vm_get_pte_gpa(vm, gva); + if (!ptep_gpa) + goto unmapped_gva; + + ptep = addr_gpa2hva(vm, ptep_gpa); + if (!ptep) + goto unmapped_gva; + return pte_addr(vm, *ptep) + (gva & (vm->page_size - 1)); unmapped_gva: -- 2.35.1.723.g4982287a31-goog
next prev parent reply other threads:[~2022-03-11 6:02 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-11 6:01 [PATCH 00/11] KVM: selftests: Add aarch64/page_fault_test Ricardo Koller 2022-03-11 6:01 ` Ricardo Koller 2022-03-11 6:01 ` [PATCH 01/11] KVM: selftests: Add a userfaultfd library Ricardo Koller 2022-03-11 6:01 ` Ricardo Koller 2022-03-16 18:02 ` Ben Gardon 2022-03-16 18:02 ` Ben Gardon 2022-03-18 20:27 ` Ricardo Koller 2022-03-18 20:27 ` Ricardo Koller 2022-03-11 6:01 ` [PATCH 02/11] KVM: selftests: Add vm_mem_region_get_src_fd library function Ricardo Koller 2022-03-11 6:01 ` Ricardo Koller 2022-03-16 18:08 ` Ben Gardon 2022-03-16 18:08 ` Ben Gardon 2022-03-18 20:30 ` Ricardo Koller 2022-03-18 20:30 ` Ricardo Koller 2022-03-21 17:01 ` Ben Gardon 2022-03-21 17:01 ` Ben Gardon 2022-03-11 6:01 ` Ricardo Koller [this message] 2022-03-11 6:01 ` [PATCH 03/11] KVM: selftests: aarch64: Add vm_get_pte_gpa " Ricardo Koller 2022-03-11 6:02 ` [PATCH 04/11] KVM: selftests: Add vm_alloc_page_table_in_memslot " Ricardo Koller 2022-03-11 6:02 ` Ricardo Koller 2022-03-16 18:07 ` Ben Gardon 2022-03-16 18:07 ` Ben Gardon 2022-03-18 20:33 ` Ricardo Koller 2022-03-18 20:33 ` Ricardo Koller 2022-03-11 6:02 ` [PATCH 05/11] KVM: selftests: aarch64: Export _virt_pg_map with a pt_memslot arg Ricardo Koller 2022-03-11 6:02 ` Ricardo Koller 2022-03-11 6:02 ` [PATCH 06/11] KVM: selftests: Add missing close and munmap in __vm_mem_region_delete Ricardo Koller 2022-03-11 6:02 ` Ricardo Koller 2022-03-16 18:09 ` Ben Gardon 2022-03-16 18:09 ` Ben Gardon 2022-03-18 20:33 ` Ricardo Koller 2022-03-18 20:33 ` Ricardo Koller 2022-03-11 6:02 ` [PATCH 07/11] KVM: selftests: aarch64: Add aarch64/page_fault_test Ricardo Koller 2022-03-11 6:02 ` Ricardo Koller 2022-03-11 6:02 ` [PATCH 08/11] KVM: selftests: aarch64: Add userfaultfd tests into page_fault_test Ricardo Koller 2022-03-11 6:02 ` Ricardo Koller 2022-03-11 6:02 ` [PATCH 09/11] KVM: selftests: aarch64: Add dirty logging " Ricardo Koller 2022-03-11 6:02 ` Ricardo Koller 2022-03-11 6:02 ` [PATCH 10/11] KVM: selftests: aarch64: Add readonly memslot " Ricardo Koller 2022-03-11 6:02 ` Ricardo Koller 2022-03-11 6:02 ` [PATCH 11/11] KVM: selftests: aarch64: Add mix of " Ricardo Koller 2022-03-11 6:02 ` Ricardo Koller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220311060207.2438667-4-ricarkol@google.com \ --to=ricarkol@google.com \ --cc=axelrasmussen@google.com \ --cc=bgardon@google.com \ --cc=drjones@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=maz@kernel.org \ --cc=pbonzini@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.