Merge tag 'kvmarm-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm...

[platform/kernel/linux-starfive.git] / arch / arm64 / kvm / hyp / nvhe / mem_protect.c

diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
index a8813b2..9d70344 100644 (file)
--- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c
+++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
@@ -91,9 +91,9 @@ static void host_s2_put_page(void *addr)
        hyp_put_page(&host_s2_pool, addr);
 }
 
-static void host_s2_free_removed_table(void *addr, u32 level)
+static void host_s2_free_unlinked_table(void *addr, u32 level)
 {
-       kvm_pgtable_stage2_free_removed(&host_mmu.mm_ops, addr, level);
+       kvm_pgtable_stage2_free_unlinked(&host_mmu.mm_ops, addr, level);
 }
 
 static int prepare_s2_pool(void *pgt_pool_base)
@@ -110,7 +110,7 @@ static int prepare_s2_pool(void *pgt_pool_base)
        host_mmu.mm_ops = (struct kvm_pgtable_mm_ops) {
                .zalloc_pages_exact = host_s2_zalloc_pages_exact,
                .zalloc_page = host_s2_zalloc_page,
-               .free_removed_table = host_s2_free_removed_table,
+               .free_unlinked_table = host_s2_free_unlinked_table,
                .phys_to_virt = hyp_phys_to_virt,
                .virt_to_phys = hyp_virt_to_phys,
                .page_count = hyp_page_count,
@@ -842,6 +842,13 @@ static int check_share(struct pkvm_mem_share *share)
        case PKVM_ID_HYP:
                ret = hyp_ack_share(completer_addr, tx, share->completer_prot);
                break;
+       case PKVM_ID_FFA:
+               /*
+                * We only check the host; the secure side will check the other
+                * end when we forward the FFA call.
+                */
+               ret = 0;
+               break;
        default:
                ret = -EINVAL;
        }
@@ -870,6 +877,13 @@ static int __do_share(struct pkvm_mem_share *share)
        case PKVM_ID_HYP:
                ret = hyp_complete_share(completer_addr, tx, share->completer_prot);
                break;
+       case PKVM_ID_FFA:
+               /*
+                * We're not responsible for any secure page-tables, so there's
+                * nothing to do here.
+                */
+               ret = 0;
+               break;
        default:
                ret = -EINVAL;
        }
@@ -918,6 +932,10 @@ static int check_unshare(struct pkvm_mem_share *share)
        case PKVM_ID_HYP:
                ret = hyp_ack_unshare(completer_addr, tx);
                break;
+       case PKVM_ID_FFA:
+               /* See check_share() */
+               ret = 0;
+               break;
        default:
                ret = -EINVAL;
        }
@@ -946,6 +964,10 @@ static int __do_unshare(struct pkvm_mem_share *share)
        case PKVM_ID_HYP:
                ret = hyp_complete_unshare(completer_addr, tx);
                break;
+       case PKVM_ID_FFA:
+               /* See __do_share() */
+               ret = 0;
+               break;
        default:
                ret = -EINVAL;
        }
@@ -1235,3 +1257,49 @@ void hyp_unpin_shared_mem(void *from, void *to)
        hyp_unlock_component();
        host_unlock_component();
 }
+
+int __pkvm_host_share_ffa(u64 pfn, u64 nr_pages)
+{
+       int ret;
+       struct pkvm_mem_share share = {
+               .tx     = {
+                       .nr_pages       = nr_pages,
+                       .initiator      = {
+                               .id     = PKVM_ID_HOST,
+                               .addr   = hyp_pfn_to_phys(pfn),
+                       },
+                       .completer      = {
+                               .id     = PKVM_ID_FFA,
+                       },
+               },
+       };
+
+       host_lock_component();
+       ret = do_share(&share);
+       host_unlock_component();
+
+       return ret;
+}
+
+int __pkvm_host_unshare_ffa(u64 pfn, u64 nr_pages)
+{
+       int ret;
+       struct pkvm_mem_share share = {
+               .tx     = {
+                       .nr_pages       = nr_pages,
+                       .initiator      = {
+                               .id     = PKVM_ID_HOST,
+                               .addr   = hyp_pfn_to_phys(pfn),
+                       },
+                       .completer      = {
+                               .id     = PKVM_ID_FFA,
+                       },
+               },
+       };
+
+       host_lock_component();
+       ret = do_unshare(&share);
+       host_unlock_component();
+
+       return ret;
+}