From 8e6a22ec5d747feecf162d67a6a234bbe2bfe441 Mon Sep 17 00:00:00 2001 From: Elliot Berman Date: Fri, 24 Jan 2025 14:39:58 -0800 Subject: [PATCH] ANDROID: virt: gunyah: add addrspace_modify_pages hypercall The addrspace_modify_pages hypercall is used to unlock stage-2 page table entries, which allows the host/owner to unmap and reclaim those pages from guest. Bug: 395833312 Change-Id: I4168235333294a2647543eeda8beeaa40b0f7726 Signed-off-by: Elliot Berman --- arch/arm64/gunyah/gunyah_hypercall.c | 13 +++++++++++++ include/linux/gunyah.h | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm64/gunyah/gunyah_hypercall.c b/arch/arm64/gunyah/gunyah_hypercall.c index 0556226f55a5..df6ede6fc541 100644 --- a/arch/arm64/gunyah/gunyah_hypercall.c +++ b/arch/arm64/gunyah/gunyah_hypercall.c @@ -45,6 +45,7 @@ EXPORT_SYMBOL_GPL(arch_is_gunyah_guest); #define GUNYAH_HYPERCALL_ADDRSPACE_UNMAP GUNYAH_HYPERCALL(0x802C) #define GUNYAH_HYPERCALL_MEMEXTENT_DONATE GUNYAH_HYPERCALL(0x8061) #define GUNYAH_HYPERCALL_VCPU_RUN GUNYAH_HYPERCALL(0x8065) +#define GUNYAH_HYPERCALL_ADDRSPC_MODIFY_PAGES GUNYAH_HYPERCALL(0x8069) #define GUNYAH_HYPERCALL_ADDRSPACE_FIND_INFO_AREA GUNYAH_HYPERCALL(0x806a) /* clang-format on */ @@ -67,6 +68,18 @@ void gunyah_hypercall_hyp_identify( } EXPORT_SYMBOL_GPL(gunyah_hypercall_hyp_identify); +enum gunyah_error gunyah_hypercall_addrspc_modify_pages(u64 capid, u64 addr, + u64 size, u64 flags) +{ + struct arm_smccc_res res; + + arm_smccc_1_1_hvc(GUNYAH_HYPERCALL_ADDRSPC_MODIFY_PAGES, capid, + addr, size, flags, &res); + + return res.a0; +} +EXPORT_SYMBOL_GPL(gunyah_hypercall_addrspc_modify_pages); + /** * gunyah_hypercall_bell_send() - Assert a gunyah doorbell * @capid: capability ID of the doorbell diff --git a/include/linux/gunyah.h b/include/linux/gunyah.h index d6b1023e7d10..5ff31c172617 100644 --- a/include/linux/gunyah.h +++ b/include/linux/gunyah.h @@ -492,6 +492,11 @@ enum gunyah_error gunyah_hypercall_vcpu_run(u64 capid, unsigned long *resume_data, struct gunyah_hypercall_vcpu_run_resp *resp); +#define GUNYAH_ADDRSPC_MODIFY_FLAG_UNLOCK_BIT 0 +#define GUNYAH_ADDRSPC_MODIFY_FLAG_SANITIZE_BIT 1 +enum gunyah_error +gunyah_hypercall_addrspc_modify_pages(u64 capid, u64 addr, u64 size, u64 flags); + enum gunyah_error gunyah_hypercall_addrspace_find_info_area(unsigned long *ipa, unsigned long *size);