moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "FROMLIST: KVM: arm64: pkvm: Refcount the pages shared with EL2"

Browse Source 
This reverts commit e41cc0f83a.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ib8d89f9a92ad85cc412114601af9b4d2c2f8bb95
This commit is contained in:
Will Deacon
2022-07-07 15:52:06 +01:00
parent e803cccee4
commit 38840baf92
1 changed files with 10 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
arch/arm64/kvm/mmu.c
View File

@@ -284,72 +284,23 @@ static phys_addr_t kvm_kaddr_to_phys(void *kaddr)
} }
} }
struct hyp_shared_pfn { static int pkvm_share_hyp(phys_addr_t start, phys_addr_t end)
u64 pfn;
int count;
struct rb_node node;
};
static DEFINE_MUTEX(hyp_shared_pfns_lock);
static struct rb_root hyp_shared_pfns = RB_ROOT;
static struct hyp_shared_pfn *find_shared_pfn(u64 pfn, struct rb_node ***node,
struct rb_node **parent)
{ {
struct hyp_shared_pfn *this; phys_addr_t addr;
int ret;
*node = &hyp_shared_pfns.rb_node;
*parent = NULL;
while (**node) {
this = container_of(**node, struct hyp_shared_pfn, node);
*parent = **node;
if (this->pfn < pfn)
*node = &((**node)->rb_left);
else if (this->pfn > pfn)
*node = &((**node)->rb_right);
else
return this;
}
return NULL;
}
static int share_pfn_hyp(u64 pfn)
{
struct rb_node **node, *parent;
struct hyp_shared_pfn *this;
int ret = 0;
mutex_lock(&hyp_shared_pfns_lock);
this = find_shared_pfn(pfn, &node, &parent);
if (this) {
this->count++;
goto unlock;
}
this = kzalloc(sizeof(*this), GFP_KERNEL);
if (!this) {
ret = -ENOMEM;
goto unlock;
}
this->pfn = pfn;
this->count = 1;
rb_link_node(&this->node, parent, node);
rb_insert_color(&this->node, &hyp_shared_pfns);
ret = kvm_call_hyp_nvhe(__pkvm_host_share_hyp, pfn, 1);
unlock:
mutex_unlock(&hyp_shared_pfns_lock);
for (addr = ALIGN_DOWN(start, PAGE_SIZE); addr < end; addr += PAGE_SIZE) {
ret = kvm_call_hyp_nvhe(__pkvm_host_share_hyp,
__phys_to_pfn(addr));
if (ret)
return ret; return ret;
}
return 0;
} }
int kvm_share_hyp(void *from, void *to) int kvm_share_hyp(void *from, void *to)
{ {
phys_addr_t start, end, cur;
u64 pfn;
int ret;
if (is_kernel_in_hyp_mode()) if (is_kernel_in_hyp_mode())
return 0; return 0;
@@ -364,16 +315,7 @@ int kvm_share_hyp(void *from, void *to)
if (kvm_host_owns_hyp_mappings()) if (kvm_host_owns_hyp_mappings())
return create_hyp_mappings(from, to, PAGE_HYP); return create_hyp_mappings(from, to, PAGE_HYP);
start = ALIGN_DOWN(__pa(from), PAGE_SIZE); return pkvm_share_hyp(__pa(from), __pa(to));
end = PAGE_ALIGN(__pa(to));
for (cur = start; cur < end; cur += PAGE_SIZE) {
pfn = __phys_to_pfn(cur);
ret = share_pfn_hyp(pfn);
if (ret)
return ret;
}
return 0;
} }
/** /**