KVM: arm64: Extend pKVM page ownership selftests to cover guest hvcs

Now that the guest can share and unshare memory with the host using
hypercalls, extend the pKVM page ownership selftest to exercise these
new transitions.

Tested-by: Fuad Tabba <tabba@google.com>
Tested-by: Mostafa Saleh <smostafa@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
Link: https://patch.msgid.link/20260330144841.26181-37-will@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
index 0775a82ee4fe53036a92e293fb6534292b8d3ecb..28a471d1927cd50f908ea0dc14b8f583700d1cd8 100644 (file)
--- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c
+++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
@@ -1814,11 +1814,41 @@ void pkvm_ownership_selftest(void *base)
        assert_transition_res(-EPERM,   __pkvm_host_unshare_hyp, pfn);
        assert_transition_res(-EPERM,   __pkvm_hyp_donate_host, pfn, 1);
 
+       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);
+       assert_transition_res(-EPERM,   __pkvm_guest_share_host, vcpu, gfn);
+       assert_transition_res(-EPERM,   __pkvm_host_donate_guest, pfn, gfn, vcpu);
+       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(-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);
+       assert_transition_res(-EPERM,   __pkvm_host_unshare_hyp, pfn);
+       assert_transition_res(-EPERM,   __pkvm_hyp_donate_host, pfn, 1);
+
+       selftest_state.host = PKVM_NOPAGE;
+       selftest_state.guest[0] = PKVM_PAGE_OWNED;
+       assert_transition_res(0,        __pkvm_guest_unshare_host, vcpu, gfn);
+       assert_transition_res(-EPERM,   __pkvm_guest_unshare_host, vcpu, gfn);
+       assert_transition_res(-EPERM,   __pkvm_host_donate_guest, pfn, gfn, vcpu);
+       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(-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);
+       assert_transition_res(-EPERM,   __pkvm_host_unshare_hyp, pfn);
+       assert_transition_res(-EPERM,   __pkvm_hyp_donate_host, pfn, 1);
+
        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, vcpu);
        assert_transition_res(-EPERM,   __pkvm_host_share_guest, pfn, gfn, 1, vcpu, prot);
+       assert_transition_res(-EHWPOISON, __pkvm_guest_share_host, vcpu, gfn);
+       assert_transition_res(-EHWPOISON, __pkvm_guest_unshare_host, vcpu, gfn);
 
        selftest_state.host = PKVM_NOPAGE;
        selftest_state.guest[1] = PKVM_PAGE_OWNED;