Skip to content

Commit 376a240

Browse files
willdeaconMarc Zyngier
authored andcommitted
KVM: arm64: Implement do_unshare() helper for unsharing memory
Tearing down a previously shared memory region results in the borrower losing access to the underlying pages and returning them to the "owned" state in the owner. Implement a do_unshare() helper, along the same lines as do_share(), to provide this functionality for the host-to-hyp case. Reviewed-by: Andrew Walbran <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Quentin Perret <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1ee3210 commit 376a240

File tree

1 file changed

+115
-0
lines changed

1 file changed

+115
-0
lines changed

arch/arm64/kvm/hyp/nvhe/mem_protect.c

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,16 @@ static int host_request_owned_transition(u64 *completer_addr,
485485
return __host_check_page_state_range(addr, size, PKVM_PAGE_OWNED);
486486
}
487487

488+
static int host_request_unshare(u64 *completer_addr,
489+
const struct pkvm_mem_transition *tx)
490+
{
491+
u64 size = tx->nr_pages * PAGE_SIZE;
492+
u64 addr = tx->initiator.addr;
493+
494+
*completer_addr = tx->initiator.host.completer_addr;
495+
return __host_check_page_state_range(addr, size, PKVM_PAGE_SHARED_OWNED);
496+
}
497+
488498
static int host_initiate_share(u64 *completer_addr,
489499
const struct pkvm_mem_transition *tx)
490500
{
@@ -495,6 +505,16 @@ static int host_initiate_share(u64 *completer_addr,
495505
return __host_set_page_state_range(addr, size, PKVM_PAGE_SHARED_OWNED);
496506
}
497507

508+
static int host_initiate_unshare(u64 *completer_addr,
509+
const struct pkvm_mem_transition *tx)
510+
{
511+
u64 size = tx->nr_pages * PAGE_SIZE;
512+
u64 addr = tx->initiator.addr;
513+
514+
*completer_addr = tx->initiator.host.completer_addr;
515+
return __host_set_page_state_range(addr, size, PKVM_PAGE_OWNED);
516+
}
517+
498518
static enum pkvm_page_state hyp_get_page_state(kvm_pte_t pte)
499519
{
500520
if (!kvm_pte_valid(pte))
@@ -535,6 +555,17 @@ static int hyp_ack_share(u64 addr, const struct pkvm_mem_transition *tx,
535555
return __hyp_check_page_state_range(addr, size, PKVM_NOPAGE);
536556
}
537557

558+
static int hyp_ack_unshare(u64 addr, const struct pkvm_mem_transition *tx)
559+
{
560+
u64 size = tx->nr_pages * PAGE_SIZE;
561+
562+
if (__hyp_ack_skip_pgtable_check(tx))
563+
return 0;
564+
565+
return __hyp_check_page_state_range(addr, size,
566+
PKVM_PAGE_SHARED_BORROWED);
567+
}
568+
538569
static int hyp_complete_share(u64 addr, const struct pkvm_mem_transition *tx,
539570
enum kvm_pgtable_prot perms)
540571
{
@@ -545,6 +576,14 @@ static int hyp_complete_share(u64 addr, const struct pkvm_mem_transition *tx,
545576
return pkvm_create_mappings_locked(start, end, prot);
546577
}
547578

579+
static int hyp_complete_unshare(u64 addr, const struct pkvm_mem_transition *tx)
580+
{
581+
u64 size = tx->nr_pages * PAGE_SIZE;
582+
int ret = kvm_pgtable_hyp_unmap(&pkvm_pgtable, addr, size);
583+
584+
return (ret != size) ? -EFAULT : 0;
585+
}
586+
548587
static int check_share(struct pkvm_mem_share *share)
549588
{
550589
const struct pkvm_mem_transition *tx = &share->tx;
@@ -621,6 +660,82 @@ static int do_share(struct pkvm_mem_share *share)
621660
return WARN_ON(__do_share(share));
622661
}
623662

663+
static int check_unshare(struct pkvm_mem_share *share)
664+
{
665+
const struct pkvm_mem_transition *tx = &share->tx;
666+
u64 completer_addr;
667+
int ret;
668+
669+
switch (tx->initiator.id) {
670+
case PKVM_ID_HOST:
671+
ret = host_request_unshare(&completer_addr, tx);
672+
break;
673+
default:
674+
ret = -EINVAL;
675+
}
676+
677+
if (ret)
678+
return ret;
679+
680+
switch (tx->completer.id) {
681+
case PKVM_ID_HYP:
682+
ret = hyp_ack_unshare(completer_addr, tx);
683+
break;
684+
default:
685+
ret = -EINVAL;
686+
}
687+
688+
return ret;
689+
}
690+
691+
static int __do_unshare(struct pkvm_mem_share *share)
692+
{
693+
const struct pkvm_mem_transition *tx = &share->tx;
694+
u64 completer_addr;
695+
int ret;
696+
697+
switch (tx->initiator.id) {
698+
case PKVM_ID_HOST:
699+
ret = host_initiate_unshare(&completer_addr, tx);
700+
break;
701+
default:
702+
ret = -EINVAL;
703+
}
704+
705+
if (ret)
706+
return ret;
707+
708+
switch (tx->completer.id) {
709+
case PKVM_ID_HYP:
710+
ret = hyp_complete_unshare(completer_addr, tx);
711+
break;
712+
default:
713+
ret = -EINVAL;
714+
}
715+
716+
return ret;
717+
}
718+
719+
/*
720+
* do_unshare():
721+
*
722+
* The page owner revokes access from another component for a range of
723+
* pages which were previously shared using do_share().
724+
*
725+
* Initiator: SHARED_OWNED => OWNED
726+
* Completer: SHARED_BORROWED => NOPAGE
727+
*/
728+
static int do_unshare(struct pkvm_mem_share *share)
729+
{
730+
int ret;
731+
732+
ret = check_unshare(share);
733+
if (ret)
734+
return ret;
735+
736+
return WARN_ON(__do_unshare(share));
737+
}
738+
624739
int __pkvm_host_share_hyp(u64 pfn)
625740
{
626741
int ret;

0 commit comments

Comments
 (0)