FROMLIST: virt: geniezone: Add memory relinquish support

Unpin the pages when VM relinquish the pages or is destroyed.

Change-Id: I9729f6ea93fee50a812dd43016754fdf812daa74
Signed-off-by: Jerry Wang <ze-yu.wang@mediatek.com>
Signed-off-by: Yingshiuan Pan <yingshiuan.pan@mediatek.com>
Signed-off-by: Liju-Clr Chen <liju-clr.chen@mediatek.com>
Signed-off-by: Yi-De Wu <yi-de.wu@mediatek.com>
Bug: 301179926
Link: https://lore.kernel.org/all/20231116152756.4250-17-yi-de.wu@mediatek.com/
This commit is contained in:
Yi-De Wu 2023-10-04 16:53:44 +08:00 committed by Todd Kjos
parent c57b152c45
commit 3ee517981d
5 changed files with 71 additions and 2 deletions

View File

@ -37,3 +37,26 @@ bool gzvm_handle_guest_exception(struct gzvm_vcpu *vcpu)
else
return false;
}
/**
* gzvm_handle_guest_hvc() - Handle guest hvc
* @vcpu: Pointer to struct gzvm_vcpu struct
* Return:
* * true - This hvc has been processed, no need to back to VMM.
* * false - This hvc has not been processed, require userspace.
*/
bool gzvm_handle_guest_hvc(struct gzvm_vcpu *vcpu)
{
unsigned long ipa;
int ret;
switch (vcpu->run->hypercall.args[0]) {
case GZVM_HVC_MEM_RELINQUISH:
ipa = vcpu->run->hypercall.args[1];
ret = gzvm_handle_relinquish(vcpu, ipa);
return (ret == 0) ? true : false;
default:
break;
}
return false;
}

View File

@ -123,6 +123,16 @@ static int cmp_ppages(struct rb_node *node, const struct rb_node *parent)
return 0;
}
static int rb_ppage_cmp(const void *key, const struct rb_node *node)
{
struct gzvm_pinned_page *p = container_of(node,
struct gzvm_pinned_page,
node);
phys_addr_t ipa = (phys_addr_t)key;
return (ipa < p->ipa) ? -1 : (ipa > p->ipa);
}
static int gzvm_insert_ppage(struct gzvm *vm, struct gzvm_pinned_page *ppage)
{
if (rb_find_add(&ppage->node, &vm->pinned_pages, cmp_ppages))
@ -157,6 +167,33 @@ static int pin_one_page(struct gzvm *vm, unsigned long hva, u64 gpa)
return 0;
}
/**
* gzvm_handle_relinquish() - Handle memory relinquish request from hypervisor
*
* @vcpu: Pointer to struct gzvm_vcpu_run in userspace
* @ipa: Start address(gpa) of a reclaimed page
*
* Return: Always return 0 because there are no cases of failure
*/
int gzvm_handle_relinquish(struct gzvm_vcpu *vcpu, phys_addr_t ipa)
{
struct gzvm_pinned_page *ppage;
struct rb_node *node;
struct gzvm *vm = vcpu->gzvm;
node = rb_find((void *)ipa, &vm->pinned_pages, rb_ppage_cmp);
if (node)
rb_erase(node, &vm->pinned_pages);
else
return 0;
ppage = container_of(node, struct gzvm_pinned_page, node);
unpin_user_pages_dirty_lock(&ppage->page, 1, true);
kfree(ppage);
return 0;
}
static int handle_block_demand_page(struct gzvm *vm, int memslot_id, u64 gfn)
{
unsigned long hva;

View File

@ -113,12 +113,14 @@ static long gzvm_vcpu_run(struct gzvm_vcpu *vcpu, void __user *argp)
* it's geniezone's responsibility to fill corresponding data
* structure
*/
case GZVM_EXIT_HYPERCALL:
if (!gzvm_handle_guest_hvc(vcpu))
need_userspace = true;
break;
case GZVM_EXIT_EXCEPTION:
if (!gzvm_handle_guest_exception(vcpu))
need_userspace = true;
break;
case GZVM_EXIT_HYPERCALL:
fallthrough;
case GZVM_EXIT_DEBUG:
fallthrough;
case GZVM_EXIT_FAIL_ENTRY:

View File

@ -172,6 +172,8 @@ int gzvm_gfn_to_pfn_memslot(struct gzvm_memslot *memslot, u64 gfn, u64 *pfn);
int gzvm_find_memslot(struct gzvm *vm, u64 gpa);
int gzvm_handle_page_fault(struct gzvm_vcpu *vcpu);
bool gzvm_handle_guest_exception(struct gzvm_vcpu *vcpu);
int gzvm_handle_relinquish(struct gzvm_vcpu *vcpu, phys_addr_t ipa);
bool gzvm_handle_guest_hvc(struct gzvm_vcpu *vcpu);
int gzvm_arch_create_device(u16 vm_id, struct gzvm_create_device *gzvm_dev);
int gzvm_arch_inject_irq(struct gzvm *gzvm, unsigned int vcpu_idx,

View File

@ -193,6 +193,11 @@ enum {
GZVM_EXCEPTION_PAGE_FAULT = 0x1,
};
/* hypercall definitions of GZVM_EXIT_HYPERCALL */
enum {
GZVM_HVC_MEM_RELINQUISH = 0xc6000009,
};
/**
* struct gzvm_vcpu_run: Same purpose as kvm_run, this struct is
* shared between userspace, kernel and