Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 22AE515B7 for ; Tue, 11 Oct 2022 01:06:38 +0000 (UTC) Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-352e29ff8c2so120310997b3.21 for ; Mon, 10 Oct 2022 18:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Hq9NL6B9Os53bTPgTLTOMBGsM6lY0z/4JHp7mLyST1U=; b=lkrHQV/0lVpq1npY9LHpffGonYfpeNlunRWanRqfunEzNi/NcefaHQcNSm8i6b+GU7 j8K6AP95M36DnJphvvI9B7hRpUeiECfr6j3gW7J0sj73Ekcsv1hTGG+t2N+wfUUDU6oR lu0GrlM0vFAtxWCpmGs2HZjoHYhxe5Sw+G/DhMRfgYTIDSUbXwdYBIXC04yqLLUJrgxu jDI6NwHNSxy7ENngck0izE6Qy5f6kkj+epUcBJZRz34B16rGbqwAyFhK4bNZbgEjc6o6 mXW78Xf9dEoKzUbpRzEYUsW74h7NPRhf8F9lT7uisjcwgoMD4OXNV0WmcBLfau25SdcZ 07WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Hq9NL6B9Os53bTPgTLTOMBGsM6lY0z/4JHp7mLyST1U=; b=B5zfoJVrymBKD6TVg7fFV41JEZvzkjxmiZhx7QwsGu+CPn2YaUylUEUlNbW605RnyI qF+fHRR+aqOI8D+rQoEQ86Tq6getlU4lpnvLev6+dyo/hxoEVxK96ITpQDf0ne90lnJ4 CypAnseGKrpnO+DPLdH9XrQNoUlZSkdv4O4e9SXquUXGASIcY37aECv5PwXi8B0oc6Nw gNwWj0jQcyORqNzc3ANMP6o/T+dyFMjS0TCf3ZPVNij/KaSe6H35DmxWvrVgtfeSmv0Z v+9Tb+YrR55h4zxTQyz2gL5ziqeZvPMHUP5pp5NnHINMyeh+TGo5RVHypy03QbTydS82 qnXA== X-Gm-Message-State: ACrzQf1/Obi6mczsbPUgq8CsDnxROCShSehk3dtd0qoHaYe+8NgjSR2m oqDCp6NZQyjPGLAU5kkJuI+XvJyyjyXbVw== X-Google-Smtp-Source: AMsMyM5werx4OlUxUq9yYtmxBAkTX+TLMdV2IK95277jRL8MA7+s0rjb4DSqTbsl0obBxVv8WfNgTl1RA9rJdw== X-Received: from ricarkol4.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:1248]) (user=ricarkol job=sendgmr) by 2002:a5b:bca:0:b0:6bf:b0d4:407d with SMTP id c10-20020a5b0bca000000b006bfb0d4407dmr16896540ybr.189.1665450397236; Mon, 10 Oct 2022 18:06:37 -0700 (PDT) Date: Tue, 11 Oct 2022 01:06:16 +0000 In-Reply-To: <20221011010628.1734342-1-ricarkol@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20221011010628.1734342-1-ricarkol@google.com> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Message-ID: <20221011010628.1734342-3-ricarkol@google.com> Subject: [PATCH v9 02/14] KVM: selftests: aarch64: Add virt_get_pte_hva() library function From: Ricardo Koller To: kvm@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, andrew.jones@linux.dev Cc: pbonzini@redhat.com, maz@kernel.org, seanjc@google.com, alexandru.elisei@arm.com, eric.auger@redhat.com, oupton@google.com, reijiw@google.com, rananta@google.com, bgardon@google.com, dmatlack@google.com, axelrasmussen@google.com, Ricardo Koller , Oliver Upton Content-Type: text/plain; charset="UTF-8" Message-ID: <20221011010616.IBNtDT23WfRlfokM9itN0q-V7nLPzVim8b6dJUFJo48@z> Add a library function to get the PTE (a host virtual address) of a given GVA. This will be used in a future commit by a test to clear and check the access flag of a particular page. Reviewed-by: Oliver Upton Reviewed-by: Andrew Jones Signed-off-by: Ricardo Koller --- .../selftests/kvm/include/aarch64/processor.h | 2 ++ tools/testing/selftests/kvm/lib/aarch64/processor.c | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h index a8124f9dd68a..df4bfac69551 100644 --- a/tools/testing/selftests/kvm/include/aarch64/processor.h +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h @@ -109,6 +109,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); +uint64_t *virt_get_pte_hva(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 6f5551368944..63ef3c78e55e 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -138,7 +138,7 @@ void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr) _virt_pg_map(vm, vaddr, paddr, attr_idx); } -vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) +uint64_t *virt_get_pte_hva(struct kvm_vm *vm, vm_vaddr_t gva) { uint64_t *ptep; @@ -169,11 +169,18 @@ vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) TEST_FAIL("Page table levels must be 2, 3, or 4"); } - return pte_addr(vm, *ptep) + (gva & (vm->page_size - 1)); + return ptep; unmapped_gva: TEST_FAIL("No mapping for vm virtual address, gva: 0x%lx", gva); - exit(1); + exit(EXIT_FAILURE); +} + +vm_paddr_t addr_arch_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) +{ + uint64_t *ptep = virt_get_pte_hva(vm, gva); + + return pte_addr(vm, *ptep) + (gva & (vm->page_size - 1)); } static void pte_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent, uint64_t page, int level) -- 2.38.0.rc1.362.ged0d419d3c-goog