[PATCH 11/20] KVM: arm64: Add a range to pKVM ownership selftest
Vincent Donnefort <[email protected]>
| Newsgroups | org.infradead.lists.linux-arm-kernel,dev.linux.lists.kvmarm |
|---|---|
| Message-ID | <[email protected]> |
Extend pkvm_ownership_selftest() with a nr_pages argument so that state transitions can be tested with both page-granular (1) and block-granular (PMD_SIZE / PAGE_SIZE) ranges. Signed-off-by: Vincent Donnefort <[email protected]> diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index 3426fbb25a4c..9d4604d93b98 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -74,9 +74,14 @@ static __always_inline void __load_host_stage2(void) } #ifdef CONFIG_NVHE_EL2_DEBUG -int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr_pages); +int __pkvm_ownership_selftest(u64 pfn, u64 nr_pages, u64 pgtable_pfn, + unsigned long pgtable_nr_pages); #else static inline int -__pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr_pages) { return 0; } +__pkvm_ownership_selftest(u64 pfn, u64 nr_pages, u64 pgtable_pfn, + unsigned long pgtable_nr_pages) +{ + return 0; +} #endif #endif /* __KVM_NVHE_MEM_PROTECT__ */ diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 18d314ea034c..ff8b7ac8dd56 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -561,10 +561,12 @@ static void handle___pkvm_create_private_mapping(struct kvm_cpu_context *host_ct static void handle___pkvm_ownership_selftest(struct kvm_cpu_context *host_ctxt) { DECLARE_REG(u64, pfn, host_ctxt, 1); - DECLARE_REG(u64, pgtable_pfn, host_ctxt, 2); - DECLARE_REG(unsigned long, pgtable_nr_pages, host_ctxt, 3); + DECLARE_REG(u64, nr_pages, host_ctxt, 2); + DECLARE_REG(u64, pgtable_pfn, host_ctxt, 3); + DECLARE_REG(unsigned long, pgtable_nr_pages, host_ctxt, 4); - cpu_reg(host_ctxt, 1) = __pkvm_ownership_selftest(pfn, pgtable_pfn, pgtable_nr_pages); + cpu_reg(host_ctxt, 1) = __pkvm_ownership_selftest(pfn, nr_pages, pgtable_pfn, + pgtable_nr_pages); } static void handle___pkvm_prot_finalize(struct kvm_cpu_context *host_ctxt) diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index a53600c853d4..d5ee079a5d70 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -1754,14 +1754,19 @@ static u64 selftest_ipa(void) return BIT(selftest_vcpu->vcpu.arch.hw_mmu->pgt->ia_bits - 1); } +static unsigned long selftest_nr_pages; + static void assert_page_state(void) { void *virt = hyp_page_to_virt(selftest_page); - u64 size = PAGE_SIZE << selftest_page->order; struct pkvm_hyp_vcpu *vcpu = selftest_vcpu; + u64 size = selftest_nr_pages * PAGE_SIZE; u64 phys = hyp_virt_to_phys(virt); - u64 ipa[2] = { selftest_ipa(), selftest_ipa() + PAGE_SIZE }; struct pkvm_hyp_vm *vm; + u64 ipa[2] = { + selftest_ipa(), + selftest_ipa() + size + }; vm = pkvm_hyp_vcpu_to_hyp_vm(vcpu); @@ -1785,7 +1790,8 @@ static void assert_page_state(void) assert_page_state(); \ } while (0) -int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr_pages) +int __pkvm_ownership_selftest(u64 pfn, u64 nr_pages, u64 pgtable_pfn, + unsigned long pgtable_nr_pages) { enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_RWX; struct pkvm_hyp_vcpu *vcpu; @@ -1798,7 +1804,7 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr if (ret) return ret; - ret = __pkvm_host_donate_hyp(pfn, 1); + ret = __pkvm_host_donate_hyp(pfn, nr_pages); if (ret) { WARN_ON(__pkvm_hyp_donate_host(pgtable_pfn, pgtable_nr_pages)); return ret; @@ -1808,10 +1814,11 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr pgtable_nr_pages); vm = pkvm_hyp_vcpu_to_hyp_vm(vcpu); + selftest_nr_pages = nr_pages; phys = hyp_pfn_to_phys(pfn); virt = hyp_phys_to_virt(phys); gfn = hyp_phys_to_pfn(selftest_ipa()); - size = PAGE_SIZE; + size = nr_pages * PAGE_SIZE; selftest_page = hyp_virt_to_page(virt); selftest_page->refcount = 0; @@ -1820,48 +1827,48 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr selftest_state.hyp = PKVM_PAGE_OWNED; selftest_state.guest[0] = selftest_state.guest[1] = PKVM_NOPAGE; assert_page_state(); - assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_ffa, pfn, 1); + assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_ffa, pfn, nr_pages); assert_transition_res(-EPERM, hyp_pin_shared_mem, virt, virt + size); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, nr_pages, vm); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); selftest_state.host = PKVM_PAGE_OWNED; selftest_state.hyp = PKVM_NOPAGE; - assert_transition_res(0, __pkvm_hyp_donate_host, pfn, 1); - assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_ffa, pfn, 1); - assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); + assert_transition_res(0, __pkvm_hyp_donate_host, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_ffa, pfn, nr_pages); + assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, nr_pages, vm); assert_transition_res(-EPERM, hyp_pin_shared_mem, virt, virt + size); selftest_state.host = PKVM_PAGE_SHARED_OWNED; selftest_state.hyp = PKVM_PAGE_SHARED_BORROWED; - assert_transition_res(0, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(0, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, nr_pages, vm); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); assert_transition_res(0, hyp_pin_shared_mem, virt, virt + size); assert_transition_res(0, hyp_pin_shared_mem, virt, virt + size); hyp_unpin_shared_mem(virt, virt + size); WARN_ON(hyp_page_count(virt) != 1); - assert_transition_res(-EBUSY, __pkvm_host_unshare_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(-EBUSY, __pkvm_host_unshare_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, nr_pages, vm); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); hyp_unpin_shared_mem(virt, virt + size); assert_page_state(); @@ -1869,116 +1876,125 @@ int __pkvm_ownership_selftest(u64 pfn, u64 pgtable_pfn, unsigned long pgtable_nr selftest_state.host = PKVM_PAGE_OWNED; selftest_state.hyp = PKVM_NOPAGE; - assert_transition_res(0, __pkvm_host_unshare_hyp, pfn, 1); + assert_transition_res(0, __pkvm_host_unshare_hyp, pfn, nr_pages); selftest_state.host = PKVM_PAGE_SHARED_OWNED; selftest_state.hyp = PKVM_NOPAGE; - assert_transition_res(0, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(0, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-ENOENT, __pkvm_host_unshare_guest, gfn, nr_pages, vm); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); assert_transition_res(-EPERM, hyp_pin_shared_mem, virt, virt + size); selftest_state.host = PKVM_PAGE_OWNED; selftest_state.hyp = PKVM_NOPAGE; - assert_transition_res(0, __pkvm_host_unshare_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_ffa, pfn, 1); + assert_transition_res(0, __pkvm_host_unshare_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_ffa, pfn, nr_pages); selftest_state.host = PKVM_PAGE_SHARED_OWNED; selftest_state.guest[0] = PKVM_PAGE_SHARED_BORROWED; - assert_transition_res(0, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); + assert_transition_res(0, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); assert_transition_res(-EPERM, hyp_pin_shared_mem, virt, virt + size); selftest_state.guest[1] = PKVM_PAGE_SHARED_BORROWED; - assert_transition_res(0, __pkvm_host_share_guest, pfn, gfn + 1, 1, vcpu, prot); + assert_transition_res(0, __pkvm_host_share_guest, pfn, gfn + nr_pages, nr_pages, + vcpu, prot); WARN_ON(hyp_virt_to_page(virt)->host_share_guest_count != 2); selftest_state.guest[0] = PKVM_NOPAGE; - assert_transition_res(0, __pkvm_host_unshare_guest, gfn, 1, vm); + assert_transition_res(0, __pkvm_host_unshare_guest, gfn, nr_pages, vm); selftest_state.guest[1] = PKVM_NOPAGE; selftest_state.host = PKVM_PAGE_OWNED; - assert_transition_res(0, __pkvm_host_unshare_guest, gfn + 1, 1, vm); + assert_transition_res(0, __pkvm_host_unshare_guest, gfn + nr_pages, nr_pages, vm); selftest_state.host = PKVM_NOPAGE; selftest_state.guest[0] = PKVM_PAGE_OWNED; - assert_transition_res(0, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + 1, 1, vcpu, prot); - assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); + assert_transition_res(0, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + nr_pages, nr_pages, + vcpu); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + nr_pages, nr_pages, + vcpu, prot); + assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, nr_pages); selftest_state.host = PKVM_PAGE_SHARED_BORROWED; selftest_state.guest[0] = PKVM_PAGE_SHARED_OWNED; - assert_transition_res(0, __pkvm_guest_share_host, vcpu, gfn, 1); - assert_transition_res(-EPERM, __pkvm_guest_share_host, vcpu, gfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + 1, 1, vcpu, prot); - assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); + assert_transition_res(0, __pkvm_guest_share_host, vcpu, gfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_guest_share_host, vcpu, gfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + nr_pages, nr_pages, + vcpu); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + nr_pages, nr_pages, + vcpu, prot); + assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, nr_pages); selftest_state.host = PKVM_NOPAGE; selftest_state.guest[0] = PKVM_PAGE_OWNED; - assert_transition_res(0, __pkvm_guest_unshare_host, vcpu, gfn, 1); - assert_transition_res(-EPERM, __pkvm_guest_unshare_host, vcpu, gfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + 1, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + 1, 1, vcpu, prot); - assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, 1); - assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, 1); + assert_transition_res(0, __pkvm_guest_unshare_host, vcpu, gfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_guest_unshare_host, vcpu, gfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn + nr_pages, nr_pages, + vcpu); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn + nr_pages, nr_pages, + vcpu, prot); + assert_transition_res(-EPERM, __pkvm_host_share_ffa, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_donate_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_share_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_host_unshare_hyp, pfn, nr_pages); + assert_transition_res(-EPERM, __pkvm_hyp_donate_host, pfn, nr_pages); selftest_state.host = PKVM_PAGE_OWNED; selftest_state.guest[0] = PKVM_POISON; assert_transition_res(0, __pkvm_host_force_reclaim_page_guest, phys); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); - assert_transition_res(-EHWPOISON, __pkvm_guest_share_host, vcpu, gfn, 1); - assert_transition_res(-EHWPOISON, __pkvm_guest_unshare_host, vcpu, gfn, 1); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); + assert_transition_res(-EHWPOISON, __pkvm_guest_share_host, vcpu, gfn, nr_pages); + assert_transition_res(-EHWPOISON, __pkvm_guest_unshare_host, vcpu, gfn, nr_pages); selftest_state.host = PKVM_NOPAGE; selftest_state.guest[1] = PKVM_PAGE_OWNED; - assert_transition_res(0, __pkvm_host_donate_guest, pfn, gfn + 1, 1, vcpu); + assert_transition_res(0, __pkvm_host_donate_guest, pfn, gfn + nr_pages, nr_pages, + vcpu); selftest_state.host = PKVM_PAGE_OWNED; selftest_state.guest[1] = PKVM_NOPAGE; - assert_transition_res(0, __pkvm_host_reclaim_page_guest, gfn + 1, 1, vm); - assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, 1, vcpu); - assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot); + assert_transition_res(0, __pkvm_host_reclaim_page_guest, gfn + nr_pages, nr_pages, + vm); + assert_transition_res(-EPERM, __pkvm_host_donate_guest, pfn, gfn, nr_pages, vcpu); + assert_transition_res(-EPERM, __pkvm_host_share_guest, pfn, gfn, nr_pages, vcpu, prot); selftest_state.host = PKVM_NOPAGE; selftest_state.hyp = PKVM_PAGE_OWNED; - assert_transition_res(0, __pkvm_host_donate_hyp, pfn, 1); + assert_transition_res(0, __pkvm_host_donate_hyp, pfn, nr_pages); /* This also gives back the ownership to the host */ teardown_selftest_vm(); - WARN_ON(__pkvm_hyp_donate_host(pfn, 1)); + WARN_ON(__pkvm_hyp_donate_host(pfn, nr_pages)); return 0; } diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index a9645480d164..4d41a16cd596 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -260,31 +260,40 @@ static void __init _kvm_host_prot_finalize(void *arg) } #ifdef CONFIG_NVHE_EL2_DEBUG +static void __init __pkvm_ownership_selftest(unsigned long page_order, + unsigned long pgtable, + unsigned long pgtable_order) +{ + unsigned long nr_pages = 1UL << page_order; + unsigned long page; + int ret = -ENOMEM; + + /* Page whose ownership will be tested */ + page = __get_free_pages(GFP_KERNEL, page_order); + if (page) + ret = kvm_call_hyp_nvhe(__pkvm_ownership_selftest, + virt_to_pfn((void *)page), nr_pages, + virt_to_pfn((void *)pgtable), 1 << pgtable_order); + if (ret) + kvm_err("%s(order=%ld) failed (%d)\n", __func__, page_order, ret); + + free_pages(page, page_order); +} + void __init pkvm_ownership_selftest(void) { unsigned long pgtable_order = 5; unsigned long pgtable = 0; - unsigned long page = 0; - long ret = -ENOMEM; /* Memory for the VM page-table */ pgtable = __get_free_pages(GFP_KERNEL, pgtable_order); if (!pgtable) - goto out; + return; - /* Page whose ownership will be tested */ - page = __get_free_page(GFP_KERNEL); - if (!page) - goto out; - - ret = kvm_call_hyp_nvhe(__pkvm_ownership_selftest, virt_to_pfn((void *)page), - virt_to_pfn((void *)pgtable), 1 << pgtable_order); -out: - if (ret) - kvm_err("Failed to run %s (%ld)\n", __func__, ret); + __pkvm_ownership_selftest(0, pgtable, pgtable_order); + __pkvm_ownership_selftest(PMD_ORDER, pgtable, pgtable_order); free_pages(pgtable, pgtable_order); - free_page(page); } #endif -- 2.55.0.508.g3f0d502094-goog